tgc-revival: add cloudbuild resources (GoogleCloudPlatform#14953)

Author: zli82016

mmv1/api/resource.go

@@ -2164,7 +2164,7 @@ func (r Resource) TGCTestIgnorePropertiesToStrings(e resource.Examples) []string
 // Filters out computed properties during cai2hcl
 func (r Resource) ReadPropertiesForTgc() []*Type {
 	return google.Reject(r.AllUserProperties(), func(v *Type) bool {
-		return v.Output || v.UrlParamOnly
+		return v.Output || v.UrlParamOnly || v.TGCIgnoreRead
 	})
 }
 

mmv1/api/type.go

@@ -327,6 +327,8 @@ type Type struct {
 
 	// If true, the custom flatten function is not applied during cai2hcl
 	TGCIgnoreTerraformCustomFlatten bool `yaml:"tgc_ignore_terraform_custom_flatten,omitempty"`
+
+	TGCIgnoreRead bool `yaml:"tgc_ignore_read,omitempty"`
 }
 
 const MAX_NAME = 20

mmv1/products/cloudbuild/BitbucketServerConfig.yaml

@@ -40,6 +40,7 @@ async:
     base_url: '{{op_id}}'
   result:
     resource_inside_response: true
+include_in_tgc_next_DO_NOT_USE: true
 custom_code:
   encoder: 'templates/terraform/encoders/cloudbuild_bitbucketserver_config.go.tmpl'
   post_create: 'templates/terraform/post_create/cloudbuild_bitbucketserver_config.go.tmpl'

mmv1/products/cloudbuildv2/Connection.yaml

@@ -49,6 +49,7 @@ iam_policy:
 custom_code:
 exclude_tgc: true
 legacy_long_form_project: true
+include_in_tgc_next_DO_NOT_USE: true
 sweeper:
   url_substitutions:
     - region: "us-central1"
@@ -59,6 +60,8 @@ examples:
     primary_resource_name: 'fmt.Sprintf("tf-test-connection%s", context["random_suffix"])'
     vars:
       connection_name: 'tf-test-connection'
+    tgc_test_ignore_extra:
+      - github_config.app_installation_id # It has 0 in Terraform configuration
   - name: 'cloudbuildv2_connection_ghe'
     exclude_test: true
   - name: 'cloudbuildv2_connection_github'
@@ -70,6 +73,7 @@ parameters:
     url_param_only: true
     required: true
     immutable: true
+    custom_tgc_expand: 'templates/tgc_next/custom_expand/cloudbuildv2_repository_name.go.tmpl'
   - name: 'location'
     type: String
     description: The location for the resource

mmv1/products/cloudbuildv2/Repository.yaml

@@ -39,6 +39,7 @@ custom_code:
   encoder: 'templates/terraform/encoders/cloudbuildv2_repository.go.tmpl'
 exclude_tgc: true
 legacy_long_form_project: true
+include_in_tgc_next_DO_NOT_USE: true
 examples:
 # These tests depend on secrets stored in a separate project, so we prefer not
 # to show them in the docs.
@@ -48,18 +49,24 @@ examples:
       connection_name: 'connection'
       repository_name: 'repository'
     exclude_docs: true
+    tgc_test_ignore_extra:
+      - annotations # It has empty object in Terraform configuration
   - name: 'cloudbuildv2_repository_github'
     primary_resource_id: 'primary'
     vars:
       connection_name: 'connection'
       repository_name: 'repository'
     exclude_docs: true
+    tgc_test_ignore_extra:
+      - annotations # It has empty object in Terraform configuration
   - name: 'cloudbuildv2_repository_gle'
     primary_resource_id: 'primary'
     vars:
       connection_name: 'connection'
       repository_name: 'repository'
     exclude_docs: true
+    tgc_test_ignore_extra:
+      - annotations # It has empty object in Terraform configuration
   - name: 'cloudbuildv2_repository_ghe_doc'
     exclude_test: true
   - name: 'cloudbuildv2_repository_github_doc'
@@ -88,6 +95,8 @@ properties:
     required: true
     immutable: true
     ignore_read: true
+    tgc_ignore_read: true
+    custom_tgc_expand: 'templates/tgc_next/custom_expand/cloudbuildv2_repository_name.go.tmpl'
   - name: 'remoteUri'
     type: String
     description: Required. Git Clone HTTPS URI.

mmv1/templates/tgc_next/custom_expand/cloudbuildv2_connection_name.go.tmpl

@@ -0,0 +1,7 @@
+func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	m, err := tpgresource.ReplaceVarsForId(d, config, "{{"projects/{{project}}/locations/{{location}}/connections/{{name}}"}}")
+	if err != nil {
+		return nil, fmt.Errorf("Error constructing name: %s", err)
+	}
+	return m, nil
+}

mmv1/templates/tgc_next/custom_expand/cloudbuildv2_repository_name.go.tmpl

@@ -0,0 +1,7 @@
+func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	m, err := tpgresource.ReplaceVarsForId(d, config, "{{"projects/{{project}}/locations/{{location}}/connections/{{parent_connection}}/repositories/{{name}}"}}")
+	if err != nil {
+		return nil, fmt.Errorf("Error constructing name: %s", err)
+	}
+	return m, nil
+}