Added a fix to avoid diff on cluster nw

Author: uibm

ibm/service/vpc/data_source_ibm_is_instance.go

@@ -1344,16 +1344,16 @@ func instanceGetByName(d *schema.ResourceData, meta interface{}, name string) er
 
 	// cluster changes
 
+	clusterNetwork := []map[string]interface{}{}
 	if !core.IsNil(instance.ClusterNetwork) {
-		clusterNetwork := []map[string]interface{}{}
 		clusterNetworkMap, err := DataSourceIBMIsInstanceClusterNetworkReferenceToMap(instance.ClusterNetwork)
 		if err != nil {
 			return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_instance", "read", "cluster_network-to-map")
 		}
 		clusterNetwork = append(clusterNetwork, clusterNetworkMap)
-		if err = d.Set("cluster_network", clusterNetwork); err != nil {
-			return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting cluster_network: %s", err), "(Data) ibm_is_instance", "read", "set-cluster_network")
-		}
+	}
+	if err = d.Set("cluster_network", clusterNetwork); err != nil {
+		return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting cluster_network: %s", err), "(Data) ibm_is_instance", "read", "set-cluster_network")
 	}
 
 	clusterNetworkAttachments := []map[string]interface{}{}

ibm/service/vpc/data_source_ibm_is_instances.go

@@ -1523,14 +1523,15 @@ func instancesList(d *schema.ResourceData, meta interface{}) error {
 			catalogList = append(catalogList, catalogMap)
 			l[isInstanceCatalogOffering] = catalogList
 		}
-
+		clusterNetwork := []map[string]interface{}{}
 		if instance.ClusterNetwork != nil {
 			clusterNetworkMap, err := DataSourceIBMIsInstancesClusterNetworkReferenceToMap(instance.ClusterNetwork)
 			if err != nil {
 				return err
 			}
-			l["cluster_network"] = []map[string]interface{}{clusterNetworkMap}
+			clusterNetwork = append(clusterNetwork, clusterNetworkMap)
 		}
+		l["cluster_network"] = clusterNetwork
 		clusterNetworkAttachments := []map[string]interface{}{}
 		for _, clusterNetworkAttachmentsItem := range instance.ClusterNetworkAttachments {
 			clusterNetworkAttachmentsItemMap, err := DataSourceIBMIsInstancesInstanceClusterNetworkAttachmentReferenceToMap(&clusterNetworkAttachmentsItem) // #nosec G601

ibm/service/vpc/resource_ibm_is_instance.go

@@ -4920,7 +4920,7 @@ func instanceGet(d *schema.ResourceData, meta interface{}, id string) error {
 		if err != nil {
 			return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_instance", "read", "cluster_network-to-map")
 		}
-		clusterNetwork = []map[string]interface{}{clusterNetworkMap}
+		clusterNetwork = append(clusterNetwork, clusterNetworkMap)
 	}
 	if err = d.Set("cluster_network", clusterNetwork); err != nil {
 		err = fmt.Errorf("Error setting cluster_network: %s", err)