Support regional Subnets by making Availability Domain parameter optional

Author: ccushing

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## 3.15.1 (Unreleased)
+Enable regional Subnets by making Availability Domain optional when creating a Subnet
 
 ### Added
 - Adding description property to rules in Steering Policies in DNS

docs/examples/networking/subnet/subnet.tf

@@ -19,29 +19,36 @@ variable "availability_domain" {
   default = 3
 }
 
-resource "oci_core_virtual_network" "ExampleVCN" {
-  cidr_block     = "10.1.0.0/16"
+resource "oci_core_virtual_network" "vcn1" {
+  cidr_block     = "10.0.0.0/16"
   compartment_id = "${var.compartment_ocid}"
   display_name   = "TFExampleVCN"
   dns_label      = "tfexamplevcn"
 }
 
-/* 
-Because you can specify multiple security lists/subnet the security_list_ids value must be specified as a list in []'s.
- See https://www.terraform.io/docs/configuration/syntax.html
-   
-Generally you wouldn't specify a subnet without first specifying a VCN. Once the VCN has been created you would get the vcn_id, route_table_id, and security_list_id(s) from that resource and use Terraform attributes below to populate those values.
- See https://www.terraform.io/docs/configuration/interpolation.html*/
-resource "oci_core_subnet" "ExampleSubnet" {
+// A regional subnet will not specify an Availability Domain
+resource "oci_core_subnet" "subnet1" {
+  cidr_block        = "10.0.1.0/24"
+  display_name      = "TFRegionalSubnet"
+  dns_label         = "regionalsubnet"
+  compartment_id    = "${var.compartment_ocid}"
+  vcn_id            = "${oci_core_virtual_network.vcn1.id}"
+  security_list_ids = ["${oci_core_virtual_network.vcn1.default_security_list_id}"]
+  route_table_id    = "${oci_core_virtual_network.vcn1.default_route_table_id}"
+  dhcp_options_id   = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
+}
+
+// An AD based subnet will supply an Availability Domain
+resource "oci_core_subnet" "subnet2" {
   availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
-  cidr_block          = "10.1.1.0/24"
-  display_name        = "TFExampleSubnet"
-  dns_label           = "tfexamplesubnet"
+  cidr_block          = "10.0.2.0/24"
+  display_name        = "TFADSubnet"
+  dns_label           = "adsubnet"
   compartment_id      = "${var.compartment_ocid}"
-  vcn_id              = "${oci_core_virtual_network.ExampleVCN.id}"
-  security_list_ids   = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
-  route_table_id      = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
-  dhcp_options_id     = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
+  vcn_id              = "${oci_core_virtual_network.vcn1.id}"
+  security_list_ids   = ["${oci_core_virtual_network.vcn1.default_security_list_id}"]
+  route_table_id      = "${oci_core_virtual_network.vcn1.default_route_table_id}"
+  dhcp_options_id     = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
 }
 
 data "oci_identity_availability_domains" "ADs" {

oci/core_subnet_resource.go

@@ -22,11 +22,6 @@ func CoreSubnetResource() *schema.Resource {
 		Delete:   deleteCoreSubnet,
 		Schema: map[string]*schema.Schema{
 			// Required
-			"availability_domain": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
 			"cidr_block": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -44,6 +39,12 @@ func CoreSubnetResource() *schema.Resource {
 			},
 
 			// Optional
+			"availability_domain": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
 			"defined_tags": {
 				Type:             schema.TypeMap,
 				Optional:         true,

oci/core_subnet_test.go

@@ -38,10 +38,10 @@ var (
 	}
 
 	subnetRepresentation = map[string]interface{}{
-		"availability_domain":        Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"cidr_block":                 Representation{repType: Required, create: `10.0.0.0/16`},
 		"compartment_id":             Representation{repType: Required, create: `${var.compartment_id}`},
 		"vcn_id":                     Representation{repType: Required, create: `${oci_core_vcn.test_vcn.id}`},
+		"availability_domain":        Representation{repType: Optional, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"defined_tags":               Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"dhcp_options_id":            Representation{repType: Optional, create: `${oci_core_vcn.test_vcn.default_dhcp_options_id}`, update: `${oci_core_dhcp_options.test_dhcp_options.id}`},
 		"display_name":               Representation{repType: Optional, create: `MySubnet`, update: `displayName2`},
@@ -82,7 +82,6 @@ func TestCoreSubnetResource_basic(t *testing.T) {
 				Config: config + compartmentIdVariableStr + SubnetResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
 					resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(resourceName, "dhcp_options_id"),

website/docs/r/core_subnet.html.markdown

@@ -47,13 +47,13 @@ VCN Resolver to resolve hostnames for instances in the subnet. For more informat
 ```hcl
 resource "oci_core_subnet" "test_subnet" {
 	#Required
-	availability_domain = "${var.subnet_availability_domain}"
 	cidr_block = "${var.subnet_cidr_block}"
 	compartment_id = "${var.compartment_id}"
 	security_list_ids = "${var.subnet_security_list_ids}"
 	vcn_id = "${oci_core_vcn.test_vcn.id}"
 
 	#Optional
+	availability_domain = "${var.subnet_availability_domain}"
 	defined_tags = {"Operations.CostCenter"= "42"}
 	dhcp_options_id = "${oci_core_dhcp_options.test_dhcp_options.id}"
 	display_name = "${var.subnet_display_name}"
@@ -68,7 +68,7 @@ resource "oci_core_subnet" "test_subnet" {
 
 The following arguments are supported:
 
-* `availability_domain` - (Required) The availability domain to contain the subnet.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - (Optional) The availability domain to contain the subnet.  Example: `Uocm:PHX-AD-1` 
 * `cidr_block` - (Required) The CIDR IP address range of the subnet.  Example: `172.16.1.0/24` 
 * `compartment_id` - (Required) The OCID of the compartment to contain the subnet.
 * `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`