resourceIdentity: generalize custom_identity (#15784)

Author: BBBmau

mmv1/api/resource.go

@@ -656,6 +656,12 @@ func (r Resource) IdentityProperties() []*Type {
 		}
 	}
 
+	if len(r.CustomCode.CustomIdentity) > 0 {
+		for _, fieldName := range r.CustomCode.CustomIdentity {
+			props = append(props, &Type{Name: google.Underscore(fieldName), Type: "string", Required: true})
+		}
+	}
+
 	return props
 }
 

mmv1/api/resource/custom_code.go

@@ -130,10 +130,7 @@ type CustomCode struct {
 
 	// This code replaces the entire identity schema method.  Since the identity schema method's function header can't be changed, the template
 	// inserts that for you - do not include it in your custom code.
-	CustomIdentitySchema *string `yaml:"custom_identity_schema,omitempty"`
-
-	// This code is run in the Read method to set the identity.
-	CustomIdentityRead string `yaml:"custom_identity_read"`
+	CustomIdentity []string `yaml:"custom_identity,omitempty"`
 
 	// This code is run just after the import method succeeds - it
 	// is useful for parsing attributes that are necessary for

mmv1/products/apigee/AddonsConfig.yaml

@@ -41,8 +41,8 @@ async:
 custom_code:
   custom_import: 'templates/terraform/custom_import/apigee_addons.go.tmpl'
   test_check_destroy: 'templates/terraform/custom_check_destroy/apigee_addons_override.go.tmpl'
-  custom_identity_schema: 'templates/terraform/custom_identity_schema/apigee_addons.go.tmpl'
-  custom_identity_read: 'templates/terraform/custom_identity_read/apigee_addons.go.tmpl'
+  custom_identity:
+    - 'org'
 examples:
   - name: 'apigee_addons_basic'
     exclude_test: true

mmv1/products/iap/Brand.yaml

@@ -57,8 +57,8 @@ identity:
   - name
 custom_code:
   custom_import: 'templates/terraform/custom_import/iap_brand.go.tmpl'
-  custom_identity_schema: 'templates/terraform/custom_identity_schema/iap_brand.go.tmpl'
-  custom_identity_read: 'templates/terraform/custom_identity_read/iap_brand.go.tmpl'
+  custom_identity:
+    - 'project'
 examples:
   - name: 'iap_brand'
     primary_resource_id: 'project_brand'

mmv1/templates/terraform/custom_identity_read/apigee_addons.go.tmpl

@@ -163,9 +163,6 @@ func Resource{{ $.ResourceName -}}() *schema.Resource {
         DeprecationMessage: "{{ $.DeprecationMessage -}}",
 {{- end}}
 
-{{ if $.CustomCode.CustomIdentitySchema }}
-    {{ $.CustomTemplate $.CustomCode.CustomIdentitySchema false -}}
-{{ else }}
         Identity: &schema.ResourceIdentity{
           Version: {{ $.GetIdentitySchemaVersion }},
           SchemaFunc: func() map[string]*schema.Schema {
@@ -194,7 +191,6 @@ func Resource{{ $.ResourceName -}}() *schema.Resource {
           },
 {{- end }}
         },
-{{- end }}
         Schema: map[string]*schema.Schema{
 			{{- range $prop := $.OrderProperties $.AllUserProperties }}
 {{template "SchemaFields" $prop -}}
@@ -750,9 +746,6 @@ func resource{{ $.ResourceName -}}Read(d *schema.ResourceData, meta interface{})
     }
 {{- end}}
 
-{{- if $.CustomCode.CustomIdentityRead }}
-    {{ $.CustomTemplate $.CustomCode.CustomIdentityRead true -}}
-{{- else }}
 	identity, err := d.Identity()
     if err != nil && identity != nil {
     {{- range $p := $.IdentityProperties }}
@@ -767,7 +760,6 @@ func resource{{ $.ResourceName -}}Read(d *schema.ResourceData, meta interface{})
         log.Printf("[DEBUG] identity not set: %s", err)
     }
 {{- end }}
-{{  end -}}
     return nil
 }