Skip to content

Remove Terraform support for game services #15558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Remove Terraform support for game services #15558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/8669.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:breaking-change
gameservices: Remove Terraform support for `gameservices`
```
5 changes: 0 additions & 5 deletions .teamcity/components/generated/services.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,6 @@ var services = mapOf(
"displayName" to "Firestore",
"path" to "./google/services/firestore"
),
"gameservices" to mapOf(
"name" to "gameservices",
"displayName" to "Gameservices",
"path" to "./google/services/gameservices"
),
"gkebackup" to mapOf(
"name" to "gkebackup",
"displayName" to "Gkebackup",
Expand Down
1 change: 0 additions & 1 deletion google/config_test_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ func configureTestBasePaths(c *transport_tpg.Config, url string) {
c.EssentialContactsBasePath = url
c.FilestoreBasePath = url
c.FirestoreBasePath = url
c.GameServicesBasePath = url
c.GKEBackupBasePath = url
c.GKEHubBasePath = url
c.GKEHub2BasePath = url
Expand Down
1 change: 0 additions & 1 deletion google/fwmodels/provider_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ type ProviderModel struct {
EssentialContactsCustomEndpoint types.String `tfsdk:"essential_contacts_custom_endpoint"`
FilestoreCustomEndpoint types.String `tfsdk:"filestore_custom_endpoint"`
FirestoreCustomEndpoint types.String `tfsdk:"firestore_custom_endpoint"`
GameServicesCustomEndpoint types.String `tfsdk:"game_services_custom_endpoint"`
GKEBackupCustomEndpoint types.String `tfsdk:"gke_backup_custom_endpoint"`
GKEHubCustomEndpoint types.String `tfsdk:"gke_hub_custom_endpoint"`
GKEHub2CustomEndpoint types.String `tfsdk:"gke_hub2_custom_endpoint"`
Expand Down
6 changes: 0 additions & 6 deletions google/fwprovider/framework_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,12 +425,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
transport_tpg.CustomEndpointValidator(),
},
},
"game_services_custom_endpoint": &schema.StringAttribute{
Optional: true,
Validators: []validator.String{
transport_tpg.CustomEndpointValidator(),
},
},
"gke_backup_custom_endpoint": &schema.StringAttribute{
Optional: true,
Validators: []validator.String{
Expand Down
10 changes: 0 additions & 10 deletions google/fwtransport/framework_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ type FrameworkProviderConfig struct {
EssentialContactsBasePath string
FilestoreBasePath string
FirestoreBasePath string
GameServicesBasePath string
GKEBackupBasePath string
GKEHubBasePath string
GKEHub2BasePath string
Expand Down Expand Up @@ -238,7 +237,6 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
p.EssentialContactsBasePath = data.EssentialContactsCustomEndpoint.ValueString()
p.FilestoreBasePath = data.FilestoreCustomEndpoint.ValueString()
p.FirestoreBasePath = data.FirestoreCustomEndpoint.ValueString()
p.GameServicesBasePath = data.GameServicesCustomEndpoint.ValueString()
p.GKEBackupBasePath = data.GKEBackupCustomEndpoint.ValueString()
p.GKEHubBasePath = data.GKEHubCustomEndpoint.ValueString()
p.GKEHub2BasePath = data.GKEHub2CustomEndpoint.ValueString()
Expand Down Expand Up @@ -819,14 +817,6 @@ func (p *FrameworkProviderConfig) HandleDefaults(ctx context.Context, data *fwmo
data.FirestoreCustomEndpoint = types.StringValue(customEndpoint.(string))
}
}
if data.GameServicesCustomEndpoint.IsNull() {
customEndpoint := transport_tpg.MultiEnvDefault([]string{
"GOOGLE_GAME_SERVICES_CUSTOM_ENDPOINT",
}, transport_tpg.DefaultBasePaths[transport_tpg.GameServicesBasePathKey])
if customEndpoint != nil {
data.GameServicesCustomEndpoint = types.StringValue(customEndpoint.(string))
}
}
if data.GKEBackupCustomEndpoint.IsNull() {
customEndpoint := transport_tpg.MultiEnvDefault([]string{
"GOOGLE_GKE_BACKUP_CUSTOM_ENDPOINT",
Expand Down
1 change: 0 additions & 1 deletion google/gcp_sweeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import (
_ "github.com/hashicorp/terraform-provider-google/google/services/essentialcontacts"
_ "github.com/hashicorp/terraform-provider-google/google/services/filestore"
_ "github.com/hashicorp/terraform-provider-google/google/services/firestore"
_ "github.com/hashicorp/terraform-provider-google/google/services/gameservices"
_ "github.com/hashicorp/terraform-provider-google/google/services/gkebackup"
_ "github.com/hashicorp/terraform-provider-google/google/services/gkehub"
_ "github.com/hashicorp/terraform-provider-google/google/services/gkehub2"
Expand Down
17 changes: 2 additions & 15 deletions google/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ import (
"github.com/hashicorp/terraform-provider-google/google/services/essentialcontacts"
"github.com/hashicorp/terraform-provider-google/google/services/filestore"
"github.com/hashicorp/terraform-provider-google/google/services/firestore"
"github.com/hashicorp/terraform-provider-google/google/services/gameservices"
"github.com/hashicorp/terraform-provider-google/google/services/gkebackup"
"github.com/hashicorp/terraform-provider-google/google/services/gkehub"
"github.com/hashicorp/terraform-provider-google/google/services/gkehub2"
Expand Down Expand Up @@ -481,11 +480,6 @@ func Provider() *schema.Provider {
Optional: true,
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
},
"game_services_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
},
"gke_backup_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -810,7 +804,6 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_container_registry_repository": containeranalysis.DataSourceGoogleContainerRepo(),
"google_dataproc_metastore_service": dataprocmetastore.DataSourceDataprocMetastoreService(),
"google_datastream_static_ips": datastream.DataSourceGoogleDatastreamStaticIps(),
"google_game_services_game_server_deployment_rollout": gameservices.DataSourceGameServicesGameServerDeploymentRollout(),
"google_iam_policy": resourcemanager.DataSourceGoogleIamPolicy(),
"google_iam_role": resourcemanager.DataSourceGoogleIamRole(),
"google_iam_testable_permissions": resourcemanager.DataSourceGoogleIamTestablePermissions(),
Expand Down Expand Up @@ -965,9 +958,9 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
})
}

// Generated resources: 307
// Generated resources: 302
// Generated IAM resources: 204
// Total generated resources: 511
// Total generated resources: 506
func ResourceMap() map[string]*schema.Resource {
resourceMap, _ := ResourceMapWithErrors()
return resourceMap
Expand Down Expand Up @@ -1288,11 +1281,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_firestore_document": firestore.ResourceFirestoreDocument(),
"google_firestore_field": firestore.ResourceFirestoreField(),
"google_firestore_index": firestore.ResourceFirestoreIndex(),
"google_game_services_game_server_cluster": gameservices.ResourceGameServicesGameServerCluster(),
"google_game_services_game_server_config": gameservices.ResourceGameServicesGameServerConfig(),
"google_game_services_game_server_deployment": gameservices.ResourceGameServicesGameServerDeployment(),
"google_game_services_game_server_deployment_rollout": gameservices.ResourceGameServicesGameServerDeploymentRollout(),
"google_game_services_realm": gameservices.ResourceGameServicesRealm(),
"google_gke_backup_backup_plan": gkebackup.ResourceGKEBackupBackupPlan(),
"google_gke_backup_backup_plan_iam_binding": tpgiamresource.ResourceIamBinding(gkebackup.GKEBackupBackupPlanIamSchema, gkebackup.GKEBackupBackupPlanIamUpdaterProducer, gkebackup.GKEBackupBackupPlanIdParseFunc),
"google_gke_backup_backup_plan_iam_member": tpgiamresource.ResourceIamMember(gkebackup.GKEBackupBackupPlanIamSchema, gkebackup.GKEBackupBackupPlanIamUpdaterProducer, gkebackup.GKEBackupBackupPlanIdParseFunc),
Expand Down Expand Up @@ -1763,7 +1751,6 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
config.EssentialContactsBasePath = d.Get("essential_contacts_custom_endpoint").(string)
config.FilestoreBasePath = d.Get("filestore_custom_endpoint").(string)
config.FirestoreBasePath = d.Get("firestore_custom_endpoint").(string)
config.GameServicesBasePath = d.Get("game_services_custom_endpoint").(string)
config.GKEBackupBasePath = d.Get("gke_backup_custom_endpoint").(string)
config.GKEHubBasePath = d.Get("gke_hub_custom_endpoint").(string)
config.GKEHub2BasePath = d.Get("gke_hub2_custom_endpoint").(string)
Expand Down
35 changes: 0 additions & 35 deletions .../services/gameservices/data_source_google_game_services_game_server_deployment_rollout.go
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions google/services/gameservices/game_services_operation.go
View file
Open in desktop

This file was deleted.

Loading