Fix issue #1830

ibm/resource_ibm_is_instance.go

@@ -207,6 +207,8 @@ func resourceIBMISInstance() *schema.Resource {
 						},
 						isInstanceNicPrimaryIpv4Address: {
 							Type:     schema.TypeString,
+							ForceNew: true,
+							Optional: true,
 							Computed: true,
 						},
 						isInstanceNicSecurityGroups: {
@@ -241,6 +243,8 @@ func resourceIBMISInstance() *schema.Resource {
 						},
 						isInstanceNicPrimaryIpv4Address: {
 							Type:     schema.TypeString,
+							ForceNew: true,
+							Optional: true,
 							Computed: true,
 						},
 						isInstanceNicSecurityGroups: {
@@ -487,6 +491,11 @@ func classicInstanceCreate(d *schema.ResourceData, meta interface{}, profile, na
 		if ok {
 			primnicobj.Name = &namestr
 		}
+		ipv4, _ := primnic[isInstanceNicPrimaryIpv4Address]
+		ipv4str := ipv4.(string)
+		if ipv4str != "" {
+			primnicobj.PrimaryIpv4Address = &ipv4str
+		}
 		secgrpintf, ok := primnic[isInstanceNicSecurityGroups]
 		if ok {
 			secgrpSet := secgrpintf.(*schema.Set)
@@ -521,6 +530,11 @@ func classicInstanceCreate(d *schema.ResourceData, meta interface{}, profile, na
 			if ok && namestr != "" {
 				nwInterface.Name = &namestr
 			}
+			ipv4, _ := nic[isInstanceNicPrimaryIpv4Address]
+			ipv4str := ipv4.(string)
+			if ipv4str != "" {
+				nwInterface.PrimaryIpv4Address = &ipv4str
+			}
 			secgrpintf, ok := nic[isInstanceNicSecurityGroups]
 			if ok {
 				secgrpSet := secgrpintf.(*schema.Set)
@@ -623,13 +637,13 @@ func instanceCreate(d *schema.ResourceData, meta interface{}, profile, name, vpc
 		if ok {
 			volTemplate.Name = &namestr
 		}
-		// enc, ok := bootvol[isInstanceBootEncryption]
-		// encstr := enc.(string)
-		// if ok && encstr != "" {
-		// 	volTemplate.EncryptionKey = &vpcv1.EncryptionKeyIdentity{
-		// 		Crn: &encstr,
-		// 	}
-		// }
+		enc, ok := bootvol[isInstanceBootEncryption]
+		encstr := enc.(string)
+		if ok && encstr != "" {
+			volTemplate.EncryptionKey = &vpcv1.EncryptionKeyIdentity{
+				CRN: &encstr,
+			}
+		}
 		volcap := 100
 		volcapint64 := int64(volcap)
 		volprof := "general-purpose"
@@ -657,6 +671,11 @@ func instanceCreate(d *schema.ResourceData, meta interface{}, profile, name, vpc
 		if namestr != "" {
 			primnicobj.Name = &namestr
 		}
+		ipv4, _ := primnic[isInstanceNicPrimaryIpv4Address]
+		ipv4str := ipv4.(string)
+		if ipv4str != "" {
+			primnicobj.PrimaryIpv4Address = &ipv4str
+		}
 		secgrpintf, ok := primnic[isInstanceNicSecurityGroups]
 		if ok {
 			secgrpSet := secgrpintf.(*schema.Set)
@@ -690,6 +709,11 @@ func instanceCreate(d *schema.ResourceData, meta interface{}, profile, name, vpc
 			if ok && namestr != "" {
 				nwInterface.Name = &namestr
 			}
+			ipv4, _ := nic[isInstanceNicPrimaryIpv4Address]
+			ipv4str := ipv4.(string)
+			if ipv4str != "" {
+				nwInterface.PrimaryIpv4Address = &ipv4str
+			}
 			secgrpintf, ok := nic[isInstanceNicSecurityGroups]
 			if ok {
 				secgrpSet := secgrpintf.(*schema.Set)

website/docs/r/is_instance.html.markdown

@@ -164,11 +164,13 @@ The following arguments are supported:
 Nested `primary_network_interface` block have the following structure:
   * `name` - (Optional, string) The name of the network interface.
   * `port_speed` - (Deprecated, int) Speed of the network interface.
+  * `primary_ipv4_address` - (Optional, Forces new resource, string) The IPV4 address of the interface
   * `subnet` -  (Required, string) ID of the subnet.
   * `security_groups` - (Optional, list) Comma separated IDs of security groups.
 * `network_interfaces` - (Optional, Forces new resource, list) A nested block describing the additional network interface of this instance.
 Nested `network_interfaces` block have the following structure:
   * `name` - (Optional, string) The name of the network interface.
+  * `primary_ipv4_address` - (Optional, Forces new resource, string) The IPV4 address of the interface
   * `subnet` -  (Required, string) ID of the subnet.
   * `security_groups` - (Optional, list) Comma separated IDs of security groups.