fix: build the shape list on the current AD (#88)

* fix: build the shape list on the current AD

Signed-off-by: Andrea Marchesini <[email protected]>

Author: snafuz

docs/terraformoptions.adoc

@@ -26,7 +26,7 @@
 |https://registry.terraform.io/providers/hashicorp/oci/latest/docs/resources/core_volume_backup_policy_assignment[oci_core_volume_backup_policy_assignment.boot_volume_backup_policy] |resource
 |https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_instance_credentials[oci_core_instance_credentials.credential] |data source
 |https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_private_ips[oci_core_private_ips.private_ips] |data source
-|https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_shapes[oci_core_shapes.ad1] |data source
+|https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_shapes[oci_core_shapes.current_ad] |data source
 |https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_subnet[oci_core_subnet.instance_subnet] |data source
 |https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_vnic_attachments[oci_core_vnic_attachments.vnic_attachment] |data source
 |https://registry.terraform.io/providers/hashicorp/oci/latest/docs/data-sources/core_volume_backup_policies[oci_core_volume_backup_policies.default_backup_policies] |data source

main.tf

@@ -42,18 +42,18 @@ data "oci_core_subnet" "instance_subnet" {
 ############
 
 // Create a data source for compute shapes.
-// Filter on AD1 to remove duplicates. This should give all the shapes supported on the region.
+// Filter on current AD to remove duplicates and give all the shapes supported on the AD.
 // This will not check quota and limits for AD requested at resource creation
-data "oci_core_shapes" "ad1" {
+data "oci_core_shapes" "current_ad" {
   compartment_id      = var.compartment_ocid
-  availability_domain = local.ADs[0]
+  availability_domain = local.ADs[(var.ad_number - 1)]
 }
 
 locals {
   shapes_config = {
     // prepare data with default values for flex shapes. Used to populate shape_config block with default values
-    // Iterate through data.oci_core_shapes.ad1.shapes (this exclude duplicate data in multi-ad regions) and create a map { name = { memory_in_gbs = "xx"; ocpus = "xx" } }
-    for i in data.oci_core_shapes.ad1.shapes : i.name => {
+    // Iterate through data.oci_core_shapes.current_ad.shapes (this exclude duplicate data in multi-ad regions) and create a map { name = { memory_in_gbs = "xx"; ocpus = "xx" } }
+    for i in data.oci_core_shapes.current_ad.shapes : i.name => {
       "memory_in_gbs" = i.memory_in_gbs
       "ocpus"         = i.ocpus
     }
@@ -77,7 +77,7 @@ resource "oci_core_instance" "instance" {
   shape                = var.shape
   shape_config {
     // If shape name contains ".Flex" and instance_flex inputs are not null, use instance_flex inputs values for shape_config block
-    // Else use values from data.oci_core_shapes.ad1 for var.shape
+    // Else use values from data.oci_core_shapes.current_ad for var.shape
     memory_in_gbs = local.shape_is_flex == true && var.instance_flex_memory_in_gbs != null ? var.instance_flex_memory_in_gbs : local.shapes_config[var.shape]["memory_in_gbs"]
     ocpus         = local.shape_is_flex == true && var.instance_flex_ocpus != null ? var.instance_flex_ocpus : local.shapes_config[var.shape]["ocpus"]
   }