Skip to content

Commit 4e53267

Browse files
Remove Terraform support for game services (#8669) (#15558)
* Remove Terraform support for game services * Remove game_service from provider.go * Remove gameServices from ci file Signed-off-by: Modular Magician <[email protected]>
1 parent 848f349 commit 4e53267

26 files changed

+5
-4230
lines changed

.changelog/8669.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:breaking-change
2+
gameservices: Remove Terraform support for `gameservices`
3+
```

.teamcity/components/generated/services.kt

-5
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,6 @@ var services = mapOf(
326326
"displayName" to "Firestore",
327327
"path" to "./google/services/firestore"
328328
),
329-
"gameservices" to mapOf(
330-
"name" to "gameservices",
331-
"displayName" to "Gameservices",
332-
"path" to "./google/services/gameservices"
333-
),
334329
"gkebackup" to mapOf(
335330
"name" to "gkebackup",
336331
"displayName" to "Gkebackup",

google/config_test_utils.go

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ func configureTestBasePaths(c *transport_tpg.Config, url string) {
7575
c.EssentialContactsBasePath = url
7676
c.FilestoreBasePath = url
7777
c.FirestoreBasePath = url
78-
c.GameServicesBasePath = url
7978
c.GKEBackupBasePath = url
8079
c.GKEHubBasePath = url
8180
c.GKEHub2BasePath = url

google/fwmodels/provider_model.go

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ type ProviderModel struct {
7676
EssentialContactsCustomEndpoint types.String `tfsdk:"essential_contacts_custom_endpoint"`
7777
FilestoreCustomEndpoint types.String `tfsdk:"filestore_custom_endpoint"`
7878
FirestoreCustomEndpoint types.String `tfsdk:"firestore_custom_endpoint"`
79-
GameServicesCustomEndpoint types.String `tfsdk:"game_services_custom_endpoint"`
8079
GKEBackupCustomEndpoint types.String `tfsdk:"gke_backup_custom_endpoint"`
8180
GKEHubCustomEndpoint types.String `tfsdk:"gke_hub_custom_endpoint"`
8281
GKEHub2CustomEndpoint types.String `tfsdk:"gke_hub2_custom_endpoint"`

google/fwprovider/framework_provider.go

-6
Original file line numberDiff line numberDiff line change
@@ -425,12 +425,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
425425
transport_tpg.CustomEndpointValidator(),
426426
},
427427
},
428-
"game_services_custom_endpoint": &schema.StringAttribute{
429-
Optional: true,
430-
Validators: []validator.String{
431-
transport_tpg.CustomEndpointValidator(),
432-
},
433-
},
434428
"gke_backup_custom_endpoint": &schema.StringAttribute{
435429
Optional: true,
436430
Validators: []validator.String{

google/fwtransport/framework_config.go

-10
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ type FrameworkProviderConfig struct {
100100
EssentialContactsBasePath string
101101
FilestoreBasePath string
102102
FirestoreBasePath string
103-
GameServicesBasePath string
104103
GKEBackupBasePath string
105104
GKEHubBasePath string
106105
GKEHub2BasePath string
@@ -238,7 +237,6 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
238237
p.EssentialContactsBasePath = data.EssentialContactsCustomEndpoint.ValueString()
239238
p.FilestoreBasePath = data.FilestoreCustomEndpoint.ValueString()
240239
p.FirestoreBasePath = data.FirestoreCustomEndpoint.ValueString()
241-
p.GameServicesBasePath = data.GameServicesCustomEndpoint.ValueString()
242240
p.GKEBackupBasePath = data.GKEBackupCustomEndpoint.ValueString()
243241
p.GKEHubBasePath = data.GKEHubCustomEndpoint.ValueString()
244242
p.GKEHub2BasePath = data.GKEHub2CustomEndpoint.ValueString()
@@ -819,14 +817,6 @@ func (p *FrameworkProviderConfig) HandleDefaults(ctx context.Context, data *fwmo
819817
data.FirestoreCustomEndpoint = types.StringValue(customEndpoint.(string))
820818
}
821819
}
822-
if data.GameServicesCustomEndpoint.IsNull() {
823-
customEndpoint := transport_tpg.MultiEnvDefault([]string{
824-
"GOOGLE_GAME_SERVICES_CUSTOM_ENDPOINT",
825-
}, transport_tpg.DefaultBasePaths[transport_tpg.GameServicesBasePathKey])
826-
if customEndpoint != nil {
827-
data.GameServicesCustomEndpoint = types.StringValue(customEndpoint.(string))
828-
}
829-
}
830820
if data.GKEBackupCustomEndpoint.IsNull() {
831821
customEndpoint := transport_tpg.MultiEnvDefault([]string{
832822
"GOOGLE_GKE_BACKUP_CUSTOM_ENDPOINT",

google/gcp_sweeper_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import (
5959
_ "github.com/hashicorp/terraform-provider-google/google/services/essentialcontacts"
6060
_ "github.com/hashicorp/terraform-provider-google/google/services/filestore"
6161
_ "github.com/hashicorp/terraform-provider-google/google/services/firestore"
62-
_ "github.com/hashicorp/terraform-provider-google/google/services/gameservices"
6362
_ "github.com/hashicorp/terraform-provider-google/google/services/gkebackup"
6463
_ "github.com/hashicorp/terraform-provider-google/google/services/gkehub"
6564
_ "github.com/hashicorp/terraform-provider-google/google/services/gkehub2"

google/provider/provider.go

+2-15
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ import (
6464
"github.com/hashicorp/terraform-provider-google/google/services/essentialcontacts"
6565
"github.com/hashicorp/terraform-provider-google/google/services/filestore"
6666
"github.com/hashicorp/terraform-provider-google/google/services/firestore"
67-
"github.com/hashicorp/terraform-provider-google/google/services/gameservices"
6867
"github.com/hashicorp/terraform-provider-google/google/services/gkebackup"
6968
"github.com/hashicorp/terraform-provider-google/google/services/gkehub"
7069
"github.com/hashicorp/terraform-provider-google/google/services/gkehub2"
@@ -481,11 +480,6 @@ func Provider() *schema.Provider {
481480
Optional: true,
482481
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
483482
},
484-
"game_services_custom_endpoint": {
485-
Type: schema.TypeString,
486-
Optional: true,
487-
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
488-
},
489483
"gke_backup_custom_endpoint": {
490484
Type: schema.TypeString,
491485
Optional: true,
@@ -810,7 +804,6 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
810804
"google_container_registry_repository": containeranalysis.DataSourceGoogleContainerRepo(),
811805
"google_dataproc_metastore_service": dataprocmetastore.DataSourceDataprocMetastoreService(),
812806
"google_datastream_static_ips": datastream.DataSourceGoogleDatastreamStaticIps(),
813-
"google_game_services_game_server_deployment_rollout": gameservices.DataSourceGameServicesGameServerDeploymentRollout(),
814807
"google_iam_policy": resourcemanager.DataSourceGoogleIamPolicy(),
815808
"google_iam_role": resourcemanager.DataSourceGoogleIamRole(),
816809
"google_iam_testable_permissions": resourcemanager.DataSourceGoogleIamTestablePermissions(),
@@ -965,9 +958,9 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
965958
})
966959
}
967960

968-
// Generated resources: 307
961+
// Generated resources: 302
969962
// Generated IAM resources: 204
970-
// Total generated resources: 511
963+
// Total generated resources: 506
971964
func ResourceMap() map[string]*schema.Resource {
972965
resourceMap, _ := ResourceMapWithErrors()
973966
return resourceMap
@@ -1288,11 +1281,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
12881281
"google_firestore_document": firestore.ResourceFirestoreDocument(),
12891282
"google_firestore_field": firestore.ResourceFirestoreField(),
12901283
"google_firestore_index": firestore.ResourceFirestoreIndex(),
1291-
"google_game_services_game_server_cluster": gameservices.ResourceGameServicesGameServerCluster(),
1292-
"google_game_services_game_server_config": gameservices.ResourceGameServicesGameServerConfig(),
1293-
"google_game_services_game_server_deployment": gameservices.ResourceGameServicesGameServerDeployment(),
1294-
"google_game_services_game_server_deployment_rollout": gameservices.ResourceGameServicesGameServerDeploymentRollout(),
1295-
"google_game_services_realm": gameservices.ResourceGameServicesRealm(),
12961284
"google_gke_backup_backup_plan": gkebackup.ResourceGKEBackupBackupPlan(),
12971285
"google_gke_backup_backup_plan_iam_binding": tpgiamresource.ResourceIamBinding(gkebackup.GKEBackupBackupPlanIamSchema, gkebackup.GKEBackupBackupPlanIamUpdaterProducer, gkebackup.GKEBackupBackupPlanIdParseFunc),
12981286
"google_gke_backup_backup_plan_iam_member": tpgiamresource.ResourceIamMember(gkebackup.GKEBackupBackupPlanIamSchema, gkebackup.GKEBackupBackupPlanIamUpdaterProducer, gkebackup.GKEBackupBackupPlanIdParseFunc),
@@ -1763,7 +1751,6 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
17631751
config.EssentialContactsBasePath = d.Get("essential_contacts_custom_endpoint").(string)
17641752
config.FilestoreBasePath = d.Get("filestore_custom_endpoint").(string)
17651753
config.FirestoreBasePath = d.Get("firestore_custom_endpoint").(string)
1766-
config.GameServicesBasePath = d.Get("game_services_custom_endpoint").(string)
17671754
config.GKEBackupBasePath = d.Get("gke_backup_custom_endpoint").(string)
17681755
config.GKEHubBasePath = d.Get("gke_hub_custom_endpoint").(string)
17691756
config.GKEHub2BasePath = d.Get("gke_hub2_custom_endpoint").(string)

google/services/gameservices/data_source_google_game_services_game_server_deployment_rollout.go

-35
This file was deleted.

google/services/gameservices/game_services_operation.go

-87
This file was deleted.

0 commit comments

Comments
 (0)