Migrated compute metadata to use transport_tpg (GoogleCloudPlatform#17154)

Author: jcromanu

mmv1/third_party/terraform/services/compute/metadata.go.tmpl

@@ -7,7 +7,6 @@ import (
 	"errors"
 	{{- if ne $.TargetVersionName "ga" }}
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 	"reflect"
 	{{- end }}
 	"sort"
@@ -29,70 +28,26 @@ func MetadataRetryWrapper(update func() error) error {
 	return transport_tpg.MetadataRetryWrapper(update)
 }
 
-// Update the metadata (serverMD) according to the provided diff (oldMDMap v
-// newMDMap).
-func MetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interface{}, serverMD *compute.Metadata) {
-	curMDMap := make(map[string]string)
-	// Load metadata on server into map
-	for _, kv := range serverMD.Items {
-		// If the server state has a key that we had in our old
-		// state, but not in our new state, we should delete it
-		_, okOld := oldMDMap[kv.Key]
-		_, okNew := newMDMap[kv.Key]
+// MetadataUpdate merges the diff between oldMDMap and newMDMap into serverMD.
+// Keys present in oldMDMap but absent from newMDMap are removed from serverMD.
+// Keys present in newMDMap are inserted or overwritten in serverMD.
+// serverMD is modified in place.
+func MetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interface{}, serverMD map[string]interface{}) {
+	for key := range serverMD {
+		_, okOld := oldMDMap[key]
+		_, okNew := newMDMap[key]
 		if okOld && !okNew {
-			continue
-		} else {
-			curMDMap[kv.Key] = *kv.Value
+			delete(serverMD, key)
 		}
 	}
-
-	// Insert new metadata into existing metadata (overwriting when needed)
 	for key, val := range newMDMap {
-		curMDMap[key] = val.(string)
-	}
-
-	// Reformat old metadata into a list
-	serverMD.Items = nil
-	for key, val := range curMDMap {
-		v := val
-		serverMD.Items = append(serverMD.Items, &compute.MetadataItems{
-			Key:   key,
-			Value: &v,
-		})
+		serverMD[key] = val.(string)
 	}
 }
 
-// Update the beta metadata (serverMD) according to the provided diff (oldMDMap v
-// newMDMap).
-func BetaMetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interface{}, serverMD *compute.Metadata) {
-	curMDMap := make(map[string]string)
-	// Load metadata on server into map
-	for _, kv := range serverMD.Items {
-		// If the server state has a key that we had in our old
-		// state, but not in our new state, we should delete it
-		_, okOld := oldMDMap[kv.Key]
-		_, okNew := newMDMap[kv.Key]
-		if okOld && !okNew {
-			continue
-		} else {
-			curMDMap[kv.Key] = *kv.Value
-		}
-	}
-
-	// Insert new metadata into existing metadata (overwriting when needed)
-	for key, val := range newMDMap {
-		curMDMap[key] = val.(string)
-	}
-
-	// Reformat old metadata into a list
-	serverMD.Items = nil
-	for key, val := range curMDMap {
-		v := val
-		serverMD.Items = append(serverMD.Items, &compute.MetadataItems{
-			Key:   key,
-			Value: &v,
-		})
-	}
+// BetaMetadataUpdate is equivalent to MetadataUpdate.
+func BetaMetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interface{}, serverMD map[string]interface{}) {
+	MetadataUpdate(oldMDMap, newMDMap, serverMD)
 }
 
 func expandComputeMetadata(m map[string]interface{}) []*compute.MetadataItems {
@@ -176,53 +131,84 @@ func resourceInstanceMetadata(d tpgresource.TerraformResourceData) (*compute.Met
 }
 {{- if ne $.TargetVersionName "ga" }}
 
-func resourceInstancePartnerMetadata(d tpgresource.TerraformResourceData) (map[string]compute.StructuredEntries, error) {
-	partnerMetadata := make(map[string]compute.StructuredEntries)
+func resourceInstancePartnerMetadata(d tpgresource.TerraformResourceData) (map[string]interface{}, error) {
+	result := make(map[string]interface{})
 	partnerMetadataMap := d.Get("partner_metadata").(map[string]interface{})
-	if len(partnerMetadataMap) > 0 {
-		for key, value := range partnerMetadataMap {
-			var jsonMap map[string]interface{}
-			err := json.Unmarshal([]byte(value.(string)), &jsonMap)
-			if err != nil {
-				return nil, err
-			}
-			structuredEntries := jsonMap["entries"].(map[string]interface{})
-			structuredEntriesJson, err := json.Marshal(&structuredEntries)
-			if err != nil {
-				return nil, err
-			}
-			partnerMetadata[key] = compute.StructuredEntries{
-				Entries: googleapi.RawMessage(structuredEntriesJson),
-			}
+	for key, value := range partnerMetadataMap {
+		var parsed map[string]interface{}
+		if err := json.Unmarshal([]byte(value.(string)), &parsed); err != nil {
+			return nil, err
 		}
+		result[key] = parsed
 	}
-	return partnerMetadata, nil
+	return result, nil
 }
 
-func resourceInstancePatchPartnerMetadata(d tpgresource.TerraformResourceData, currentPartnerMetadata map[string]compute.StructuredEntries) map[string]compute.StructuredEntries {
+func resourceInstancePatchPartnerMetadata(d tpgresource.TerraformResourceData, currentPartnerMetadata map[string]interface{}) map[string]interface{} {
 	partnerMetadata, _ := resourceInstancePartnerMetadata(d)
 	for key := range currentPartnerMetadata {
 		if _, ok := partnerMetadata[key]; !ok {
-			partnerMetadata[key] = compute.StructuredEntries{}
+			partnerMetadata[key] = nil
 		}
 	}
 	return partnerMetadata
-
 }
-func flattenPartnerMetadata(partnerMetadata map[string]compute.StructuredEntries) (map[string]string, error) {
+
+func flattenPartnerMetadata(partnerMetadata map[string]interface{}) (map[string]string, error) {
 	partnerMetadataMap := make(map[string]string)
 	for key, value := range partnerMetadata {
+		if value == nil {
+			continue
+		}
+		jsonString, err := json.Marshal(value)
+		if err != nil {
+			return nil, err
+		}
+		partnerMetadataMap[key] = string(jsonString)
+	}
+	return partnerMetadataMap, nil
+}
 
-		jsonString, err := json.Marshal(&value)
+func convertPartnerMetadataToCompute(pm map[string]interface{}) (map[string]compute.StructuredEntries, error) {
+	result := make(map[string]compute.StructuredEntries)
+	for key, value := range pm {
+		if value == nil {
+			result[key] = compute.StructuredEntries{}
+			continue
+		}
+		seBytes, err := json.Marshal(value)
 		if err != nil {
 			return nil, err
 		}
-		if value.Entries != nil {
-			partnerMetadataMap[key] = string(jsonString)
+		var se compute.StructuredEntries
+		if err := json.Unmarshal(seBytes, &se); err != nil {
+			return nil, err
 		}
+		result[key] = se
+	}
+	return result, nil
+}
 
+func convertPartnerMetadataFromCompute(pm map[string]compute.StructuredEntries) map[string]interface{} {
+	result := make(map[string]interface{})
+	for key, value := range pm {
+		if value.Entries == nil {
+			result[key] = nil
+			continue
+		}
+		seBytes, err := json.Marshal(value)
+		if err != nil {
+			result[key] = nil
+			continue
+		}
+		var m map[string]interface{}
+		if err := json.Unmarshal(seBytes, &m); err != nil {
+			result[key] = nil
+			continue
+		}
+		result[key] = m
 	}
-	return partnerMetadataMap, nil
+	return result
 }
 func ComparePartnerMetadataDiff(_, old, new string, d *schema.ResourceData) bool {
 	var oldJson map[string]interface{}

mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl

@@ -1804,10 +1804,14 @@ func expandComputeInstance(project string, d *schema.ResourceData, config *trans
 	}
 
 	{{ if ne $.TargetVersionName `ga` -}}
-	PartnerMetadata, err := resourceInstancePartnerMetadata(d)
+	partnerMetadataMap, err := resourceInstancePartnerMetadata(d)
 	if err != nil {
 		return nil, fmt.Errorf("Error creating partner metadata: %s", err)
 	}
+	PartnerMetadata, err := convertPartnerMetadataToCompute(partnerMetadataMap)
+	if err != nil {
+		return nil, fmt.Errorf("Error converting partner metadata: %s", err)
+	}
 	{{- end }}
 
 	networkInterfaces, err := expandNetworkInterfaces(d, config)
@@ -2055,7 +2059,7 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 
 	{{ if ne $.TargetVersionName `ga` -}}
 	if instance.PartnerMetadata != nil {
-		partnerMetadata, err := flattenPartnerMetadata(instance.PartnerMetadata)
+		partnerMetadata, err := flattenPartnerMetadata(convertPartnerMetadataFromCompute(instance.PartnerMetadata))
 		if err != nil {
 			return fmt.Errorf("Error parsing partner metadata: %s", err)
 		}
@@ -2455,7 +2459,12 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 					return fmt.Errorf("Error retrieving partner_metadata: %s", err)
 				}
 				instance.Fingerprint = instance.Fingerprint
-				instance.PartnerMetadata = resourceInstancePatchPartnerMetadata(d, instance.PartnerMetadata)
+				patchedPM := resourceInstancePatchPartnerMetadata(d, convertPartnerMetadataFromCompute(instance.PartnerMetadata))
+				computePM, err := convertPartnerMetadataToCompute(patchedPM)
+				if err != nil {
+					return fmt.Errorf("Error converting partner metadata: %s", err)
+				}
+				instance.PartnerMetadata = computePM
 				instance.NullFields = []string{"partnerMetadata"}
 
 				op, err := NewClient(config, userAgent).Instances.Update(project, zone, instance.Name, instance).Do()

mmv1/third_party/terraform/services/compute/resource_compute_instance_template.go.tmpl

@@ -1637,7 +1637,11 @@ func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interfac
 		return err
 	}
 	{{- if ne $.TargetVersionName "ga" }}
-	PartnerMetadata, err := resourceInstancePartnerMetadata(d)
+	partnerMetadataMap, err := resourceInstancePartnerMetadata(d)
+	if err != nil {
+		return err
+	}
+	PartnerMetadata, err := convertPartnerMetadataToCompute(partnerMetadataMap)
 	if err != nil {
 		return err
 	}
@@ -2043,7 +2047,7 @@ func resourceComputeInstanceTemplateRead(d *schema.ResourceData, meta interface{
 
 	{{ if ne $.TargetVersionName `ga` -}}
 	if instanceTemplate.Properties.PartnerMetadata != nil {
-		partnerMetadata, err := flattenPartnerMetadata(instanceTemplate.Properties.PartnerMetadata)
+		partnerMetadata, err := flattenPartnerMetadata(convertPartnerMetadataFromCompute(instanceTemplate.Properties.PartnerMetadata))
 		if err != nil {
 			return fmt.Errorf("Error parsing partner metadata: %s", err)
 		}

mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template.go.tmpl

@@ -1307,7 +1307,11 @@ func resourceComputeRegionInstanceTemplateCreate(d *schema.ResourceData, meta in
 	}
 
 	{{ if ne $.TargetVersionName `ga` -}}
-	PartnerMetadata, err := resourceInstancePartnerMetadata(d)
+	partnerMetadataMap, err := resourceInstancePartnerMetadata(d)
+	if err != nil {
+		return err
+	}
+	PartnerMetadata, err := convertPartnerMetadataToCompute(partnerMetadataMap)
 	if err != nil {
 		return err
 	}
@@ -1502,7 +1506,7 @@ func resourceComputeRegionInstanceTemplateRead(d *schema.ResourceData, meta inte
 
 	{{ if ne $.TargetVersionName `ga` -}}
 	if instanceProperties.PartnerMetadata != nil {
-		partnerMetadata, err := flattenPartnerMetadata(instanceProperties.PartnerMetadata)
+		partnerMetadata, err := flattenPartnerMetadata(convertPartnerMetadataFromCompute(instanceProperties.PartnerMetadata))
 		if err != nil {
 			return fmt.Errorf("Error parsing partner metadata: %s", err)
 		}