tested, updated docs

Signed-off-by: Ali Mukadam <[email protected]>

updated copyright dates

Signed-off-by: Ali Mukadam <[email protected]>

minor doc updates

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

.gitignore

@@ -0,0 +1,18 @@
+#  Local .terraform directories
+**/.terraform/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# .tfvars files
+*.tfvars
+
+# provider file for testing - should be manually added
+provider.tf
+
+generated/**
+scripts/tesseract.sh
+
+# visual code
+ **/.vscode/*

CHANGELOG.adoc

@@ -0,0 +1,15 @@
+= CHANGELOG
+:idprefix:
+:idseparator: *
+
+:uri-changelog: http://keepachangelog.com/
+All notable changes to this project are documented in this file.
+
+The format is based on {uri-changelog}[Keep a Changelog].
+
+== v1.0.0 (May 21,2020)
+
+=== Changes
+* First release after split from terraform-oci-base
+* changed most variables to simple types
+* updated docs

CONTRIBUTING.adoc

@@ -0,0 +1,47 @@
+= CONTRIBUTING
+
+:uri-oracle-oca: https://www.oracle.com/technetwork/community/oca-486395.html
+
+Oracle welcomes contributions to this repository from anyone.
+
+If you want to submit a pull request to fix a bug or enhance an existing
+feature, please first open an issue and link to that issue when you
+submit your pull request.
+
+If you have any questions about a possible submission, feel free to open
+an issue too.
+
+== Contributing to the terraform-oci-oke repository
+
+Pull requests can be made under
+{uri-oracle-oca}[The Oracle Contributor Agreement](OCA).
+
+For pull requests to be accepted, the bottom of your commit message must have
+the following line using your name and e-mail address as it appears in the
+OCA Signatories list.
+
+----
+Signed-off-by: Your Name <[email protected]>
+----
+
+This can be automatically added to pull requests by committing with:
+
+----
+  git commit --signoff
+----
+
+Only pull requests from committers that can be verified as having
+signed the OCA can be accepted.
+
+=== Pull request process
+
+. Fork this repository
+. Create a branch in your fork to implement the changes. We recommend using
+the issue number as part of your branch name, e.g. `1234-fixes`
+. Ensure that any documentation is updated with the changes that are required
+by your fix.
+. Ensure that any samples are updated if the base image has been changed.
+. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
+what your changes are meant to do and provide simple steps on how to validate
+your changes. Ensure that you reference the issue you created as well.
+We will assign the pull request to 2-3 people for review before it is merged.

CONTRIBUTORS.adoc

@@ -0,0 +1,10 @@
+== GitHub userids of contributors
+
+OWNERS # have admin access and can merge code to master:
+
+- @hyder
+- @markxnelson
+
+CONTRIBUTORS
+
+- @karthicgit

LICENSE

@@ -0,0 +1,35 @@
+Copyright (c) 2019, 2020 Oracle and/or its affiliates. 
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associated documentation and/or data
+(collectively the "Software"), free of charge and under any and all copyright
+rights in the Software, and any and all patent rights owned or freely
+licensable by each licensor hereunder covering either (i) the unmodified
+Software as contributed to or provided by such licensor, or (ii) the Larger
+Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at
+a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.adoc

@@ -0,0 +1,82 @@
+= Terraform Bastion for Oracle Cloud Infrastructure
+
+:idprefix:
+:idseparator: -
+
+:uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-bastion
+
+:uri-rel-file-base: link:{uri-repo}/blob/master
+:uri-rel-tree-base: link:{uri-repo}/tree/master
+
+:uri-docs: {uri-rel-file-base}/docs
+
+:uri-changelog: {uri-rel-file-base}/CHANGELOG.adoc
+
+:uri-contribute: {uri-rel-file-base}/CONTRIBUTING.adoc
+:uri-contributors: {uri-rel-file-base}/CONTRIBUTORS.adoc
+
+:uri-license: {uri-rel-file-base}/LICENSE
+:uri-canonical-license: https://oss.oracle.com/licenses/upl/
+:uri-networks-subnets-cidr: https://erikberg.com/notes/networks.html
+:uri-oci: https://cloud.oracle.com/cloud-infrastructure
+:uri-oci-documentation: https://docs.cloud.oracle.com/iaas/Content/home.htm
+:uri-oracle: https://www.oracle.com
+:uri-prereqs: {uri-docs}/prerequisites.adoc
+:uri-quickstart: {uri-docs}/quickstart.adoc
+:uri-reuse-module: {uri-rel-tree-base}/examples/
+:uri-terraform: https://www.terraform.io
+:uri-terraform-cidrsubnet-deconstructed: http://blog.itsjustcode.net/blog/2017/11/18/terraform-cidrsubnet-deconstructed/
+:uri-terraform-hashicorp-examples: https://github.com/hashicorp/terraform-guides/tree/master/infrastructure-as-code/terraform-0.12-examples
+:uri-terraform-oci: https://www.terraform.io/docs/providers/oci/index.html
+:uri-terraform-options: {uri-docs}/terraformoptions.adoc
+:uri-terraform-oci-examples: https://github.com/terraform-providers/terraform-provider-oci/tree/master/examples
+
+The {uri-repo}[Terraform OCI Bastion] for {uri-oci}[Oracle Cloud Infrastructure] (OCI) provides a Terraform module that reuses an existing VCN and adds a bastion host to it.
+
+It creates the following resources:
+
+* A configurable security list to allow ssh access from a defined CIDR block
+* A public subnet
+* A compute instance
+* An optional notification via email
+
+This module is primarily meant to be reusable to provide an entry point into your infrastructure on {uri-oci}[OCI].
+You can further use it as part of higher level Terraform modules
+
+== {uri-docs}[Documentation]
+
+* {uri-prereqs}[Pre-requisites]
+
+* Instructions
+** {uri-quickstart}[Quickstart]
+** {uri-reuse-module}[Reusing as a Terraform module]
+* {uri-terraform-options}[Terraform Options]
+
+== Related Documentation, Blog
+* {uri-oci-documentation}[Oracle Cloud Infrastructure Documentation]
+* {uri-terraform-oci}[Terraform OCI Provider Documentation]
+* {uri-networks-subnets-cidr}[Erik Berg on Networks, Subnets and CIDR]
+* {uri-terraform-cidrsubnet-deconstructed}[Lisa Hagemann on Terraform cidrsubnet Deconstructed]
+
+== Projects using this module
+
+== Changelog
+
+View the {uri-changelog}[CHANGELOG].
+
+== Acknowledgement
+
+Code derived and adapted from {uri-terraform-oci-examples}[Terraform OCI Examples] and Hashicorp's {uri-terraform-hashicorp-examples}[Terraform 0.12 examples]
+
+== Contributors
+
+{uri-contributors}[Folks who contributed with explanations, code, feedback, ideas, testing etc.]
+
+Learn how to {uri-contribute}[contribute].
+
+== License
+
+Copyright(c) 2019,2020 Oracle and/or its associates. All rights reserved.
+
+Licensed under the {uri-license}[Universal Permissive License 1.0] as shown at 
+{uri-canonical-license}[https://oss.oracle.com/licenses/upl].

README.md

@@ -1 +1,78 @@
-# terraform-oci-bastion
+# Terraform OCI Bastion for Oracle Cloud Infrastructure
+
+[changelog]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/CHANGELOG.adoc
+[contributing]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/CONTRIBUTING.adoc
+[contributors]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/CONTRIBUTORS.adoc
+[docs]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/tree/master/docs
+
+[license]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/LICENSE
+[canonical_license]: https://oss.oracle.com/licenses/upl/
+
+[oci]: https://cloud.oracle.com/cloud-infrastructure
+[oci_documentation]: https://docs.cloud.oracle.com/iaas/Content/home.htm
+
+[oracle]: https://www.oracle.com
+[prerequisites]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/docs/prerequisites.adoc
+
+[quickstart]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/docs/quickstart.adoc
+[repo]: https://github.com/oracle/terraform-oci-bastion
+[reuse]: https://github.com/oracle/terraform-oci-bastion/examples/db
+[subnets]: https://erikberg.com/notes/networks.html
+[terraform]: https://www.terraform.io
+[terraform_cidr_subnet]: http://blog.itsjustcode.net/blog/2017/11/18/terraform-cidrsubnet-deconstructed/
+[terraform_hashircorp_examples]: https://github.com/hashicorp/terraform-guides/tree/master/infrastructure-as-code/terraform-0.12-examples
+[terraform_oci]: https://www.terraform.io/docs/providers/oci/index.html
+[terraform_options]: https://github.com/oracle-terraform-modules/terraform-oci-bastion/blob/master/docs/terraformoptions.adoc
+[terraform_oci_examples]: https://github.com/terraform-providers/terraform-provider-oci/tree/master/examples
+[terraform_oci_oke]: https://github.com/oracle-terraform-modules/terraform-oci-oke
+
+The [Terraform OCI Bastion][repo] for [Oracle Cloud Infrastructure][OCI] provides a [Terraform][terraform] module that reuses an existing VCN and adds a bastion host to it.
+
+It creates the following resources:
+
+* A configurable security list to allow ssh access from a defined CIDR block
+* A public subnet
+* A compute instance
+* An optional notification via email
+
+This module is primarily meant to be reusable to provide an entry point into your infrastructure on {uri-oci}[OCI].
+You can further use it as part of higher level Terraform modules
+
+## [Documentation][docs]
+
+### [Pre-requisites][prerequisites]
+
+#### Instructions
+- [Quickstart][quickstart]
+- [Reusing as a Terraform module][reuse]
+- [Terraform Options][terraform_options]
+
+## Related Documentation, Blog
+- [Oracle Cloud Infrastructure Documentation][oci_documentation]
+- [Terraform OCI Provider Documentation][terraform_oci]
+- [Erik Berg on Networks, Subnets and CIDR][subnets]
+- [Lisa Hagemann on Terraform cidrsubnet Deconstructed][terraform_cidr_subnet]
+
+## Projects using this module
+
+## Changelog
+
+View the [CHANGELOG][changelog].
+
+## Acknowledgement
+
+Code derived and adapted from [Terraform OCI Examples][terraform_oci_examples] and Hashicorp's [Terraform 0.12 examples][terraform_oci_examples]
+
+## Contributors
+
+[Folks who contributed with explanations, code, feedback, ideas, testing etc.][contributors]
+
+Learn how to [contribute][contributing].
+
+## License
+
+Copyright (c) 2019, 2020 Oracle and/or its associates. All rights reserved.
+
+Licensed under the [Universal Permissive License 1.0][license] as shown at 
+[https://oss.oracle.com/licenses/upl][canonical_license].
+

cloudinit/autonomous.template.yaml

@@ -0,0 +1,17 @@
+# Copyright 2019, 2020 Oracle Corporation and/or affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+#cloud-config
+timezone: ${timezone}
+
+write_files:
+# setup script
+  - path: "/root/bastion/notification.sh"
+    permissions: "0700"
+    encoding: "gzip+base64"
+    content: |
+      ${notification_sh_content}
+runcmd:
+ - echo "Configuring running notification script..."
+ - bash /root/bastion/notification.sh
+ - touch /home/opc/bastion.finish

compute.tf

@@ -0,0 +1,41 @@
+# Copyright 2019, 2020 Oracle Corporation and/or affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+resource "oci_core_instance" "bastion" {
+  availability_domain = element(local.ad_names, (var.availability_domain - 1))
+  compartment_id      = var.compartment_id
+  freeform_tags       = var.tags.compute
+   
+
+  create_vnic_details {
+    assign_public_ip = true
+    display_name     = "${var.label_prefix}-bastion-vnic"
+    hostname_label   = "bastion"
+    subnet_id        = oci_core_subnet.bastion[0].id
+  }
+
+  display_name = "${var.label_prefix}-bastion"
+
+  # prevent the bastion from destroying and recreating itself if the image ocid changes 
+  lifecycle {
+    ignore_changes = [source_details[0].source_id]
+  }
+
+  metadata = {
+    ssh_authorized_keys = var.ssh_public_key != "" ? var.ssh_public_key : file(var.ssh_public_key_path)
+    user_data           = data.template_cloudinit_config.bastion[0].rendered
+  }
+
+  shape = var.bastion_shape
+
+  source_details {
+    source_type = "image"
+    source_id   = local.bastion_image_id
+  }
+
+  timeouts {
+    create = "60m"
+  }
+
+  count = var.bastion_enabled == true ? 1 : 0
+}