Update CustomTargetType resource to include googleCloudBuildRepo type (GoogleCloudPlatform#10543)

Author: katiexzhang

mmv1/products/clouddeploy/CustomTargetType.yaml

@@ -72,6 +72,12 @@ examples:
     primary_resource_name: 'fmt.Sprintf("tf-test-my-custom-target-type%s", context["random_suffix"])'
     vars:
       custom_target_type_name: "my-custom-target-type"
+  - !ruby/object:Provider::Terraform::Examples
+    name: "clouddeploy_custom_target_type_gcb_repo_skaffold_modules"
+    primary_resource_id: "custom-target-type"
+    primary_resource_name: 'fmt.Sprintf("tf-test-my-custom-target-type%s", context["random_suffix"])'
+    vars:
+      custom_target_type_name: "my-custom-target-type"
 parameters:
   - !ruby/object:Api::Type::String
     name: "location"
@@ -141,6 +147,7 @@ properties:
               exactly_one_of:
                 - git
                 - googleCloudStorage
+                - googleCloudBuildRepo
               properties:
                 - !ruby/object:Api::Type::String
                   name: "repo"
@@ -158,6 +165,7 @@ properties:
               exactly_one_of:
                 - git
                 - googleCloudStorage
+                - googleCloudBuildRepo
               properties:
                 - !ruby/object:Api::Type::String
                   name: "source"
@@ -166,3 +174,21 @@ properties:
                 - !ruby/object:Api::Type::String
                   name: "path"
                   description: "Relative path from the source to the Skaffold file."
+            - !ruby/object:Api::Type::NestedObject
+              name: "googleCloudBuildRepo"
+              description: "Cloud Build 2nd gen repository containing the Skaffold Config modules."
+              exactly_one_of:
+                - git
+                - googleCloudStorage
+                - googleCloudBuildRepo
+              properties:
+                - !ruby/object:Api::Type::String
+                  name: "repository"
+                  description: "Cloud Build 2nd gen repository in the format of 'projects/<project>/locations/<location>/connections/<connection>/repositories/<repository>'."
+                  required: true
+                - !ruby/object:Api::Type::String
+                  name: "path"
+                  description: "Relative path from the repository root to the Skaffold file."
+                - !ruby/object:Api::Type::String
+                  name: "ref"
+                  description: "Branch or tag to use when cloning the repository."

mmv1/templates/terraform/examples/clouddeploy_custom_target_type_gcb_repo_skaffold_modules.tf.erb

@@ -0,0 +1,17 @@
+resource "google_clouddeploy_custom_target_type" "<%= ctx[:primary_resource_id] %>" {
+    location = "us-central1"
+    name = "<%= ctx[:vars]['custom_target_type_name'] %>"
+    description = "My custom target type"
+    custom_actions {
+      render_action = "renderAction"
+      deploy_action = "deployAction"
+      include_skaffold_modules {
+        configs = ["my-config"]
+        google_cloud_build_repo {
+            repository = "projects/example/locations/us-central1/connections/git/repositories/example-repo"
+            path = "configs/skaffold.yaml"
+            ref = "main"
+        }
+      }
+    }
+}

mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go

@@ -80,6 +80,14 @@ resource "google_clouddeploy_custom_target_type" "custom-target-type" {
           ref = "main"
         }
       }
+      include_skaffold_modules {
+        configs = ["my-config3"]
+        google_cloud_build_repo {
+          repository = "projects/example/locations/us-central1/connections/git/repositories/example-repo"
+          path = "configs/skaffold.yaml"
+          ref = "main"
+        }
+      }
     }
 }
 `, context)