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

[upstream:121ec509180d23b0bdda2f44349261454ada20d0]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type.go

@@ -129,6 +129,32 @@ Please refer to the field 'effective_annotations' for all of the annotations pre
 										},
 										ExactlyOneOf: []string{},
 									},
+									"google_cloud_build_repo": {
+										Type:        schema.TypeList,
+										Optional:    true,
+										Description: `Cloud Build 2nd gen repository containing the Skaffold Config modules.`,
+										MaxItems:    1,
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"repository": {
+													Type:        schema.TypeString,
+													Required:    true,
+													Description: `Cloud Build 2nd gen repository in the format of 'projects/<project>/locations/<location>/connections/<connection>/repositories/<repository>'.`,
+												},
+												"path": {
+													Type:        schema.TypeString,
+													Optional:    true,
+													Description: `Relative path from the repository root to the Skaffold file.`,
+												},
+												"ref": {
+													Type:        schema.TypeString,
+													Optional:    true,
+													Description: `Branch or tag to use when cloning the repository.`,
+												},
+											},
+										},
+										ExactlyOneOf: []string{},
+									},
 									"google_cloud_storage": {
 										Type:        schema.TypeList,
 										Optional:    true,
@@ -677,9 +703,10 @@ func flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModules(v int
 			continue
 		}
 		transformed = append(transformed, map[string]interface{}{
-			"configs":              flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesConfigs(original["configs"], d, config),
-			"git":                  flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGit(original["git"], d, config),
-			"google_cloud_storage": flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudStorage(original["googleCloudStorage"], d, config),
+			"configs":                 flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesConfigs(original["configs"], d, config),
+			"git":                     flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGit(original["git"], d, config),
+			"google_cloud_storage":    flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudStorage(original["googleCloudStorage"], d, config),
+			"google_cloud_build_repo": flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepo(original["googleCloudBuildRepo"], d, config),
 		})
 	}
 	return transformed
@@ -740,6 +767,35 @@ func flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogle
 	return v
 }
 
+func flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepo(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["repository"] =
+		flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRepository(original["repository"], d, config)
+	transformed["path"] =
+		flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoPath(original["path"], d, config)
+	transformed["ref"] =
+		flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRef(original["ref"], d, config)
+	return []interface{}{transformed}
+}
+func flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRepository(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoPath(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRef(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenClouddeployCustomTargetTypeEffectiveAnnotations(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -839,6 +895,13 @@ func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModules(v inte
 			transformed["googleCloudStorage"] = transformedGoogleCloudStorage
 		}
 
+		transformedGoogleCloudBuildRepo, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepo(original["google_cloud_build_repo"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedGoogleCloudBuildRepo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["googleCloudBuildRepo"] = transformedGoogleCloudBuildRepo
+		}
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -927,6 +990,51 @@ func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleC
 	return v, nil
 }
 
+func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedRepository, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRepository(original["repository"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedRepository); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["repository"] = transformedRepository
+	}
+
+	transformedPath, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoPath(original["path"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedPath); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["path"] = transformedPath
+	}
+
+	transformedRef, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRef(original["ref"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedRef); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["ref"] = transformedRef
+	}
+
+	return transformed, nil
+}
+
+func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRepository(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoPath(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRef(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandClouddeployCustomTargetTypeEffectiveAnnotations(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go

@@ -170,6 +170,53 @@ resource "google_clouddeploy_custom_target_type" "custom-target-type" {
 `, context)
 }
 
+func TestAccClouddeployCustomTargetType_clouddeployCustomTargetTypeGcbRepoSkaffoldModulesExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckClouddeployCustomTargetTypeDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClouddeployCustomTargetType_clouddeployCustomTargetTypeGcbRepoSkaffoldModulesExample(context),
+			},
+			{
+				ResourceName:            "google_clouddeploy_custom_target_type.custom-target-type",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"name", "location", "annotations", "labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccClouddeployCustomTargetType_clouddeployCustomTargetTypeGcbRepoSkaffoldModulesExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_clouddeploy_custom_target_type" "custom-target-type" {
+    location = "us-central1"
+    name = "tf-test-my-custom-target-type%{random_suffix}"
+    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"
+        }
+      }
+    }
+}
+`, context)
+}
+
 func testAccCheckClouddeployCustomTargetTypeDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go

@@ -82,6 +82,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)

website/docs/r/clouddeploy_custom_target_type.html.markdown

@@ -110,6 +110,33 @@ resource "google_clouddeploy_custom_target_type" "custom-target-type" {
     }
 }
 ```
+<div class = "oics-button" style="float: right; margin: 0 0 -15px">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_working_dir=clouddeploy_custom_target_type_gcb_repo_skaffold_modules&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&open_in_editor=main.tf&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md" target="_blank">
+    <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
+  </a>
+</div>
+## Example Usage - Clouddeploy Custom Target Type Gcb Repo Skaffold Modules
+
+
+```hcl
+resource "google_clouddeploy_custom_target_type" "custom-target-type" {
+    location = "us-central1"
+    name = "my-custom-target-type"
+    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"
+        }
+      }
+    }
+}
+```
 
 ## Argument Reference
 
@@ -185,6 +212,11 @@ The following arguments are supported:
   Cloud Storage bucket containing Skaffold Config modules.
   Structure is [documented below](#nested_google_cloud_storage).
 
+* `google_cloud_build_repo` -
+  (Optional)
+  Cloud Build 2nd gen repository containing the Skaffold Config modules.
+  Structure is [documented below](#nested_google_cloud_build_repo).
+
 
 <a name="nested_git"></a>The `git` block supports:
 
@@ -210,6 +242,20 @@ The following arguments are supported:
   (Optional)
   Relative path from the source to the Skaffold file.
 
+<a name="nested_google_cloud_build_repo"></a>The `google_cloud_build_repo` block supports:
+
+* `repository` -
+  (Required)
+  Cloud Build 2nd gen repository in the format of 'projects/<project>/locations/<location>/connections/<connection>/repositories/<repository>'.
+
+* `path` -
+  (Optional)
+  Relative path from the repository root to the Skaffold file.
+
+* `ref` -
+  (Optional)
+  Branch or tag to use when cloning the repository.
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: