Update instances to deprecate hostname_label and subnet_id

Author: parrneet

CHANGELOG.md

@@ -3,6 +3,9 @@
 ### Added
 - Support for Oracle Digital Assistant
 
+### Deprecated
+- Instances: The `hostname_label` and `subnet_id` attributes are now deprecated. Please use the `hostname_label` and `subnet_id` attributes under `create_vnic_details`.
+
 ### Fixed
 - Update for whitelisted ips in `oci_autonomous_database`
 

examples/compute/extended_metadata/extended_metadata.tf

@@ -91,9 +91,12 @@ resource "oci_core_instance" "test_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "TestInstance"
-  hostname_label      = "testinstance"
   shape               = "VM.Standard2.1"
-  subnet_id           = "${oci_core_subnet.test_subnet.id}"
+
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.test_subnet.id}"
+    hostname_label = "testinstance"
+  }
 
   source_details {
     source_type = "image"

examples/compute/vnic/vnic.tf

@@ -72,7 +72,6 @@ resource "oci_core_instance" "test_instance" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "TestInstance"
   shape               = "VM.Standard2.1"
-  subnet_id           = "${oci_core_subnet.test_subnet.id}"
 
   source_details {
     source_type = "image"

examples/compute/windows/windows.tf

@@ -183,15 +183,18 @@ resource "oci_core_instance" "test_instance" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "${var.instance_name}"
   shape               = "VM.Standard2.1"
-  subnet_id           = "${oci_core_subnet.test_subnet.id}"
-  hostname_label      = "winmachine"
 
   # Refer cloud-init in https://docs.cloud.oracle.com/iaas/api/#/en/iaas/20160918/datatypes/LaunchInstanceDetails
   metadata = {
     # Base64 encoded YAML based user_data to be passed to cloud-init
     user_data = "${data.template_cloudinit_config.cloudinit_config.rendered}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.test_subnet.id}"
+    hostname_label = "winmachine"
+  }
+
   source_details {
     boot_volume_size_in_gbs = "${var.size_in_gbs}"
     source_id               = "${var.instance_image_ocid[var.region]}"

examples/kms/instance.tf

@@ -4,14 +4,17 @@ resource "oci_core_instance" "my_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_id}"
   display_name        = "my instance with FSS access"
-  hostname_label      = "myinstance"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.my_subnet.id}"
 
   metadata = {
     ssh_authorized_keys = "${var.ssh_public_key}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.my_subnet.id}"
+    hostname_label = "myinstance"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"

examples/load_balancer/lb_full/lb_full.tf

@@ -153,13 +153,16 @@ resource "oci_core_instance" "instance1" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "be-instance1"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.subnet1.id}"
-  hostname_label      = "be-instance1"
 
   metadata = {
     user_data = "${base64encode(var.user-data)}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.subnet1.id}"
+    hostname_label = "be-instance1"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"
@@ -171,13 +174,16 @@ resource "oci_core_instance" "instance2" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "be-instance2"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.subnet2.id}"
-  hostname_label      = "be-instance2"
 
   metadata = {
     user_data = "${base64encode(var.user-data)}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.subnet2.id}"
+    hostname_label = "be-instance2"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"

examples/networking/private_ip/private_ip.tf

@@ -65,11 +65,11 @@ resource "oci_core_instance" "test_instance1" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "testInstance"
-  hostname_label      = "instance"
   shape               = "${var.instance_shape}"
 
   create_vnic_details {
-    subnet_id = "${oci_core_subnet.example_subnet.id}"
+    subnet_id      = "${oci_core_subnet.example_subnet.id}"
+    hostname_label = "instance"
   }
 
   source_details {

examples/networking/public_ip/public_ip.tf

@@ -66,7 +66,6 @@ resource "oci_core_instance" "test_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "testInstance"
-  hostname_label      = "instance"
   shape               = "${var.instance_shape}"
 
   source_details {
@@ -78,6 +77,7 @@ resource "oci_core_instance" "test_instance" {
     assign_public_ip = false
     display_name     = "primaryVnic"
     subnet_id        = "${oci_core_subnet.test_subnet.id}"
+    hostname_label   = "instance"
   }
 }
 

examples/storage/fss/instance.tf

@@ -4,14 +4,17 @@ resource "oci_core_instance" "my_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "my instance with FSS access"
-  hostname_label      = "myinstance"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.my_subnet.id}"
 
   metadata = {
     ssh_authorized_keys = "${var.ssh_public_key}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.my_subnet.id}"
+    hostname_label = "myinstance"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"

oci/core_instance_resource.go

@@ -201,6 +201,7 @@ func CoreInstanceResource() *schema.Resource {
 				Computed:         true,
 				ForceNew:         true,
 				DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
+				Deprecated:       FieldDeprecatedForAnother("hostname_label", "hostname_label under create_vnic_details"),
 			},
 			"image": {
 				Type:       schema.TypeString,
@@ -330,10 +331,11 @@ func CoreInstanceResource() *schema.Resource {
 				},
 			},
 			"subnet_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
+				Type:       schema.TypeString,
+				Optional:   true,
+				Computed:   true,
+				ForceNew:   true,
+				Deprecated: FieldDeprecatedForAnother("subnet_id", "subnet_id under create_vnic_details"),
 			},
 
 			// Computed