Adding support for v1 game servers. (#3790)

* Support v1 Game Servers. * Update resource id regexes
GoogleCloudPlatform · Aug 7, 2020 · b267ffb · b267ffb
1 parent a78426f
commit b267ffb
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 39 deletions.
diff --git a/products/gameservices/api.yaml b/products/gameservices/api.yaml
@@ -17,6 +17,9 @@ display_name: Game Servers
 scopes:
 - https://www.googleapis.com/auth/compute
 versions:
+- !ruby/object:Api::Product::Version
+  name: ga
+  base_url: https://gameservices.googleapis.com/v1/
 - !ruby/object:Api::Product::Version
   name: beta
   base_url: https://gameservices.googleapis.com/v1beta/
@@ -30,7 +33,7 @@ objects:
       'Official Documentation': 'https://cloud.google.com/game-servers/docs'
     api: 'https://cloud.google.com/game-servers/docs/reference/rest/v1beta/projects.locations.realms'
   create_url: projects/{{project}}/locations/{{location}}/realms?realmId={{realm_id}}
-  base_url: projects/{{project}}/locations/{{location}}/realms/
+  base_url: projects/{{project}}/locations/{{location}}/realms
   self_link: projects/{{project}}/locations/{{location}}/realms/{{realm_id}}
   update_verb: :PATCH
   update_mask: true
@@ -486,4 +489,4 @@ objects:
           item_type: Api::Type::String
       - !ruby/object:Api::Type::String
         name: configVersion
-        description: Version of the configuration.
+        description: Version of the configuration.
diff --git a/products/gameservices/terraform.yaml b/products/gameservices/terraform.yaml
@@ -15,18 +15,18 @@
 overrides: !ruby/object:Overrides::ResourceOverrides
   Realm: !ruby/object:Overrides::Terraform::ResourceOverride
     autogen_async: true
+    import_format: ["projects/{{project}}/locations/{{location}}/realms/{{realm_id}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "game_service_realm_basic"
         primary_resource_id: "default"
         vars:
           realm_id: "tf-test-realm"
     properties:
   GameServerCluster: !ruby/object:Overrides::Terraform::ResourceOverride
+    import_format: ["projects/{{project}}/locations/{{location}}/realms/{{realm_id}}/gameServerClusters/{{cluster_id}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "game_service_cluster_basic"
         primary_resource_id: "default"
         vars:
@@ -42,19 +42,19 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       constants: "templates/terraform/constants/gameserver_cluster_custom_diff.go"
   GameServerDeployment: !ruby/object:Overrides::Terraform::ResourceOverride
     autogen_async: true
+    import_format: ["projects/{{project}}/locations/{{location}}/gameServerDeployments/{{deployment_id}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "game_service_deployment_basic"
         primary_resource_id: "default"
         vars:
           deployment_id: "tf-test-deployment"
     properties:
   GameServerConfig: !ruby/object:Overrides::Terraform::ResourceOverride
     autogen_async: true
+    import_format: ["projects/{{project}}/locations/{{location}}/gameServerDeployments/{{deployment_id}}/configs/{{config_id}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "game_service_config_basic"
         primary_resource_id: "default"
         vars:
@@ -75,9 +75,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           The format of the spec can be found :
           `https://agones.dev/site/docs/reference/fleet/`.
   GameServerDeploymentRollout: !ruby/object:Overrides::Terraform::ResourceOverride
+    import_format: ["projects/{{project}}/locations/global/gameServerDeployments/{{deployment_id}}/rollout"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "game_service_deployment_rollout_basic"
         primary_resource_id: "default"
         vars:

diff --git a/templates/terraform/examples/game_service_cluster_basic.tf.erb b/templates/terraform/examples/game_service_cluster_basic.tf.erb
@@ -1,5 +1,4 @@
 resource "google_game_services_game_server_cluster" "<%= ctx[:primary_resource_id] %>" {
-  provider   = google-beta
   <%# depends_on = [google_project_iam_member.kubernetes_developer] -%>
   <%# depends_on = [module.agones_cluster, module.helm_agones] -%>
 
@@ -15,8 +14,6 @@ resource "google_game_services_game_server_cluster" "<%= ctx[:primary_resource_i
 }
 
 resource "google_game_services_realm" "default" {
-  provider = google-beta
-
   realm_id   = "<%= ctx[:vars]["realm_id"] %>"
   time_zone  = "PST8PDT"
 

diff --git a/templates/terraform/examples/game_service_config_basic.tf.erb b/templates/terraform/examples/game_service_config_basic.tf.erb
@@ -1,13 +1,9 @@
 resource "google_game_services_game_server_deployment" "default" {
-  provider = google-beta
-
   deployment_id  = "<%= ctx[:vars]["deployment_id"] %>"
   description = "a deployment description"
 }
 
 resource "google_game_services_game_server_config" "<%= ctx[:primary_resource_id] %>" {
-  provider = google-beta
-
   config_id     = "<%= ctx[:vars]["config_id"] %>"
   deployment_id = google_game_services_game_server_deployment.default.deployment_id
   description   = "a config description"

diff --git a/templates/terraform/examples/game_service_deployment_basic.tf.erb b/templates/terraform/examples/game_service_deployment_basic.tf.erb
@@ -1,6 +1,4 @@
 resource "google_game_services_game_server_deployment" "<%= ctx[:primary_resource_id] %>" {
-  provider = google-beta
-
   deployment_id  = "<%= ctx[:vars]["deployment_id"] %>"
   description = "a deployment description"
 }

diff --git a/templates/terraform/examples/game_service_deployment_rollout_basic.tf.erb b/templates/terraform/examples/game_service_deployment_rollout_basic.tf.erb
@@ -1,13 +1,9 @@
 resource "google_game_services_game_server_deployment" "default" {
-  provider = google-beta
-
   deployment_id  = "<%= ctx[:vars]["deployment_id"] %>"
   description = "a deployment description"
 }
 
 resource "google_game_services_game_server_config" "default" {
-  provider = google-beta
-
   config_id     = "<%= ctx[:vars]["config_id"] %>"
   deployment_id = google_game_services_game_server_deployment.default.deployment_id
   description   = "a config description"
@@ -22,8 +18,6 @@ resource "google_game_services_game_server_config" "default" {
 }
 
 resource "google_game_services_game_server_deployment_rollout" "<%= ctx[:primary_resource_id] %>" {
-  provider = google-beta
-
   deployment_id              = google_game_services_game_server_deployment.default.deployment_id
   default_game_server_config = google_game_services_game_server_config.default.name
 }
diff --git a/templates/terraform/examples/game_service_realm_basic.tf.erb b/templates/terraform/examples/game_service_realm_basic.tf.erb
@@ -1,6 +1,4 @@
 resource "google_game_services_realm" "<%= ctx[:primary_resource_id] %>" {
-  provider = google-beta
-
   realm_id  = "<%= ctx[:vars]["realm_id"] %>"
   time_zone = "EST"
   location  = "global"

diff --git a/...ty/terraform/data_sources/data_google_game_services_game_server_deployment_rollout.go.erb b/...ty/terraform/data_sources/data_google_game_services_game_server_deployment_rollout.go.erb
@@ -1,7 +1,6 @@
 <% autogen_exception -%>
 package google
 
-<% unless version == 'ga' -%>
 import (
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -30,4 +29,3 @@ func dataSourceGameServicesGameServerDeploymentRolloutRead(d *schema.ResourceDat
 	return resourceGameServicesGameServerDeploymentRolloutRead(d, meta)
 
 }
-<% end -%>
diff --git a/...arty/terraform/tests/data_google_game_services_game_server_deployment_rollout_test.go.erb b/...arty/terraform/tests/data_google_game_services_game_server_deployment_rollout_test.go.erb
@@ -1,7 +1,6 @@
 <% autogen_exception -%>
 package google
 
-<% unless version == 'ga' -%>
 import (
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -18,7 +17,7 @@ func TestAccDataSourceGameServicesGameServerDeploymentRollout_basic(t *testing.T
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProvidersOiCS,
+		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckGameServicesGameServerDeploymentRolloutDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -34,15 +33,11 @@ func TestAccDataSourceGameServicesGameServerDeploymentRollout_basic(t *testing.T
 func testAccDataSourceGameServicesGameServerDeploymentRollout_basic(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_game_services_game_server_deployment" "default" {
-  provider = google-beta
-
   deployment_id  = "tf-test-deployment-%{random_suffix}"
   description = "a deployment description"
 }
 
 resource "google_game_services_game_server_config" "default" {
-  provider = google-beta
-
   config_id     = "tf-test-config-%{random_suffix}"
   deployment_id = google_game_services_game_server_deployment.default.deployment_id
   description   = "a config description"
@@ -57,16 +52,12 @@ resource "google_game_services_game_server_config" "default" {
 }
 
 resource "google_game_services_game_server_deployment_rollout" "foo" {
-  provider = google-beta
-
   deployment_id              = google_game_services_game_server_deployment.default.deployment_id
   default_game_server_config = google_game_services_game_server_config.default.name
 }
 
 data "google_game_services_game_server_deployment_rollout" "qa" {
-    provider = google-beta
     deployment_id = google_game_services_game_server_deployment_rollout.foo.deployment_id
 }
 `, context)
 }
-<% end -%>
diff --git a/third_party/terraform/utils/provider.go.erb b/third_party/terraform/utils/provider.go.erb
@@ -182,9 +182,7 @@ func Provider() terraform.ResourceProvider {
 			"google_container_registry_repository":             dataSourceGoogleContainerRepo(),
 			"google_dns_keys":                                  dataSourceDNSKeys(),
 			"google_dns_managed_zone":                          dataSourceDnsManagedZone(),
-                        <% unless version == 'ga' -%>
 			"google_game_services_game_server_deployment_rollout":  dataSourceGameServicesGameServerDeploymentRollout(),
-                        <% end -%>
 			"google_iam_policy":                                dataSourceGoogleIamPolicy(),
 			"google_iam_role":                                  dataSourceGoogleIamRole(),
 			"google_iam_testable_permissions":                  dataSourceGoogleIamTestablePermissions(),

diff --git a/...aform/website/docs/d/game_services_game_server_deployment_rollout.html.markdown b/...aform/website/docs/d/game_services_game_server_deployment_rollout.html.markdown
@@ -18,7 +18,6 @@ https://cloud.google.com/game-servers/docs/reference/rest/v1beta/GameServerDeplo
 
 ```hcl
 data "google_game_services_game_server_deployment_rollout" "qa" {
-    provider = google-beta
     deployment_id = "tf-test-deployment-s8sn12jt2c"
 }
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
     ```hcl
     data "google_game_services_game_server_deployment_rollout" "qa" {
-        provider = google-beta
         deployment_id = "tf-test-deployment-s8sn12jt2c"
     }
     ```
@@ Expand Down @@