Skip to content

Commit b7cc98d

Browse files
remove certificate manager (#4968) (#3426)
Signed-off-by: Modular Magician <[email protected]>
1 parent 727de1c commit b7cc98d

13 files changed

+5
-1909
lines changed

.changelog/4968.txt

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

google-beta/certificate_manager_operation.go

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

google-beta/config.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ type Config struct {
9494
BigtableBasePath string
9595
BillingBasePath string
9696
BinaryAuthorizationBasePath string
97-
CertificateManagerBasePath string
9897
CloudAssetBasePath string
9998
CloudBuildBasePath string
10099
CloudFunctionsBasePath string
@@ -198,7 +197,6 @@ const BigqueryReservationBasePathKey = "BigqueryReservation"
198197
const BigtableBasePathKey = "Bigtable"
199198
const BillingBasePathKey = "Billing"
200199
const BinaryAuthorizationBasePathKey = "BinaryAuthorization"
201-
const CertificateManagerBasePathKey = "CertificateManager"
202200
const CloudAssetBasePathKey = "CloudAsset"
203201
const CloudBuildBasePathKey = "CloudBuild"
204202
const CloudFunctionsBasePathKey = "CloudFunctions"
@@ -291,7 +289,6 @@ var DefaultBasePaths = map[string]string{
291289
BigtableBasePathKey: "https://bigtableadmin.googleapis.com/v2/",
292290
BillingBasePathKey: "https://billingbudgets.googleapis.com/v1/",
293291
BinaryAuthorizationBasePathKey: "https://binaryauthorization.googleapis.com/v1/",
294-
CertificateManagerBasePathKey: "https://certificatemanager.googleapis.com/v1alpha2/",
295292
CloudAssetBasePathKey: "https://cloudasset.googleapis.com/v1/",
296293
CloudBuildBasePathKey: "https://cloudbuild.googleapis.com/v1/",
297294
CloudFunctionsBasePathKey: "https://cloudfunctions.googleapis.com/v1/",
@@ -1137,7 +1134,6 @@ func ConfigureBasePaths(c *Config) {
11371134
c.BigtableBasePath = DefaultBasePaths[BigtableBasePathKey]
11381135
c.BillingBasePath = DefaultBasePaths[BillingBasePathKey]
11391136
c.BinaryAuthorizationBasePath = DefaultBasePaths[BinaryAuthorizationBasePathKey]
1140-
c.CertificateManagerBasePath = DefaultBasePaths[CertificateManagerBasePathKey]
11411137
c.CloudAssetBasePath = DefaultBasePaths[CloudAssetBasePathKey]
11421138
c.CloudBuildBasePath = DefaultBasePaths[CloudBuildBasePathKey]
11431139
c.CloudFunctionsBasePath = DefaultBasePaths[CloudFunctionsBasePathKey]

google-beta/provider.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,6 @@ func Provider() *schema.Provider {
251251
"GOOGLE_BINARY_AUTHORIZATION_CUSTOM_ENDPOINT",
252252
}, DefaultBasePaths[BinaryAuthorizationBasePathKey]),
253253
},
254-
"certificate_manager_custom_endpoint": {
255-
Type: schema.TypeString,
256-
Optional: true,
257-
ValidateFunc: validateCustomEndpoint,
258-
DefaultFunc: schema.MultiEnvDefaultFunc([]string{
259-
"GOOGLE_CERTIFICATE_MANAGER_CUSTOM_ENDPOINT",
260-
}, DefaultBasePaths[CertificateManagerBasePathKey]),
261-
},
262254
"cloud_asset_custom_endpoint": {
263255
Type: schema.TypeString,
264256
Optional: true,
@@ -886,9 +878,9 @@ func Provider() *schema.Provider {
886878
return provider
887879
}
888880

889-
// Generated resources: 238
881+
// Generated resources: 236
890882
// Generated IAM resources: 117
891-
// Total generated resources: 355
883+
// Total generated resources: 353
892884
func ResourceMap() map[string]*schema.Resource {
893885
resourceMap, _ := ResourceMapWithErrors()
894886
return resourceMap
@@ -956,8 +948,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
956948
"google_binary_authorization_attestor_iam_member": ResourceIamMember(BinaryAuthorizationAttestorIamSchema, BinaryAuthorizationAttestorIamUpdaterProducer, BinaryAuthorizationAttestorIdParseFunc),
957949
"google_binary_authorization_attestor_iam_policy": ResourceIamPolicy(BinaryAuthorizationAttestorIamSchema, BinaryAuthorizationAttestorIamUpdaterProducer, BinaryAuthorizationAttestorIdParseFunc),
958950
"google_binary_authorization_policy": resourceBinaryAuthorizationPolicy(),
959-
"google_certificate_manager_dns_authorization": resourceCertificateManagerDnsAuthorization(),
960-
"google_certificate_manager_certificate": resourceCertificateManagerCertificate(),
961951
"google_cloud_asset_project_feed": resourceCloudAssetProjectFeed(),
962952
"google_cloud_asset_folder_feed": resourceCloudAssetFolderFeed(),
963953
"google_cloud_asset_organization_feed": resourceCloudAssetOrganizationFeed(),
@@ -1480,7 +1470,6 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
14801470
config.BigtableBasePath = d.Get("bigtable_custom_endpoint").(string)
14811471
config.BillingBasePath = d.Get("billing_custom_endpoint").(string)
14821472
config.BinaryAuthorizationBasePath = d.Get("binary_authorization_custom_endpoint").(string)
1483-
config.CertificateManagerBasePath = d.Get("certificate_manager_custom_endpoint").(string)
14841473
config.CloudAssetBasePath = d.Get("cloud_asset_custom_endpoint").(string)
14851474
config.CloudBuildBasePath = d.Get("cloud_build_custom_endpoint").(string)
14861475
config.CloudFunctionsBasePath = d.Get("cloud_functions_custom_endpoint").(string)

0 commit comments

Comments
 (0)