Skip to content

Commit 1644664

Browse files
modular-magicianshuyama1
authored andcommitted
Revert "cloudsecuritycompliace: add google_cloud_security_compliance_cloud_control resource" (#15487) (#24860)
[upstream:e84769702aa1f74cbcd277d75d659fd1ae4bf845] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 0c5b019 commit 1644664

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/fwmodels/provider_model.go

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

google/fwprovider/framework_provider.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
405405
transport_tpg.CustomEndpointValidator(),
406406
},
407407
},
408-
"cloud_security_compliance_custom_endpoint": &schema.StringAttribute{
409-
Optional: true,
410-
Validators: []validator.String{
411-
transport_tpg.CustomEndpointValidator(),
412-
},
413-
},
414408
"cloud_tasks_custom_endpoint": &schema.StringAttribute{
415409
Optional: true,
416410
Validators: []validator.String{

google/provider/provider.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,6 @@ func Provider() *schema.Provider {
378378
Optional: true,
379379
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
380380
},
381-
"cloud_security_compliance_custom_endpoint": {
382-
Type: schema.TypeString,
383-
Optional: true,
384-
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
385-
},
386381
"cloud_tasks_custom_endpoint": {
387382
Type: schema.TypeString,
388383
Optional: true,
@@ -1173,7 +1168,6 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
11731168
config.CloudRunBasePath = d.Get("cloud_run_custom_endpoint").(string)
11741169
config.CloudRunV2BasePath = d.Get("cloud_run_v2_custom_endpoint").(string)
11751170
config.CloudSchedulerBasePath = d.Get("cloud_scheduler_custom_endpoint").(string)
1176-
config.CloudSecurityComplianceBasePath = d.Get("cloud_security_compliance_custom_endpoint").(string)
11771171
config.CloudTasksBasePath = d.Get("cloud_tasks_custom_endpoint").(string)
11781172
config.ColabBasePath = d.Get("colab_custom_endpoint").(string)
11791173
config.ComposerBasePath = d.Get("composer_custom_endpoint").(string)

google/provider/provider_mmv1_resources.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import (
5656
"github.com/hashicorp/terraform-provider-google/google/services/cloudrun"
5757
"github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2"
5858
"github.com/hashicorp/terraform-provider-google/google/services/cloudscheduler"
59-
"github.com/hashicorp/terraform-provider-google/google/services/cloudsecuritycompliance"
6059
"github.com/hashicorp/terraform-provider-google/google/services/cloudtasks"
6160
"github.com/hashicorp/terraform-provider-google/google/services/colab"
6261
"github.com/hashicorp/terraform-provider-google/google/services/composer"
@@ -576,9 +575,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
576575
}
577576

578577
// Resources
579-
// Generated resources: 665
578+
// Generated resources: 663
580579
// Generated IAM resources: 318
581-
// Total generated resources: 983
580+
// Total generated resources: 981
582581
var generatedResources = map[string]*schema.Resource{
583582
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
584583
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -788,8 +787,6 @@ var generatedResources = map[string]*schema.Resource{
788787
"google_cloud_run_v2_worker_pool_iam_member": tpgiamresource.ResourceIamMember(cloudrunv2.CloudRunV2WorkerPoolIamSchema, cloudrunv2.CloudRunV2WorkerPoolIamUpdaterProducer, cloudrunv2.CloudRunV2WorkerPoolIdParseFunc),
789788
"google_cloud_run_v2_worker_pool_iam_policy": tpgiamresource.ResourceIamPolicy(cloudrunv2.CloudRunV2WorkerPoolIamSchema, cloudrunv2.CloudRunV2WorkerPoolIamUpdaterProducer, cloudrunv2.CloudRunV2WorkerPoolIdParseFunc),
790789
"google_cloud_scheduler_job": cloudscheduler.ResourceCloudSchedulerJob(),
791-
"google_cloud_security_compliance_cloud_control": cloudsecuritycompliance.ResourceCloudSecurityComplianceCloudControl(),
792-
"google_cloud_security_compliance_framework": cloudsecuritycompliance.ResourceCloudSecurityComplianceFramework(),
793790
"google_cloud_tasks_queue": cloudtasks.ResourceCloudTasksQueue(),
794791
"google_cloud_tasks_queue_iam_binding": tpgiamresource.ResourceIamBinding(cloudtasks.CloudTasksQueueIamSchema, cloudtasks.CloudTasksQueueIamUpdaterProducer, cloudtasks.CloudTasksQueueIdParseFunc),
795792
"google_cloud_tasks_queue_iam_member": tpgiamresource.ResourceIamMember(cloudtasks.CloudTasksQueueIamSchema, cloudtasks.CloudTasksQueueIamUpdaterProducer, cloudtasks.CloudTasksQueueIdParseFunc),
@@ -1737,7 +1734,6 @@ func UseGeneratedProducts() {
17371734
var _ = cloudrun.ProductName
17381735
var _ = cloudrunv2.ProductName
17391736
var _ = cloudscheduler.ProductName
1740-
var _ = cloudsecuritycompliance.ProductName
17411737
var _ = cloudtasks.ProductName
17421738
var _ = colab.ProductName
17431739
var _ = composer.ProductName

google/services/cloudsecuritycompliance/product.go

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

0 commit comments

Comments
 (0)