Skip to content

Commit 954e427

Browse files
modular-magicianshuyama1
authored andcommitted
Revert "Add support for Cloud Deploy resources (#5710)" (#5968) (#4248)
This reverts commit e379f06c6e10d5c8e9071e5b3000b1981e08ef1a. Signed-off-by: Modular Magician <[email protected]>
1 parent 7b24abf commit 954e427

14 files changed

+4
-2237
lines changed

.changelog/5968.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:none
2+
```

google-beta/cloud_deploy_operation.go

Lines changed: 0 additions & 74 deletions
This file was deleted.

google-beta/config.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ type Config struct {
177177
BinaryAuthorizationBasePath string
178178
CloudAssetBasePath string
179179
CloudBuildBasePath string
180-
CloudDeployBasePath string
181180
CloudFunctionsBasePath string
182181
Cloudfunctions2BasePath string
183182
CloudIdentityBasePath string
@@ -288,7 +287,6 @@ const BillingBasePathKey = "Billing"
288287
const BinaryAuthorizationBasePathKey = "BinaryAuthorization"
289288
const CloudAssetBasePathKey = "CloudAsset"
290289
const CloudBuildBasePathKey = "CloudBuild"
291-
const CloudDeployBasePathKey = "CloudDeploy"
292290
const CloudFunctionsBasePathKey = "CloudFunctions"
293291
const Cloudfunctions2BasePathKey = "Cloudfunctions2"
294292
const CloudIdentityBasePathKey = "CloudIdentity"
@@ -382,7 +380,6 @@ var DefaultBasePaths = map[string]string{
382380
BinaryAuthorizationBasePathKey: "https://binaryauthorization.googleapis.com/v1/",
383381
CloudAssetBasePathKey: "https://cloudasset.googleapis.com/v1/",
384382
CloudBuildBasePathKey: "https://cloudbuild.googleapis.com/v1/",
385-
CloudDeployBasePathKey: "https://clouddeploy.googleapis.com/v1/",
386383
CloudFunctionsBasePathKey: "https://cloudfunctions.googleapis.com/v1/",
387384
Cloudfunctions2BasePathKey: "https://cloudfunctions.googleapis.com/v2beta/",
388385
CloudIdentityBasePathKey: "https://cloudidentity.googleapis.com/v1beta1/",
@@ -1252,7 +1249,6 @@ func ConfigureBasePaths(c *Config) {
12521249
c.BinaryAuthorizationBasePath = DefaultBasePaths[BinaryAuthorizationBasePathKey]
12531250
c.CloudAssetBasePath = DefaultBasePaths[CloudAssetBasePathKey]
12541251
c.CloudBuildBasePath = DefaultBasePaths[CloudBuildBasePathKey]
1255-
c.CloudDeployBasePath = DefaultBasePaths[CloudDeployBasePathKey]
12561252
c.CloudFunctionsBasePath = DefaultBasePaths[CloudFunctionsBasePathKey]
12571253
c.Cloudfunctions2BasePath = DefaultBasePaths[Cloudfunctions2BasePathKey]
12581254
c.CloudIdentityBasePath = DefaultBasePaths[CloudIdentityBasePathKey]

google-beta/provider.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -277,14 +277,6 @@ func Provider() *schema.Provider {
277277
"GOOGLE_CLOUD_BUILD_CUSTOM_ENDPOINT",
278278
}, DefaultBasePaths[CloudBuildBasePathKey]),
279279
},
280-
"cloud_deploy_custom_endpoint": {
281-
Type: schema.TypeString,
282-
Optional: true,
283-
ValidateFunc: validateCustomEndpoint,
284-
DefaultFunc: schema.MultiEnvDefaultFunc([]string{
285-
"GOOGLE_CLOUD_DEPLOY_CUSTOM_ENDPOINT",
286-
}, DefaultBasePaths[CloudDeployBasePathKey]),
287-
},
288280
"cloud_functions_custom_endpoint": {
289281
Type: schema.TypeString,
290282
Optional: true,
@@ -934,9 +926,9 @@ func Provider() *schema.Provider {
934926
return provider
935927
}
936928

937-
// Generated resources: 249
929+
// Generated resources: 247
938930
// Generated IAM resources: 138
939-
// Total generated resources: 387
931+
// Total generated resources: 385
940932
func ResourceMap() map[string]*schema.Resource {
941933
resourceMap, _ := ResourceMapWithErrors()
942934
return resourceMap
@@ -1015,8 +1007,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
10151007
"google_cloud_asset_folder_feed": resourceCloudAssetFolderFeed(),
10161008
"google_cloud_asset_organization_feed": resourceCloudAssetOrganizationFeed(),
10171009
"google_cloudbuild_trigger": resourceCloudBuildTrigger(),
1018-
"google_cloud_deploy_delivery_pipeline": resourceCloudDeployDeliveryPipeline(),
1019-
"google_cloud_deploy_target": resourceCloudDeployTarget(),
10201010
"google_cloudfunctions_function_iam_binding": ResourceIamBinding(CloudFunctionsCloudFunctionIamSchema, CloudFunctionsCloudFunctionIamUpdaterProducer, CloudFunctionsCloudFunctionIdParseFunc),
10211011
"google_cloudfunctions_function_iam_member": ResourceIamMember(CloudFunctionsCloudFunctionIamSchema, CloudFunctionsCloudFunctionIamUpdaterProducer, CloudFunctionsCloudFunctionIdParseFunc),
10221012
"google_cloudfunctions_function_iam_policy": ResourceIamPolicy(CloudFunctionsCloudFunctionIamSchema, CloudFunctionsCloudFunctionIamUpdaterProducer, CloudFunctionsCloudFunctionIdParseFunc),
@@ -1605,7 +1595,6 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
16051595
config.BinaryAuthorizationBasePath = d.Get("binary_authorization_custom_endpoint").(string)
16061596
config.CloudAssetBasePath = d.Get("cloud_asset_custom_endpoint").(string)
16071597
config.CloudBuildBasePath = d.Get("cloud_build_custom_endpoint").(string)
1608-
config.CloudDeployBasePath = d.Get("cloud_deploy_custom_endpoint").(string)
16091598
config.CloudFunctionsBasePath = d.Get("cloud_functions_custom_endpoint").(string)
16101599
config.Cloudfunctions2BasePath = d.Get("cloudfunctions2_custom_endpoint").(string)
16111600
config.CloudIdentityBasePath = d.Get("cloud_identity_custom_endpoint").(string)

0 commit comments

Comments
 (0)