Updated version and fixes

Updated to use Spatial Studio image 22.1.1
Added provider alias with home region to create the IAM artifacts there (dynamic group & policies)

Author: jvizcarr

build-orm/install.tf

@@ -6,5 +6,5 @@ data "archive_file" "generate_zip" {
   type        = "zip"
   output_path = (var.save_to != "" ? "${var.save_to}/orm.zip" : "${path.module}/dist/orm.zip")
   source_dir = "../terraform"
-  excludes    = ["packer",".terraform.lock.hcl","terraform.tfstate", "terraform.tfvars.template", "terraform.tfvars", "provider.tf", ".terraform", "build-orm", "images", "README.md", "terraform.", "terraform.tfstate.backup", "test", "simple", ".git", "README", ".github", ".gitignore", ".DS_Store", "LICENSE","diagram",]
+  excludes    = ["packer",".terraform.lock.hcl","terraform.tfstate", "terraform.tfvars.template", "terraform.tfvars", ".terraform", "build-orm", "images", "README.md", "terraform.", "terraform.tfstate.backup", "test", "simple", ".git", "README", ".github", ".gitignore", ".DS_Store", "LICENSE","diagram",]
 }

terraform/compute.tf

@@ -44,6 +44,8 @@ resource "oci_core_instance" "simple-vm" {
     #This random string will be used for the new database's admin and sgtech users
     dba_password=random_string.autonomous_database_admin_password.result
 
+    is_public = local.is_public_subnet
+
     #required, to distinguish if DB is new or an existing one will be used, set this to false and pass an empty adb_id 
     #to skip database metadata repository configuration
     create_adb_user = true 
@@ -60,7 +62,7 @@ resource "oci_core_instance" "simple-vm" {
     #required to set max/min connections for studio
     is_free_adb = local.is_free_adb
 
-    debug_enabled=true
+    enable_idcs = false
 
   }
 

terraform/oci_images.tf

@@ -7,7 +7,7 @@ variable "marketplace_source_images" {
 
   default = {
     main_mktpl_image = {
-      ocid = "ocid1.image.oc1..aaaaaaaadeywf3clwo5kf6xdvyrpfayh66fmuwws3onopvpnodd7wkuh6dna"
+      ocid = "ocid1.image.oc1..aaaaaaaalb6tbux65qelwpgvb7h5uklfzujeufaerq2qoh2tewlghnp5ie7a"
       is_pricing_associated = false
       compatible_shapes = ["VM.Standard1.1", "VM.Standard1.16", "VM.Standard1.2", "VM.Standard1.4", "VM.Standard1.8", "VM.Standard2.1", "VM.Standard2.16", "VM.Standard2.2", "VM.Standard2.24", "VM.Standard2.4", "VM.Standard2.8", "VM.Standard.B1.1", "VM.Standard.B1.16", "VM.Standard.B1.2", "VM.Standard.B1.4", "VM.Standard.B1.8", "VM.Standard.E2.1", "VM.Standard.E2.1.Micro", "VM.Standard.E2.2", "VM.Standard.E2.4", "VM.Standard.E2.8", "VM.Standard3.Flex", "VM.Optimized3.Flex", "VM.Standard.E3.Flex", "VM.Standard.E4.Flex"]
     }

terraform/policies.tf

@@ -5,6 +5,7 @@ locals {
 }
 
 resource "oci_identity_dynamic_group" "spatial_instance_principal_group" {
+  provider    = oci.home
   compartment_id = var.tenancy_ocid
   description    = "dynamic group to allow access to resources"
   matching_rule  = "ALL { ${local.compartment} }"
@@ -30,6 +31,7 @@ locals {
 }
 
 resource "oci_identity_policy" "spatial_policy" {
+  provider    = oci.home
   compartment_id = var.tenancy_ocid
   description    = "policy that allows instance principal access to the CLI api from the instance"
   name           = "${var.service_name}-policy-${random_string.deploy_id.result}"

terraform/provider.tf

@@ -3,19 +3,40 @@
  */
 
 provider "oci" {
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
   region           = var.region
+  ### Enable below variables if running this from local terraform installation
+  #tenancy_ocid     = var.tenancy_ocid
+  #user_ocid        = var.user_ocid
+  #fingerprint      = var.fingerprint
+  #private_key_path = var.private_key_path
+  
 }
 
-# Variables required by the OCI Provider only when running Terraform CLI with standard user based Authentication
-variable "user_ocid" {
-}
+# Enable below variables required by the OCI Provider when running Terraform CLI locally with standard user based Authentication
+#variable "user_ocid" {
+#}
+#variable "fingerprint" {
+#}
+#variable "private_key_path" {
+#}
 
-variable "fingerprint" {
+data "oci_identity_tenancy" "tenancy" {
+  tenancy_id = var.tenancy_ocid
 }
 
-variable "private_key_path" {
+data "oci_identity_regions" "home-region" {
+  filter {
+    name   = "key"
+    values = [data.oci_identity_tenancy.tenancy.home_region_key]
+  }
 }
+
+provider "oci" {
+  alias            = "home"
+  region           = data.oci_identity_regions.home-region.regions[0]["name"]
+  ### Enable below variables if running this from local terraform installation
+  #tenancy_ocid     = var.tenancy_ocid 
+  #user_ocid        = var.user_ocid
+  #fingerprint      = var.fingerprint
+  #private_key_path = var.private_key_path
+}

terraform/schema.yaml

@@ -75,7 +75,7 @@ variableGroups:
       - admin_pwd
       - vcn_strategy_enum
       - adb_type_enum
-      - user_id
+      - user_ocid
       - fingerprint
       - private_key_path
       - use_marketplace_image
@@ -399,7 +399,7 @@ variables:
     description: The compartment in which to create the server compute instances
     required: true
 
-  user_id:
+  user_ocid:
     type: string
 
   private_key_path:

terraform/variables.tf

@@ -190,11 +190,11 @@ variable "mp_listing_id" {
 
 # Package version Reference
 variable "mp_listing_resource_version" {
-  default = "21.3.4"
+  default = "22.1.1.1"
 }
 
 # Use this variable along the use_marketplace_image to specify either the
 # Image artifact ocid to use the latest official marketplace image or your custom image ocid
 variable "instance_image_id" {
-  default = "ocid1.image.oc1..aaaaaaaadeywf3clwo5kf6xdvyrpfayh66fmuwws3onopvpnodd7wkuh6dna"
+  default = "ocid1.image.oc1..aaaaaaaalb6tbux65qelwpgvb7h5uklfzujeufaerq2qoh2tewlghnp5ie7a"
 }