fix: Ignore lifecycle changes, and use consistent fallback shape (#51)

* Use up-to-date fallback shape consistently

Signed-off-by: Devon Crouse <[email protected]>

* Ignore lifecycle changes for availability_domain, defined_tags, metadata

Signed-off-by: Devon Crouse <[email protected]>

Signed-off-by: Devon Crouse <[email protected]>

Author: devoncrouse

compute.tf

@@ -34,18 +34,18 @@ resource "oci_core_instance" "bastion" {
 
   # prevent the bastion from destroying and recreating itself if the image ocid changes 
   lifecycle {
-    ignore_changes = [freeform_tags, source_details[0].source_id]
+    ignore_changes = [availability_domain, defined_tags, freeform_tags, metadata, source_details[0].source_id]
   }
 
   metadata = {
     ssh_authorized_keys = (var.ssh_public_key != "") ? var.ssh_public_key : (var.ssh_public_key_path != "none") ? file(var.ssh_public_key_path) : ""
     user_data           = var.bastion_image_id == "Autonomous" ? data.cloudinit_config.bastion.rendered : null
   }
 
-  shape = lookup(var.bastion_shape, "shape", "VM.Standard.E2.2")
+  shape = local.shape
 
   dynamic "shape_config" {
-    for_each = length(regexall("Flex", lookup(var.bastion_shape, "shape", "VM.Standard.E3.Flex"))) > 0 ? [1] : []
+    for_each = length(regexall("Flex", local.shape)) > 0 ? [1] : []
     content {
       ocpus         = max(1, lookup(var.bastion_shape, "ocpus", 1))
       memory_in_gbs = (lookup(var.bastion_shape, "memory", 4) / lookup(var.bastion_shape, "ocpus", 1)) > 64 ? (lookup(var.bastion_shape, "ocpus", 1) * 4) : lookup(var.bastion_shape, "memory", 4)

locals.tf

@@ -13,6 +13,9 @@ locals {
 
   bastion_image_id = var.bastion_image_id == "Autonomous" ? data.oci_core_images.autonomous_images.images.0.id : var.bastion_image_id
 
+  default_shape = "VM.Standard.E4.Flex"
+  shape = lookup(var.bastion_shape, "shape", local.default_shape)
+
   notification_template = base64gzip(
     templatefile("${path.module}/scripts/notification.template.sh",
       {