Skip to content

Commit 6fa4c47

Browse files
modular-magicianshuyama1
authored andcommitted
Revert "cloudsecuritycompliace: add google_cloud_security_compliance_cloud_control resource" (#15487) (#10949)
[upstream:e84769702aa1f74cbcd277d75d659fd1ae4bf845] Signed-off-by: Modular Magician <[email protected]>
1 parent f3c879a commit 6fa4c47

18 files changed

+5
-4235
lines changed

.changelog/15487.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
`google_cloud_security_compliance_cloud_control` (revert)
3+
```

google-beta/fwmodels/provider_model.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ type ProviderModel struct {
9191
CloudRunCustomEndpoint types.String `tfsdk:"cloud_run_custom_endpoint"`
9292
CloudRunV2CustomEndpoint types.String `tfsdk:"cloud_run_v2_custom_endpoint"`
9393
CloudSchedulerCustomEndpoint types.String `tfsdk:"cloud_scheduler_custom_endpoint"`
94-
CloudSecurityComplianceCustomEndpoint types.String `tfsdk:"cloud_security_compliance_custom_endpoint"`
9594
CloudTasksCustomEndpoint types.String `tfsdk:"cloud_tasks_custom_endpoint"`
9695
ColabCustomEndpoint types.String `tfsdk:"colab_custom_endpoint"`
9796
ComposerCustomEndpoint types.String `tfsdk:"composer_custom_endpoint"`

google-beta/fwprovider/framework_provider.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
412412
transport_tpg.CustomEndpointValidator(),
413413
},
414414
},
415-
"cloud_security_compliance_custom_endpoint": &schema.StringAttribute{
416-
Optional: true,
417-
Validators: []validator.String{
418-
transport_tpg.CustomEndpointValidator(),
419-
},
420-
},
421415
"cloud_tasks_custom_endpoint": &schema.StringAttribute{
422416
Optional: true,
423417
Validators: []validator.String{

google-beta/provider/provider.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,6 @@ func Provider() *schema.Provider {
383383
Optional: true,
384384
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
385385
},
386-
"cloud_security_compliance_custom_endpoint": {
387-
Type: schema.TypeString,
388-
Optional: true,
389-
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
390-
},
391386
"cloud_tasks_custom_endpoint": {
392387
Type: schema.TypeString,
393388
Optional: true,
@@ -1240,7 +1235,6 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
12401235
config.CloudRunBasePath = d.Get("cloud_run_custom_endpoint").(string)
12411236
config.CloudRunV2BasePath = d.Get("cloud_run_v2_custom_endpoint").(string)
12421237
config.CloudSchedulerBasePath = d.Get("cloud_scheduler_custom_endpoint").(string)
1243-
config.CloudSecurityComplianceBasePath = d.Get("cloud_security_compliance_custom_endpoint").(string)
12441238
config.CloudTasksBasePath = d.Get("cloud_tasks_custom_endpoint").(string)
12451239
config.ColabBasePath = d.Get("colab_custom_endpoint").(string)
12461240
config.ComposerBasePath = d.Get("composer_custom_endpoint").(string)

google-beta/provider/provider_mmv1_resources.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import (
5757
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrun"
5858
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrunv2"
5959
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudscheduler"
60-
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudsecuritycompliance"
6160
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudtasks"
6261
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/colab"
6362
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/composer"
@@ -621,9 +620,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
621620
}
622621

623622
// Resources
624-
// Generated resources: 726
623+
// Generated resources: 725
625624
// Generated IAM resources: 348
626-
// Total generated resources: 1074
625+
// Total generated resources: 1073
627626
var generatedResources = map[string]*schema.Resource{
628627
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
629628
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -849,8 +848,6 @@ var generatedResources = map[string]*schema.Resource{
849848
"google_cloud_run_v2_worker_pool_iam_member": tpgiamresource.ResourceIamMember(cloudrunv2.CloudRunV2WorkerPoolIamSchema, cloudrunv2.CloudRunV2WorkerPoolIamUpdaterProducer, cloudrunv2.CloudRunV2WorkerPoolIdParseFunc),
850849
"google_cloud_run_v2_worker_pool_iam_policy": tpgiamresource.ResourceIamPolicy(cloudrunv2.CloudRunV2WorkerPoolIamSchema, cloudrunv2.CloudRunV2WorkerPoolIamUpdaterProducer, cloudrunv2.CloudRunV2WorkerPoolIdParseFunc),
851850
"google_cloud_scheduler_job": cloudscheduler.ResourceCloudSchedulerJob(),
852-
"google_cloud_security_compliance_cloud_control": cloudsecuritycompliance.ResourceCloudSecurityComplianceCloudControl(),
853-
"google_cloud_security_compliance_framework": cloudsecuritycompliance.ResourceCloudSecurityComplianceFramework(),
854851
"google_cloud_tasks_queue": cloudtasks.ResourceCloudTasksQueue(),
855852
"google_cloud_tasks_queue_iam_binding": tpgiamresource.ResourceIamBinding(cloudtasks.CloudTasksQueueIamSchema, cloudtasks.CloudTasksQueueIamUpdaterProducer, cloudtasks.CloudTasksQueueIdParseFunc),
856853
"google_cloud_tasks_queue_iam_member": tpgiamresource.ResourceIamMember(cloudtasks.CloudTasksQueueIamSchema, cloudtasks.CloudTasksQueueIamUpdaterProducer, cloudtasks.CloudTasksQueueIdParseFunc),
@@ -1910,7 +1907,6 @@ func UseGeneratedProducts() {
19101907
var _ = cloudrun.ProductName
19111908
var _ = cloudrunv2.ProductName
19121909
var _ = cloudscheduler.ProductName
1913-
var _ = cloudsecuritycompliance.ProductName
19141910
var _ = cloudtasks.ProductName
19151911
var _ = colab.ProductName
19161912
var _ = composer.ProductName

google-beta/services/cloudsecuritycompliance/product.go

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

0 commit comments

Comments
 (0)