Revert "Revert "Adds Cloud Run Job to mmv1 config and provider (Googl…

…eCloudPlatform#5829)" (GoogleCloudPlatform#5880)" (GoogleCloudPlatform#5924) This reverts commit 98e6da3.
betsy-lichtenberg · Apr 25, 2022 · c68c176 · c68c176
1 parent 66feadf
commit c68c176
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mmv1/third_party/terraform/utils/config.go.erb b/mmv1/third_party/terraform/utils/config.go.erb
@@ -218,6 +218,7 @@ type Config struct {
 	ApikeysBasePath string
 	<% if version == 'private' -%>
 	VmwareBasePath string
+	RunBasePath string
 	<% end -%>
 	// CloudBuild WorkerPool uses a different endpoint (v1beta1) than any other CloudBuild resources
 	CloudBuildWorkerPoolBasePath string

diff --git a/mmv1/third_party/terraform/utils/provider.go.erb b/mmv1/third_party/terraform/utils/provider.go.erb
@@ -187,15 +187,16 @@ func Provider() *schema.Provider {
 			OrgPolicyEndpointEntryKey:                       OrgPolicyEndpointEntry,
 			PrivatecaCertificateTemplateEndpointEntryKey:    PrivatecaCertificateTemplateCustomEndpointEntry,
 			RecaptchaEnterpriseEndpointEntryKey:             RecaptchaEnterpriseEndpointEntry,
-			ContainerAwsCustomEndpointEntryKey:    ContainerAwsCustomEndpointEntry,
-			ContainerAzureCustomEndpointEntryKey:    ContainerAzureCustomEndpointEntry,
-			ApikeysEndpointEntryKey:               ApikeysEndpointEntry,
+			ContainerAwsCustomEndpointEntryKey:              ContainerAwsCustomEndpointEntry,
+			ContainerAzureCustomEndpointEntryKey:            ContainerAzureCustomEndpointEntry,
+			ApikeysEndpointEntryKey:                         ApikeysEndpointEntry,
 
 			<% if version == "private" -%>
 			VmwareEndpointEntryKey:                          VmwareEndpointEntry,
+			RunEndpointEntryKey:                             RunEndpointEntry,
 			<% end -%>
 
-			CloudBuildWorkerPoolEndpointEntryKey:               CloudBuildWorkerPoolEndpointEntry,
+			CloudBuildWorkerPoolEndpointEntryKey:            CloudBuildWorkerPoolEndpointEntry,
 },
 
 		ProviderMetaSchema: map[string]*schema.Schema{
@@ -508,6 +509,7 @@ end     # products.each do
 				<% if version == 'private' -%>
 				"google_vmware_private_cloud":                  resourceVmwarePrivateCloud(),
 				"google_vmware_cluster":                        resourceVmwareCluster(),
+				"google_cloud_run_job":                         resourceRunJob(),
 				<% end -%>
 				// ####### END tpgtools resources ###########
 			},