Fix identity platform default_supported_idp_config idp_id (#2969)

Merged PR #2969.
GoogleCloudPlatform · Jan 14, 2020 · 142ec17 · 142ec17
1 parent a9899a8
commit 142ec17
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 18 deletions.
diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/products/identityplatform/api.yaml b/products/identityplatform/api.yaml
@@ -30,8 +30,8 @@ objects:
   - !ruby/object:Api::Resource
     name: 'DefaultSupportedIdpConfig'
     base_url: 'projects/{{project}}/defaultSupportedIdpConfigs'
-    self_link: 'projects/{{project}}/defaultSupportedIdpConfigs/{{client_id}}'
-    create_url: 'projects/{{project}}/defaultSupportedIdpConfigs?idpId={{client_id}}'
+    self_link: 'projects/{{project}}/defaultSupportedIdpConfigs/{{idp_id}}'
+    create_url: 'projects/{{project}}/defaultSupportedIdpConfigs?idpId={{idp_id}}'
     update_verb: :PATCH
     update_mask: true
     description: |
@@ -46,11 +46,38 @@ objects:
         output: true
         description: |
           The name of the DefaultSupportedIdpConfig resource
+      - !ruby/object:Api::Type::String
+        name: 'idpId'
+        description: |
+          ID of the IDP. Possible values include:
+
+          * `apple.com`
+
+          * `facebook.com`
+
+          * `gc.apple.com`
+
+          * `github.com`
+
+          * `google.com`
+
+          * `linkedin.com`
+
+          * `microsoft.com`
+
+          * `playgames.google.com`
+
+          * `twitter.com`
+
+          * `yahoo.com`
+          
+        input: true
+        url_param_only: true
+        required: true
       - !ruby/object:Api::Type::String
         name: 'clientId'
         description: |
           OAuth client ID
-        input: true
         required: true
       - !ruby/object:Api::Type::String
         name: 'clientSecret'
@@ -64,8 +91,8 @@ objects:
   - !ruby/object:Api::Resource
     name: 'TenantDefaultSupportedIdpConfig'
     base_url: 'projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs'
-    self_link: 'projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs/{{client_id}}'
-    create_url: 'projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs?idpId={{client_id}}'
+    self_link: 'projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs/{{idp_id}}'
+    create_url: 'projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs?idpId={{idp_id}}'
     update_verb: :PATCH
     update_mask: true
     description: |
@@ -80,6 +107,34 @@ objects:
         output: true
         description: |
           The name of the default supported IDP config resource
+      - !ruby/object:Api::Type::String
+        name: 'idpId'
+        description: |
+          ID of the IDP. Possible values include:
+
+          * `apple.com`
+
+          * `facebook.com`
+
+          * `gc.apple.com`
+
+          * `github.com`
+
+          * `google.com`
+
+          * `linkedin.com`
+
+          * `microsoft.com`
+
+          * `playgames.google.com`
+
+          * `twitter.com`
+
+          * `yahoo.com`
+
+        input: true
+        url_param_only: true
+        required: true
       - !ruby/object:Api::Type::String
         name: 'tenant'
         required: true
@@ -89,7 +144,6 @@ objects:
           The name of the tenant where this DefaultSupportedIdpConfig resource exists
       - !ruby/object:Api::Type::String
         name: 'clientId'
-        input: true
         required: true
         description: |
           OAuth client ID

diff --git a/products/identityplatform/terraform.yaml b/products/identityplatform/terraform.yaml
@@ -14,7 +14,7 @@
 --- !ruby/object:Provider::Terraform::Config
 overrides: !ruby/object:Overrides::ResourceOverrides
   DefaultSupportedIdpConfig: !ruby/object:Overrides::Terraform::ResourceOverride
-    import_format: ["projects/{{project}}/defaultSupportedIdpConfigs/{{client_id}}"]
+    import_format: ["projects/{{project}}/defaultSupportedIdpConfigs/{{idp_id}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "identity_platform_default_supported_idp_config_basic"
@@ -23,7 +23,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         # If we could spin up a project and enable identity platform we could test this separately
         skip_test: true
   TenantDefaultSupportedIdpConfig: !ruby/object:Overrides::Terraform::ResourceOverride
-    import_format: ["projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs/{{client_id}}"]
+    import_format: ["projects/{{project}}/tenants/{{tenant}}/defaultSupportedIdpConfigs/{{idp_id}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "identity_platform_tenant_default_supported_idp_config_basic"

diff --git a/templates/terraform/examples/identity_platform_default_supported_idp_config_basic.tf.erb b/templates/terraform/examples/identity_platform_default_supported_idp_config_basic.tf.erb
@@ -1,5 +1,6 @@
 resource "google_identity_platform_default_supported_idp_config" "<%= ctx[:primary_resource_id] %>" {
   enabled       = true
-  client_id     = "playgames.google.com"
+  idp_id        = "playgames.google.com"
+  client_id     = "client-id"
   client_secret = "secret"
 }
diff --git a/...tes/terraform/examples/identity_platform_tenant_default_supported_idp_config_basic.tf.erb b/...tes/terraform/examples/identity_platform_tenant_default_supported_idp_config_basic.tf.erb
@@ -5,6 +5,7 @@ resource "google_identity_platform_tenant" "tenant" {
 resource "google_identity_platform_tenant_default_supported_idp_config" "<%= ctx[:primary_resource_id] %>" {
   enabled       = true
   tenant        = google_identity_platform_tenant.tenant.name
-  client_id     = "playgames.google.com"
+  idp_id        = "playgames.google.com"
+  client_id     = "my-client-id"
   client_secret = "secret"
 }
diff --git a/third_party/terraform/tests/resource_identity_platform_default_supported_idp_config_test.go b/third_party/terraform/tests/resource_identity_platform_default_supported_idp_config_test.go
@@ -71,7 +71,8 @@ func testAccIdentityPlatformDefaultSupportedIdpConfig_defaultSupportedIdpConfigB
 	return Nprintf(`
 resource "google_identity_platform_default_supported_idp_config" "idp_config" {
   enabled = true
-  client_id = "playgames.google.com"
+  idp_id  = "playgames.google.com"
+  client_id = "client-id"
   client_secret = "secret"
 }
 `, context)
@@ -81,7 +82,8 @@ func testAccIdentityPlatformDefaultSupportedIdpConfig_defaultSupportedIdpConfigU
 	return Nprintf(`
 resource "google_identity_platform_default_supported_idp_config" "idp_config" {
   enabled = false
-  client_id = "playgames.google.com"
+  idp_id  = "playgames.google.com"
+  client_id = "client-id"
   client_secret = "anothersecret"
 }
 `, context)

diff --git a/...ty/terraform/tests/resource_identity_platform_tenant_default_supported_idp_config_test.go b/...ty/terraform/tests/resource_identity_platform_tenant_default_supported_idp_config_test.go
@@ -50,7 +50,8 @@ resource "google_identity_platform_tenant" "tenant" {
 resource "google_identity_platform_tenant_default_supported_idp_config" "idp_config" {
   enabled       = true
   tenant        = google_identity_platform_tenant.tenant.name
-  client_id     = "playgames.google.com"
+  idp_id        = "playgames.google.com"
+  client_id     = "client-id"
   client_secret = "secret"
 }
 `, context)
@@ -65,7 +66,8 @@ resource "google_identity_platform_tenant" "tenant" {
 resource "google_identity_platform_tenant_default_supported_idp_config" "idp_config" {
   enabled       = false
   tenant        = google_identity_platform_tenant.tenant.name
-  client_id     = "playgames.google.com"
+  idp_id        = "playgames.google.com"
+  client_id     = "client-id2"
   client_secret = "differentsecret"
 }
 `, context)