Updated to 22.2

Updated variables to use latest 22.2 spatial studio marketplace image

Author: jvizcarr

terraform/compute.tf

@@ -37,6 +37,7 @@ resource "oci_core_instance" "simple-vm" {
     ssh_authorized_keys = var.ssh_public_key
     user_data           = base64encode(file("./scripts/bootstrap.sh"))
 
+    https_only = true
     server_ssl_port = var.console_ssl_port
     use_secrets     = var.use_secrets
     admin_user = var.admin_user
@@ -58,7 +59,8 @@ resource "oci_core_instance" "simple-vm" {
     #required when using existing adb, optional for new one and will be defaulted to sgtech
     adb_user = var.adb_user
     #required when using existing adb, optional for new one and will be defaulted to admin's
-    adb_user_password_ocid = var.adb_user_password_ocid 
+    adb_user_pwd = var.adb_user_password_ocid 
+    adb_use_secrets = true
     #required to set max/min connections for studio
     is_free_adb = local.is_free_adb
 

terraform/locals.tf

@@ -23,19 +23,12 @@ locals {
   listing_resource_id      = local.compute_image_id
   listing_resource_version = var.mp_listing_resource_version
 
-  compute_flexible_shapes = [
-    "VM.Standard.E3.Flex",
-    "VM.Standard.E4.Flex",
-    "VM.Standard3.Flex",
-    "VM.Optimized3.Flex"
-  ]
-
   compute_arm_shapes = [
     "VM.Standard.A1.Flex"
   ]
 
   # local.is_flex_shape referenced in compute.tf
-  is_flex_shape = contains(local.compute_flexible_shapes,var.instance_shape.instanceShape) ? [1] : []
+  is_flex_shape = contains(split(".",var.instance_shape.instanceShape), "Flex") ? [1] : []
 
   is_arm_shape = contains(local.compute_arm_shapes,var.instance_shape.instanceShape) ? true : false
 

terraform/variables.tf

@@ -190,11 +190,11 @@ variable "mp_listing_id" {
 
 # Package version Reference
 variable "mp_listing_resource_version" {
-  default = "22.1.1.1"
+  default = "22.2.0.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..aaaaaaaalb6tbux65qelwpgvb7h5uklfzujeufaerq2qoh2tewlghnp5ie7a"
+  default = "ocid1.image.oc1..aaaaaaaalrslmrm5tx6eitzqs46usxmpyddj3yzmxrp63pb5ij4ibx4vyw5q"
 }