(mushop-basic-stack-v1.1.3) Merge pull request #181 from junior/always-free-atp-version-update

Always free (mushop-basic) stack update

Author: junior

README.md

@@ -27,10 +27,10 @@ The repository contains the application code as well as the [Terraform][tf] code
 
 The steps below guide you through deploying the application on your tenancy using the OCI Resource Manager.
 
-1. Download the latest [`mushop-basic-stack-v1.1.0.zip`](../../releases/download/v1.1.0/mushop-basic-stack-v1.1.0.zip) file.
+1. Download the latest [`mushop-basic-stack-v1.1.3.zip`](../../releases/download/v1.1.3/mushop-basic-stack-v1.1.3.zip) file.
 2. [Login](https://console.us-ashburn-1.oraclecloud.com/resourcemanager/stacks/create) to Oracle Cloud Infrastructure to import the stack
     > `Home > Solutions & Platform > Resource Manager > Stacks > Create Stack`
-3. Upload the `mushop-basic-stack-v1.1.0.zip` file that was downloaded earlier, and provide a name and description for the stack
+3. Upload the `mushop-basic-stack-v1.1.3.zip` file that was downloaded earlier, and provide a name and description for the stack
 4. Configure the stack
    1. **Database Name** - You can choose to provide a database name (optional)
    2. **Node Count** - Select if you want to deploy one or two application instances.

deploy/basic/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.3

deploy/basic/terraform/atp.tf

@@ -1,24 +1,17 @@
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
 # creates an ATP database
 resource "oci_database_autonomous_database" "mushop_autonomous_database" {
-  #Required
   admin_password           = random_string.autonomous_database_wallet_password.result
   compartment_id           = var.compartment_ocid
   cpu_core_count           = 1
   data_storage_size_in_tbs = 1
-  db_name                  = var.database_name
+  db_name                  = var.autonomous_database_name
+  db_version               = var.autonomous_database_db_version
+  display_name             = "${var.autonomous_database_name}${random_id.mushop_id.dec}"
   freeform_tags            = local.common_tags
-  is_free_tier             = true
-
-  #Optional
-  db_version                                     = "19c"
-  db_workload                                    = "OLTP"
-  display_name                                   = "${var.database_name}${random_id.mushop_id.dec}"
-  is_auto_scaling_enabled                        = false
-  is_dedicated                                   = false
-  is_preview_version_with_service_terms_accepted = false
-
+  is_free_tier             = var.autonomous_database_is_free_tier
+  license_model            = var.autonomous_database_license_model
 }

deploy/basic/terraform/datasources.tf

@@ -1,48 +1,37 @@
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
 # Gets a list of Availability Domains
 data "oci_identity_availability_domains" "ADs" {
-
   compartment_id = var.tenancy_ocid
-
 }
 
-
 data "oci_objectstorage_namespace" "user_namespace" {
-
   compartment_id = var.compartment_ocid
-
 }
 
-
 resource "random_string" "autonomous_database_wallet_password" {
-
   length           = 16
   special          = true
   min_upper        = 3
   min_lower        = 3
   min_numeric      = 3
   min_special      = 3
   override_special = "{}#^*<>[]%~"
-
 }
 
 resource "random_id" "mushop_id" {
   byte_length = 2
 }
 
 data "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
-
   autonomous_database_id = oci_database_autonomous_database.mushop_autonomous_database.id
   password               = random_string.autonomous_database_wallet_password.result
   base64_encode_content  = "true"
-
 }
 
 data "oci_limits_services" "test_services" {
-  #Required
   compartment_id = var.tenancy_ocid
 
   filter {
@@ -60,3 +49,13 @@ data "oci_limits_limit_values" "test_limit_values" {
   name                = "vm-standard-e2-1-micro-count"
   scope_type          = "AD"
 }
+
+# Gets a list of supported images based on the shape, operating_system and operating_system_version provided
+data "oci_core_images" "compute_images" {
+  compartment_id           = var.compartment_ocid
+  operating_system         = var.image_operating_system
+  operating_system_version = var.image_operating_system_version
+  shape                    = var.instance_shape
+  sort_by                  = "TIMECREATED"
+  sort_order               = "DESC"
+}

deploy/basic/terraform/loadbalancer.tf

@@ -1,12 +1,12 @@
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
 resource "oci_load_balancer_load_balancer" "mushop_lb" {
 
   compartment_id = var.compartment_ocid
   display_name   = "mushop-${random_id.mushop_id.dec}"
-  shape          = local.lb_shape
+  shape          = var.lb_shape
   subnet_ids     = [oci_core_subnet.mushopLBSubnet.id]
   is_private     = "false"
   freeform_tags  = local.common_tags
@@ -34,7 +34,7 @@ resource "oci_load_balancer_backend" "mushop-be" {
   count            = var.num_nodes
   load_balancer_id = oci_load_balancer_load_balancer.mushop_lb.id
   backendset_name  = oci_load_balancer_backend_set.mushop-bes.name
-  ip_address       = element(oci_core_instance.app-instance.*.private_ip, count.index)
+  ip_address       = element(oci_core_instance.app_instance.*.private_ip, count.index)
   port             = 80
   backup           = false
   drain            = false

deploy/basic/terraform/main.tf

@@ -1,20 +1,20 @@
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
 terraform {
-  required_version = ">= 0.12.0"
+  required_version = ">= 0.12.16"
 }
 data "template_file" "mushop" {
   template = "${file("./scripts/node.sh")}"
 }
 
-resource "oci_core_instance" "app-instance" {
+resource "oci_core_instance" "app_instance" {
   count               = var.num_nodes
   availability_domain = local.availability_domain[0]
   compartment_id      = var.compartment_ocid
   display_name        = "mushop-${random_id.mushop_id.dec}-${count.index}"
-  shape               = local.instance_shape
+  shape               = var.instance_shape
   freeform_tags       = local.common_tags
 
   create_vnic_details {
@@ -26,11 +26,11 @@ resource "oci_core_instance" "app-instance" {
 
   source_details {
     source_type = "image"
-    source_id   = local.images[var.region]
+    source_id   = lookup(data.oci_core_images.compute_images.images[0], "id")
   }
 
   metadata = {
-    ssh_authorized_keys = var.ssh_public_key
+    ssh_authorized_keys = var.generate_public_ssh_key ? tls_private_key.compute_ssh_key.public_key_openssh : var.public_ssh_key
     user_data           = base64encode(data.template_file.mushop.rendered)
     db_name             = oci_database_autonomous_database.mushop_autonomous_database.db_name
     atp_pw              = random_string.autonomous_database_wallet_password.result
@@ -42,39 +42,20 @@ resource "oci_core_instance" "app-instance" {
     assets_par          = "https://objectstorage.${var.region}.oraclecloud.com${oci_objectstorage_preauthrequest.mushop_media_preauth.access_uri}"
     assets_url          = "https://objectstorage.${var.region}.oraclecloud.com/n/${oci_objectstorage_bucket.mushop_media.namespace}/b/${oci_objectstorage_bucket.mushop_media.name}/o/"
   }
-  
-}
-
-// https://docs.cloud.oracle.com/iaas/images/image/4e74174f-0b44-4447-bb09-dc05b23cf3ee/
-// Oracle-Linux-7.7-2019.08.28-0
-locals  {
-  images = {
-    ap-mumbai-1    =	"ocid1.image.oc1.ap-mumbai-1.aaaaaaaanqnm77gq2dpmc2aih2ddlwlahuv2qwmokufb7zbi52v67pzkzycq"
-    ap-seoul-1     =	"ocid1.image.oc1.ap-seoul-1.aaaaaaaav3lc5w7cvz5yr6hpjdubxupjeduzd5xvaroyhjg6vwqzsdvgus6q"
-    ap-sydney-1    =	"ocid1.image.oc1.ap-sydney-1.aaaaaaaagtfumjxhosxrkgfci3dgwvsmp35ip5nbhy2rypxfh3rwtqsozkcq"
-    ap-tokyo-1     =	"ocid1.image.oc1.ap-tokyo-1.aaaaaaaajousbvplzyrh727e3d4sb6bam5d2fomwhbtzatoun5sqcuvvfjnq"
-    ca-toronto-1   =	"ocid1.image.oc1.ca-toronto-1.aaaaaaaavr35ze44lkflxffkhmt4xyamkfjpbjhsm5awxjwlnp3gpx7h7fgq"
-    eu-frankfurt-1 =	"ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7gj6uot6tz6t34qjzvkldxtwse7gr5m7xvnh6xfm53ddxp3w37ja"
-    eu-zurich-1    =	"ocid1.image.oc1.eu-zurich-1.aaaaaaaasl3mlhvgzhfglqqkwdbppmmgomkz6iyi42wjkceldqcpecg7jzgq"
-    sa-saopaulo-1  =	"ocid1.image.oc1.sa-saopaulo-1.aaaaaaaawamujpmwxbjgrfeb66zpew5sgz4bimzb4wgcwhqdjyct53bucvoq"
-    uk-london-1    =	"ocid1.image.oc1.uk-london-1.aaaaaaaa6trfxqtp5ib7yfgj725js3o6agntmv6vckarebsmacrhdxqojeya"
-    us-ashburn-1   =	"ocid1.image.oc1.iad.aaaaaaaayuihpsm2nfkxztdkottbjtfjqhgod7hfuirt2rqlewxrmdlgg75q"
-    us-langley-1   =	"ocid1.image.oc2.us-langley-1.aaaaaaaaazlspcasnl4ibjwu7g5ukiaqjp6xcbk5lqgtdsazd7v6evbkwxcq"
-    us-luke-1      =	"ocid1.image.oc2.us-luke-1.aaaaaaaa73qnm5jktrwmkutf6iaigib4msieymk2s5r5iweq5yvqublgcx5q"
-    us-phoenix-1   =	"ocid1.image.oc1.phx.aaaaaaaadtmpmfm77czi5ghi5zh7uvkguu6dsecsg7kuo3eigc5663und4za"
-  }
-
-  
-  instance_shape = "VM.Standard.E2.1.Micro"
 
-  availability_domain = [for limit in data.oci_limits_limit_values.test_limit_values : limit.limit_values[0].availability_domain if limit.limit_values[0].value > 0 ]
-
-  num_nodes = 2
+}
 
-  lb_shape = "10Mbps-Micro"
+locals {
+  availability_domain = [for limit in data.oci_limits_limit_values.test_limit_values : limit.limit_values[0].availability_domain if limit.limit_values[0].value > 0]
 
   common_tags = {
     Reference = "Created by OCI QuickStart for Free Tier"
   }
 
 }
+
+# Generate ssh keys to access Compute Nodes, if generate_public_ssh_key=true, applies to the Compute
+resource "tls_private_key" "compute_ssh_key" {
+  algorithm = "RSA"
+  rsa_bits  = 2048
+}

deploy/basic/terraform/outputs.tf

@@ -1,15 +1,19 @@
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
 output "lb_public_url" {
-  value = format("http://%s", lookup(oci_load_balancer_load_balancer.mushop_lb.ip_address_details[0],"ip_address"))
+  value = format("http://%s", lookup(oci_load_balancer_load_balancer.mushop_lb.ip_address_details[0], "ip_address"))
 }
 
 output "autonomous_database_password" {
   value = random_string.autonomous_database_wallet_password.result
 }
 
+output "generated_public_ssh_key" {
+  value = var.generate_public_ssh_key ? tls_private_key.compute_ssh_key.public_key_openssh : "No Keys Auto Generated"
+}
+
 output "dev" {
   value = "Made with \u2764 by Oracle A-Team"
 }

deploy/basic/terraform/provider.tf

@@ -3,7 +3,7 @@
 # 
 
 provider "oci" {
-  tenancy_ocid     = var.tenancy_ocid
+  tenancy_ocid = var.tenancy_ocid
   # user_ocid        = "${var.user_ocid}"
   # fingerprint      = "${var.fingerprint}"
   # private_key_path = "${var.private_key_path}"

deploy/basic/terraform/schema.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
@@ -9,7 +9,7 @@ version: "20190304"
 locale: "en"
 
 groupings:
-  - title: "General Configuration"
+  - title: "Basic Hidden"
     visible: false
     variables:
     - compartment_ocid
@@ -18,12 +18,26 @@ groupings:
 
   - title: "General Configuration"
     variables:
-    - database_name
+    - autonomous_database_name
     - num_nodes
 
   - title: "Optional Configuration"
     variables:
-    - ssh_public_key
+    - generate_public_ssh_key
+    - public_ssh_key
+
+  - title: "Extras Hidden"
+    variables:
+      - user_ocid
+      - fingerprint
+      - autonomous_database_db_version
+      - autonomous_database_license_model
+      - autonomous_database_is_free_tier
+      - instance_shape
+      - lb_shape
+      - image_operating_system
+      - image_operating_system_version
+    visible: false
 
 variables:
   compartment_ocid:
@@ -43,32 +57,41 @@ variables:
     description: "Choose the number of compute instances to deploy"
     required: true
 
-  database_name:
+  autonomous_database_name:
     type: string
     required: true
     title: "Database Name"
     description: "The name for the Autonomous Database instance"
-    default: "MuShopDB"
     minLength: 1
     maxLength: 14
     pattern: "^[a-zA-Z][a-zA-Z0-9]+$"
 
-  ssh_public_key:
+  generate_public_ssh_key:
+    type: boolean
+    title: "Auto generate public ssh key?"
+    description: "Auto generate a public key and assign to the compute instances"
+    required: true
+
+  public_ssh_key:
     type: oci:core:ssh:publickey
     required: false
     title: "SSH Public Key"
     description: "The public SSH key for the key-pair that you want to use, if you wish to login to the instances over SSH"
     additionalProps:
       allowMultiple: true
     pattern: "((^(ssh-rsa AAAAB3NzaC1yc2|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzOD|ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1Mj|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5|ssh-dss AAAAB3NzaC1kc3)[0-9A-Za-z+\/]+[=]{0,3})( [^,]*)?)(,((ssh-rsa AAAAB3NzaC1yc2|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzOD|ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1Mj|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5|ssh-dss AAAAB3NzaC1kc3)[0-9A-Za-z+\/]+[=]{0,3})( [^,]*)?)*$"
+    visible:
+      not:
+        - generate_public_ssh_key
 
 outputGroups:
   - title: "MuShop App details"
     outputs:
-      - ${lb_public_url}
-      - ${autonomous_database_password}
-      - ${dev}
-      - ${comments}
+      - lb_public_url
+      - autonomous_database_password
+      - generated_public_ssh_key
+      - dev
+      - comments
 
 outputs:
   lb_public_url:
@@ -82,6 +105,12 @@ outputs:
     displayText: "Autonomous Database Password"
     visible: true
 
+  generated_public_ssh_key:
+    type: string
+    title: "Generated Public SSH key"
+    displayText: "Generated public ssh key to access compute nodes"
+    visible: true
+
   dev:
     type: string
     title: "Message"

deploy/basic/terraform/security-lists.tf

@@ -9,9 +9,9 @@ resource "oci_core_security_list" "mushopLBSecurityList" {
   freeform_tags  = local.common_tags
 
   egress_security_rules {
-      protocol    = "6"
-      destination = "0.0.0.0/0"
-    }
+    protocol    = "6"
+    destination = "0.0.0.0/0"
+  }
 
   ingress_security_rules {
     protocol = "6"