Sync instance subnet and hostname_label (#316)

An instances have 2 ways to set subnet_id and hostname_label: either at the
root level, or in create_vnic_details. By syncing both sets of properties with
the VNIC and setting all of these to computed, this change allows users to
switch between which version is used without causing changes to their plan.
This was partly in place before, but this change puts a few missing pieces in
place.

Author: briangustafson

resource_obmcs_core_instance.go

@@ -58,6 +58,7 @@ func InstanceResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
+				ForceNew: true,
 			},
 			"id": {
 				Type:     schema.TypeString,
@@ -71,6 +72,7 @@ func InstanceResource() *schema.Resource {
 			"ipxe_script": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"metadata": {
 				Type:     schema.TypeMap,
@@ -100,6 +102,7 @@ func InstanceResource() *schema.Resource {
 			"subnet_id": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 			"time_created": {
@@ -108,12 +111,10 @@ func InstanceResource() *schema.Resource {
 			},
 			"public_ip": {
 				Type:     schema.TypeString,
-				Required: false,
 				Computed: true,
 			},
 			"private_ip": {
 				Type:     schema.TypeString,
-				Required: false,
 				Computed: true,
 			},
 		},
@@ -352,8 +353,10 @@ func (s *InstanceResourceCrud) SetData() {
 		return
 	}
 
+	s.D.Set("hostname_label", vnic.HostnameLabel)
 	s.D.Set("public_ip", vnic.PublicIPAddress)
 	s.D.Set("private_ip", vnic.PrivateIPAddress)
+	s.D.Set("subnet_id", vnic.SubnetID)
 
 	RefreshCreateVnicDetails(s.D, vnic)
 }

resource_obmcs_core_instance_test.go

@@ -83,6 +83,7 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_basic() {
 					availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 					compartment_id = "${var.compartment_id}"
 					subnet_id = "${oci_core_subnet.t.id}"
+					hostname_label = "hostname1"
 					image = "${data.oci_core_images.t.images.0.id}"
 					shape = "VM.Standard1.1"
 					metadata {
@@ -105,7 +106,31 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_basic() {
 					},
 				),
 			},
-			// verify update
+			// Switching to create_vnic_details for subnet_id and hostname_label should not lead to a change.
+			{
+				ImportState:       true,
+				ImportStateVerify: true,
+				Config: s.Config + `
+				resource "oci_core_instance" "t" {
+					availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
+					compartment_id = "${var.compartment_id}"
+					create_vnic_details {
+						subnet_id = "${oci_core_subnet.t.id}"
+						hostname_label = "hostname1"
+					}
+					image = "${data.oci_core_images.t.images.0.id}"
+					shape = "VM.Standard1.1"
+					metadata {
+						ssh_authorized_keys = "${var.ssh_public_key}"
+					}
+					timeouts {
+						create = "15m"
+					}
+				}`,
+				ExpectNonEmptyPlan: false,
+				PlanOnly:           true,
+			},
+			// verify update - adds display name
 			{
 				ImportState:       true,
 				ImportStateVerify: true,
@@ -114,6 +139,7 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_basic() {
 					availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 					compartment_id = "${var.compartment_id}"
 					subnet_id = "${oci_core_subnet.t.id}"
+					hostname_label = "hostname1"
 					image = "${data.oci_core_images.t.images.0.id}"
 					shape = "VM.Standard1.1"
 					display_name = "-tf-instance"
@@ -132,7 +158,7 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_basic() {
 					},
 				),
 			},
-			// Adding create_vnic_details with the same subnet_id and an updateable fields should cause an update only.
+			// Adding create_vnic_details with the same subnet_id and an updatable fields should cause an update only.
 			{
 				ImportState:       true,
 				ImportStateVerify: true,