Adds support for github enterprise configs inside git_file_source and source… (#6963) (#13518)

Co-authored-by: Mario Machado <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Signed-off-by: Modular Magician <[email protected]>
Co-authored-by: Mario Machado <[email protected]>

Author: modular-magician

.changelog/6963.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudbuild: added `github_enterprise_config` fields to `google_cloudbuild_trigger` resource.
+```

google/resource_cloudbuild_trigger.go

@@ -740,6 +740,12 @@ When using Pub/Sub, Webhook or Manual set the file name using git_file_source in
 							ValidateFunc: validateEnum([]string{"UNKNOWN", "CLOUD_SOURCE_REPOSITORIES", "GITHUB", "BITBUCKET_SERVER"}),
 							Description: `The type of the repo, since it may not be explicit from the repo field (e.g from a URL). 
 Values can be UNKNOWN, CLOUD_SOURCE_REPOSITORIES, GITHUB, BITBUCKET_SERVER Possible values: ["UNKNOWN", "CLOUD_SOURCE_REPOSITORIES", "GITHUB", "BITBUCKET_SERVER"]`,
+						},
+						"github_enterprise_config": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Description: `The full resource name of the github enterprise config.
+Format: projects/{project}/locations/{location}/githubEnterpriseConfigs/{id}. projects/{project}/githubEnterpriseConfigs/{id}.`,
 						},
 						"revision": {
 							Type:     schema.TypeString,
@@ -969,6 +975,12 @@ Values can be UNKNOWN, CLOUD_SOURCE_REPOSITORIES, GITHUB, BITBUCKET_SERVER Possi
 							Required:    true,
 							Description: `The URI of the repo (required).`,
 						},
+						"github_enterprise_config": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Description: `The full resource name of the github enterprise config.
+Format: projects/{project}/locations/{location}/githubEnterpriseConfigs/{id}. projects/{project}/githubEnterpriseConfigs/{id}.`,
+						},
 					},
 				},
 				AtLeastOneOf: []string{"trigger_template", "github", "pubsub_config", "webhook_config", "source_to_build"},
@@ -1661,6 +1673,8 @@ func flattenCloudBuildTriggerGitFileSource(v interface{}, d *schema.ResourceData
 		flattenCloudBuildTriggerGitFileSourceRepoType(original["repoType"], d, config)
 	transformed["revision"] =
 		flattenCloudBuildTriggerGitFileSourceRevision(original["revision"], d, config)
+	transformed["github_enterprise_config"] =
+		flattenCloudBuildTriggerGitFileSourceGithubEnterpriseConfig(original["githubEnterpriseConfig"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudBuildTriggerGitFileSourcePath(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -1679,6 +1693,10 @@ func flattenCloudBuildTriggerGitFileSourceRevision(v interface{}, d *schema.Reso
 	return v
 }
 
+func flattenCloudBuildTriggerGitFileSourceGithubEnterpriseConfig(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenCloudBuildTriggerSourceToBuild(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	if v == nil {
 		return nil
@@ -1694,6 +1712,8 @@ func flattenCloudBuildTriggerSourceToBuild(v interface{}, d *schema.ResourceData
 		flattenCloudBuildTriggerSourceToBuildRef(original["ref"], d, config)
 	transformed["repo_type"] =
 		flattenCloudBuildTriggerSourceToBuildRepoType(original["repoType"], d, config)
+	transformed["github_enterprise_config"] =
+		flattenCloudBuildTriggerSourceToBuildGithubEnterpriseConfig(original["githubEnterpriseConfig"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudBuildTriggerSourceToBuildUri(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -1708,6 +1728,10 @@ func flattenCloudBuildTriggerSourceToBuildRepoType(v interface{}, d *schema.Reso
 	return v
 }
 
+func flattenCloudBuildTriggerSourceToBuildGithubEnterpriseConfig(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenCloudBuildTriggerIgnoredFiles(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -2520,6 +2544,13 @@ func expandCloudBuildTriggerGitFileSource(v interface{}, d TerraformResourceData
 		transformed["revision"] = transformedRevision
 	}
 
+	transformedGithubEnterpriseConfig, err := expandCloudBuildTriggerGitFileSourceGithubEnterpriseConfig(original["github_enterprise_config"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedGithubEnterpriseConfig); val.IsValid() && !isEmptyValue(val) {
+		transformed["githubEnterpriseConfig"] = transformedGithubEnterpriseConfig
+	}
+
 	return transformed, nil
 }
 
@@ -2539,6 +2570,10 @@ func expandCloudBuildTriggerGitFileSourceRevision(v interface{}, d TerraformReso
 	return v, nil
 }
 
+func expandCloudBuildTriggerGitFileSourceGithubEnterpriseConfig(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudBuildTriggerSourceToBuild(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
@@ -2569,6 +2604,13 @@ func expandCloudBuildTriggerSourceToBuild(v interface{}, d TerraformResourceData
 		transformed["repoType"] = transformedRepoType
 	}
 
+	transformedGithubEnterpriseConfig, err := expandCloudBuildTriggerSourceToBuildGithubEnterpriseConfig(original["github_enterprise_config"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedGithubEnterpriseConfig); val.IsValid() && !isEmptyValue(val) {
+		transformed["githubEnterpriseConfig"] = transformedGithubEnterpriseConfig
+	}
+
 	return transformed, nil
 }
 
@@ -2584,6 +2626,10 @@ func expandCloudBuildTriggerSourceToBuildRepoType(v interface{}, d TerraformReso
 	return v, nil
 }
 
+func expandCloudBuildTriggerSourceToBuildGithubEnterpriseConfig(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudBuildTriggerIgnoredFiles(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

website/docs/r/cloudbuild_trigger.html.markdown

@@ -346,6 +346,29 @@ resource "google_cloudbuild_trigger" "manual-trigger" {
   
 }
 ```
+## Example Usage - Cloudbuild Trigger Manual Github Enterprise
+
+
+```hcl
+resource "google_cloudbuild_trigger" "manual-ghe-trigger" {
+  name        = "terraform-manual-ghe-trigger"
+
+  source_to_build {
+    uri       = "https://hashicorp/terraform-provider-google-beta"
+    ref       = "refs/heads/main"
+    repo_type = "GITHUB"
+    github_enterprise_config = "projects/myProject/locations/global/githubEnterpriseConfigs/configID"
+}
+
+git_file_source {
+    path      = "cloudbuild.yaml"
+    uri       = "https://hashicorp/terraform-provider-google-beta"
+    revision  = "refs/heads/main"
+    repo_type = "GITHUB"
+    github_enterprise_config = "projects/myProject/locations/global/githubEnterpriseConfigs/configID"
+  }
+}
+```
 
 ## Argument Reference
 
@@ -510,6 +533,11 @@ The following arguments are supported:
   filename (optional). This field respects the same syntax/resolution as described here: https://git-scm.com/docs/gitrevisions 
   If unspecified, the revision from which the trigger invocation originated is assumed to be the revision from which to read the specified path.
 
+* `github_enterprise_config` -
+  (Optional)
+  The full resource name of the github enterprise config.
+  Format: projects/{project}/locations/{location}/githubEnterpriseConfigs/{id}. projects/{project}/githubEnterpriseConfigs/{id}.
+
 <a name="nested_source_to_build"></a>The `source_to_build` block supports:
 
 * `uri` -
@@ -526,6 +554,11 @@ The following arguments are supported:
   Values can be UNKNOWN, CLOUD_SOURCE_REPOSITORIES, GITHUB, BITBUCKET_SERVER
   Possible values are `UNKNOWN`, `CLOUD_SOURCE_REPOSITORIES`, `GITHUB`, and `BITBUCKET_SERVER`.
 
+* `github_enterprise_config` -
+  (Optional)
+  The full resource name of the github enterprise config.
+  Format: projects/{project}/locations/{location}/githubEnterpriseConfigs/{id}. projects/{project}/githubEnterpriseConfigs/{id}.
+
 <a name="nested_trigger_template"></a>The `trigger_template` block supports:
 
 * `project_id` -