Skip to content

Commit 66b9a3a

Browse files
Remove cloud iot service (#8868) (#15739)
Signed-off-by: Modular Magician <[email protected]>
1 parent 1658bf8 commit 66b9a3a

25 files changed

+15
-4027
lines changed

.changelog/8868.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
```release-note:deprecation
2+
cloudiot: deprecated resource `google_cloudiot_registry`
3+
```
4+
```release-note:deprecation
5+
cloudiot: deprecated resource `google_cloudiot_device`
6+
```
7+
```release-note:deprecation
8+
cloudiot: deprecated resource `google_cloudiot_registry_iam_*`
9+
```
10+
```release-note:deprecation
11+
cloudiot: deprecated datasource `google_cloudiot_registry_iam_policy`
12+
```

.teamcity/components/generated/services.kt

-5
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,6 @@ var services = mapOf(
156156
"displayName" to "Cloudids",
157157
"path" to "./google/services/cloudids"
158158
),
159-
"cloudiot" to mapOf(
160-
"name" to "cloudiot",
161-
"displayName" to "Cloudiot",
162-
"path" to "./google/services/cloudiot"
163-
),
164159
"cloudrun" to mapOf(
165160
"name" to "cloudrun",
166161
"displayName" to "Cloudrun",

google/fwmodels/provider_model.go

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ type ProviderModel struct {
5050
Cloudfunctions2CustomEndpoint types.String `tfsdk:"cloudfunctions2_custom_endpoint"`
5151
CloudIdentityCustomEndpoint types.String `tfsdk:"cloud_identity_custom_endpoint"`
5252
CloudIdsCustomEndpoint types.String `tfsdk:"cloud_ids_custom_endpoint"`
53-
CloudIotCustomEndpoint types.String `tfsdk:"cloud_iot_custom_endpoint"`
5453
CloudRunCustomEndpoint types.String `tfsdk:"cloud_run_custom_endpoint"`
5554
CloudRunV2CustomEndpoint types.String `tfsdk:"cloud_run_v2_custom_endpoint"`
5655
CloudSchedulerCustomEndpoint types.String `tfsdk:"cloud_scheduler_custom_endpoint"`

google/fwprovider/framework_provider.go

-6
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
269269
transport_tpg.CustomEndpointValidator(),
270270
},
271271
},
272-
"cloud_iot_custom_endpoint": &schema.StringAttribute{
273-
Optional: true,
274-
Validators: []validator.String{
275-
transport_tpg.CustomEndpointValidator(),
276-
},
277-
},
278272
"cloud_run_custom_endpoint": &schema.StringAttribute{
279273
Optional: true,
280274
Validators: []validator.String{

google/fwtransport/framework_config.go

-10
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ type FrameworkProviderConfig struct {
7474
Cloudfunctions2BasePath string
7575
CloudIdentityBasePath string
7676
CloudIdsBasePath string
77-
CloudIotBasePath string
7877
CloudRunBasePath string
7978
CloudRunV2BasePath string
8079
CloudSchedulerBasePath string
@@ -212,7 +211,6 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
212211
p.Cloudfunctions2BasePath = data.Cloudfunctions2CustomEndpoint.ValueString()
213212
p.CloudIdentityBasePath = data.CloudIdentityCustomEndpoint.ValueString()
214213
p.CloudIdsBasePath = data.CloudIdsCustomEndpoint.ValueString()
215-
p.CloudIotBasePath = data.CloudIotCustomEndpoint.ValueString()
216214
p.CloudRunBasePath = data.CloudRunCustomEndpoint.ValueString()
217215
p.CloudRunV2BasePath = data.CloudRunV2CustomEndpoint.ValueString()
218216
p.CloudSchedulerBasePath = data.CloudSchedulerCustomEndpoint.ValueString()
@@ -611,14 +609,6 @@ func (p *FrameworkProviderConfig) HandleDefaults(ctx context.Context, data *fwmo
611609
data.CloudIdsCustomEndpoint = types.StringValue(customEndpoint.(string))
612610
}
613611
}
614-
if data.CloudIotCustomEndpoint.IsNull() {
615-
customEndpoint := transport_tpg.MultiEnvDefault([]string{
616-
"GOOGLE_CLOUD_IOT_CUSTOM_ENDPOINT",
617-
}, transport_tpg.DefaultBasePaths[transport_tpg.CloudIotBasePathKey])
618-
if customEndpoint != nil {
619-
data.CloudIotCustomEndpoint = types.StringValue(customEndpoint.(string))
620-
}
621-
}
622612
if data.CloudRunCustomEndpoint.IsNull() {
623613
customEndpoint := transport_tpg.MultiEnvDefault([]string{
624614
"GOOGLE_CLOUD_RUN_CUSTOM_ENDPOINT",

google/provider/provider.go

+3-16
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
"github.com/hashicorp/terraform-provider-google/google/services/cloudfunctions2"
3939
"github.com/hashicorp/terraform-provider-google/google/services/cloudidentity"
4040
"github.com/hashicorp/terraform-provider-google/google/services/cloudids"
41-
"github.com/hashicorp/terraform-provider-google/google/services/cloudiot"
4241
"github.com/hashicorp/terraform-provider-google/google/services/cloudrun"
4342
"github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2"
4443
"github.com/hashicorp/terraform-provider-google/google/services/cloudscheduler"
@@ -351,11 +350,6 @@ func Provider() *schema.Provider {
351350
Optional: true,
352351
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
353352
},
354-
"cloud_iot_custom_endpoint": {
355-
Type: schema.TypeString,
356-
Optional: true,
357-
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
358-
},
359353
"cloud_run_custom_endpoint": {
360354
Type: schema.TypeString,
361355
Optional: true,
@@ -887,7 +881,6 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
887881
"google_cloudbuildv2_connection_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudbuildv2.Cloudbuildv2ConnectionIamSchema, cloudbuildv2.Cloudbuildv2ConnectionIamUpdaterProducer),
888882
"google_cloudfunctions_function_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudfunctions.CloudFunctionsCloudFunctionIamSchema, cloudfunctions.CloudFunctionsCloudFunctionIamUpdaterProducer),
889883
"google_cloudfunctions2_function_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudfunctions2.Cloudfunctions2functionIamSchema, cloudfunctions2.Cloudfunctions2functionIamUpdaterProducer),
890-
"google_cloudiot_registry_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudiot.CloudIotDeviceRegistryIamSchema, cloudiot.CloudIotDeviceRegistryIamUpdaterProducer),
891884
"google_cloud_run_service_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudrun.CloudRunServiceIamSchema, cloudrun.CloudRunServiceIamUpdaterProducer),
892885
"google_cloud_run_v2_job_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudrunv2.CloudRunV2JobIamSchema, cloudrunv2.CloudRunV2JobIamUpdaterProducer),
893886
"google_cloud_run_v2_service_iam_policy": tpgiamresource.DataSourceIamPolicy(cloudrunv2.CloudRunV2ServiceIamSchema, cloudrunv2.CloudRunV2ServiceIamUpdaterProducer),
@@ -965,9 +958,9 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
965958
})
966959
}
967960

968-
// Generated resources: 306
969-
// Generated IAM resources: 204
970-
// Total generated resources: 510
961+
// Generated resources: 304
962+
// Generated IAM resources: 201
963+
// Total generated resources: 505
971964
func ResourceMap() map[string]*schema.Resource {
972965
resourceMap, _ := ResourceMapWithErrors()
973966
return resourceMap
@@ -1089,11 +1082,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
10891082
"google_cloud_identity_group": cloudidentity.ResourceCloudIdentityGroup(),
10901083
"google_cloud_identity_group_membership": cloudidentity.ResourceCloudIdentityGroupMembership(),
10911084
"google_cloud_ids_endpoint": cloudids.ResourceCloudIdsEndpoint(),
1092-
"google_cloudiot_device": cloudiot.ResourceCloudIotDevice(),
1093-
"google_cloudiot_registry": cloudiot.ResourceCloudIotDeviceRegistry(),
1094-
"google_cloudiot_registry_iam_binding": tpgiamresource.ResourceIamBinding(cloudiot.CloudIotDeviceRegistryIamSchema, cloudiot.CloudIotDeviceRegistryIamUpdaterProducer, cloudiot.CloudIotDeviceRegistryIdParseFunc),
1095-
"google_cloudiot_registry_iam_member": tpgiamresource.ResourceIamMember(cloudiot.CloudIotDeviceRegistryIamSchema, cloudiot.CloudIotDeviceRegistryIamUpdaterProducer, cloudiot.CloudIotDeviceRegistryIdParseFunc),
1096-
"google_cloudiot_registry_iam_policy": tpgiamresource.ResourceIamPolicy(cloudiot.CloudIotDeviceRegistryIamSchema, cloudiot.CloudIotDeviceRegistryIamUpdaterProducer, cloudiot.CloudIotDeviceRegistryIdParseFunc),
10971085
"google_cloud_run_domain_mapping": cloudrun.ResourceCloudRunDomainMapping(),
10981086
"google_cloud_run_service": cloudrun.ResourceCloudRunService(),
10991087
"google_cloud_run_service_iam_binding": tpgiamresource.ResourceIamBinding(cloudrun.CloudRunServiceIamSchema, cloudrun.CloudRunServiceIamUpdaterProducer, cloudrun.CloudRunServiceIdParseFunc),
@@ -1736,7 +1724,6 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
17361724
config.Cloudfunctions2BasePath = d.Get("cloudfunctions2_custom_endpoint").(string)
17371725
config.CloudIdentityBasePath = d.Get("cloud_identity_custom_endpoint").(string)
17381726
config.CloudIdsBasePath = d.Get("cloud_ids_custom_endpoint").(string)
1739-
config.CloudIotBasePath = d.Get("cloud_iot_custom_endpoint").(string)
17401727
config.CloudRunBasePath = d.Get("cloud_run_custom_endpoint").(string)
17411728
config.CloudRunV2BasePath = d.Get("cloud_run_v2_custom_endpoint").(string)
17421729
config.CloudSchedulerBasePath = d.Get("cloud_scheduler_custom_endpoint").(string)

google/services/cloudiot/iam_cloudiot_registry.go

-245
This file was deleted.

0 commit comments

Comments
 (0)