diff --git a/mmv1/products/identityplatform/ProjectDefaultConfig.yaml b/mmv1/products/identityplatform/ProjectDefaultConfig.yaml deleted file mode 100644 index 03873dceb91d..000000000000 --- a/mmv1/products/identityplatform/ProjectDefaultConfig.yaml +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 2023 Google Inc. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- !ruby/object:Api::Resource -name: ProjectDefaultConfig -base_url: 'projects/{{project}}/config' -self_link: 'projects/{{project}}/config' -update_verb: :PATCH -update_mask: true -description: | - There is no persistent data associated with this resource. -create_verb: :PATCH -delete_verb: :PATCH -deprecation_message: >- - `google_identity_platform_config` is deprecated and will be removed in the next major release - of the provider. Use the `google_identity_platform_config` resource instead. It contains a more - comprehensive list of fields, and was created before `google_identity_platform_project_default_config` - was added. -custom_code: !ruby/object:Provider::Terraform::CustomCode - test_check_destroy: templates/terraform/custom_check_destroy/identity_platform_project_default_config.go.erb -docs: !ruby/object:Provider::Terraform::Docs - warning: | - If you are using User ADCs (Application Default Credentials) with this resource, - you must specify a `billing_project` and set `user_project_override` to true - in the provider configuration. Otherwise the ACM API will return a 403 error. - Your account must have the `serviceusage.services.use` permission on the - `billing_project` you defined. -id_format: '{{project}}' -examples: - - !ruby/object:Provider::Terraform::Examples - name: 'identity_platform_project_default_config' - primary_resource_id: - 'default' - # skip tests for this resource until we ensure other settings will not be cleared - # see https://github.com/hashicorp/terraform-provider-google/issues/13327 - skip_test: true - -properties: - - !ruby/object:Api::Type::String - name: 'name' - description: | - The name of the Config resource. Example: "projects/my-awesome-project/config" - output: true - - !ruby/object:Api::Type::NestedObject - name: 'signIn' - description: | - Configuration related to local sign in methods. - properties: - - !ruby/object:Api::Type::NestedObject - name: email - description: | - Configuration options related to authenticating a user by their email address. - properties: - - !ruby/object:Api::Type::Boolean - name: enabled - description: | - Whether email auth is enabled for the project or not. - - !ruby/object:Api::Type::Boolean - name: 'passwordRequired' - description: | - Whether a password is required for email auth or not. If true, both an email and - password must be provided to sign in. If false, a user may sign in via either - email/password or email link. - - !ruby/object:Api::Type::NestedObject - name: phoneNumber - description: | - Configuration options related to authenticated a user by their phone number. - properties: - - !ruby/object:Api::Type::Boolean - name: enabled - description: | - Whether phone number auth is enabled for the project or not. - - !ruby/object:Api::Type::KeyValuePairs - name: 'testPhoneNumbers' - description: | - A map of that can be used for phone auth testing. - - !ruby/object:Api::Type::NestedObject - name: anonymous - description: | - Configuration options related to authenticating an anonymous user. - properties: - - !ruby/object:Api::Type::Boolean - name: enabled - required: true - description: | - Whether anonymous user auth is enabled for the project or not. - - !ruby/object:Api::Type::Boolean - name: allowDuplicateEmails - description: | - Whether to allow more than one account to have the same email. - - !ruby/object:Api::Type::NestedObject - name: hashConfig - output: true - description: | - Output only. Hash config information. - properties: - - !ruby/object:Api::Type::String - name: algorithm - output: true - description: | - Different password hash algorithms used in Identity Toolkit. - - !ruby/object:Api::Type::String - name: 'signerKey' - output: true - description: | - Signer key in base64. - - !ruby/object:Api::Type::String - name: 'saltSeparator' - output: true - description: | - Non-printable character to be inserted between the salt and plain text password in base64. - - !ruby/object:Api::Type::Integer - name: rounds - output: true - description: | - How many rounds for hash calculation. Used by scrypt and other similar password derivation algorithms. - - !ruby/object:Api::Type::Integer - name: 'memoryCost' - output: true - description: | - Memory cost for hash calculation. Used by scrypt and other similar password derivation algorithms. See https://tools.ietf.org/html/rfc7914 for explanation of field. diff --git a/mmv1/products/identityplatform/go_ProjectDefaultConfig.yaml b/mmv1/products/identityplatform/go_ProjectDefaultConfig.yaml deleted file mode 100644 index ff1634543efc..000000000000 --- a/mmv1/products/identityplatform/go_ProjectDefaultConfig.yaml +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 2024 Google Inc. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Warning: This is a temporary file, and should not be edited directly ---- -name: 'ProjectDefaultConfig' -description: | - There is no persistent data associated with this resource. -docs: - warning: | - If you are using User ADCs (Application Default Credentials) with this resource, - you must specify a `billing_project` and set `user_project_override` to true - in the provider configuration. Otherwise the ACM API will return a 403 error. - Your account must have the `serviceusage.services.use` permission on the - `billing_project` you defined. -id_format: '{{project}}' -base_url: 'projects/{{project}}/config' -self_link: 'projects/{{project}}/config' -create_verb: 'PATCH' -update_verb: 'PATCH' -update_mask: true -delete_verb: 'PATCH' -timeouts: - insert_minutes: 20 - update_minutes: 20 - delete_minutes: 20 -custom_code: - test_check_destroy: 'templates/terraform/custom_check_destroy/go/identity_platform_project_default_config.go.tmpl' -deprecation_message: '`google_identity_platform_config` is deprecated and will be removed in the next major release of the provider. Use the `google_identity_platform_config` resource instead. It contains a more comprehensive list of fields, and was created before `google_identity_platform_project_default_config` was added.' -examples: - - name: 'identity_platform_project_default_config' - primary_resource_id: 'default' - skip_test: true -parameters: -properties: - - name: 'name' - type: String - description: | - The name of the Config resource. Example: "projects/my-awesome-project/config" - output: true - - name: 'signIn' - type: NestedObject - description: | - Configuration related to local sign in methods. - properties: - - name: 'email' - type: NestedObject - description: | - Configuration options related to authenticating a user by their email address. - properties: - - name: 'enabled' - type: Boolean - description: | - Whether email auth is enabled for the project or not. - - name: 'passwordRequired' - type: Boolean - description: | - Whether a password is required for email auth or not. If true, both an email and - password must be provided to sign in. If false, a user may sign in via either - email/password or email link. - - name: 'phoneNumber' - type: NestedObject - description: | - Configuration options related to authenticated a user by their phone number. - properties: - - name: 'enabled' - type: Boolean - description: | - Whether phone number auth is enabled for the project or not. - - name: 'testPhoneNumbers' - type: KeyValuePairs - description: | - A map of that can be used for phone auth testing. - - name: 'anonymous' - type: NestedObject - description: | - Configuration options related to authenticating an anonymous user. - properties: - - name: 'enabled' - type: Boolean - description: | - Whether anonymous user auth is enabled for the project or not. - required: true - - name: 'allowDuplicateEmails' - type: Boolean - description: | - Whether to allow more than one account to have the same email. - - name: 'hashConfig' - type: NestedObject - description: | - Output only. Hash config information. - output: true - properties: - - name: 'algorithm' - type: String - description: | - Different password hash algorithms used in Identity Toolkit. - output: true - - name: 'signerKey' - type: String - description: | - Signer key in base64. - output: true - - name: 'saltSeparator' - type: String - description: | - Non-printable character to be inserted between the salt and plain text password in base64. - output: true - - name: 'rounds' - type: Integer - description: | - How many rounds for hash calculation. Used by scrypt and other similar password derivation algorithms. - output: true - - name: 'memoryCost' - type: Integer - description: | - Memory cost for hash calculation. Used by scrypt and other similar password derivation algorithms. See https://tools.ietf.org/html/rfc7914 for explanation of field. - output: true diff --git a/mmv1/templates/terraform/custom_check_destroy/go/identity_platform_project_default_config.go.tmpl b/mmv1/templates/terraform/custom_check_destroy/go/identity_platform_project_default_config.go.tmpl deleted file mode 100644 index 4c201190faba..000000000000 --- a/mmv1/templates/terraform/custom_check_destroy/go/identity_platform_project_default_config.go.tmpl +++ /dev/null @@ -1,45 +0,0 @@ -config := acctest.GoogleProviderConfig(t) - -url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{"{{"}}IdentityPlatformBasePath{{"}}"}}projects/{{"{{"}}project{{"}}"}}/config") -if err != nil { - return err -} - -billingProject := "" - -if config.BillingProject != "" { - billingProject = config.BillingProject -} - -res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "GET", - Project: billingProject, - RawURL: url, - UserAgent: config.UserAgent, -}) -if err != nil { - return fmt.Errorf("something went wrong trying to get the IdentityPlatformProjectDefaultConfig at %s", url) -} - -signIn := res["signIn"] -if signIn == nil { - return nil -} - -original := signIn.(map[string]interface{}) -if len(original) == 0 { - return nil -} - -transformed := make(map[string]interface{}) -transformed["email"] = - flattenIdentityPlatformProjectDefaultConfigSignInEmail(original["email"], nil, nil) -transformed["phone_number"] = - flattenIdentityPlatformProjectDefaultConfigSignInPhoneNumber(original["phoneNumber"], nil, nil) -transformed["anonymous"] = - flattenIdentityPlatformProjectDefaultConfigSignInAnonymous(original["anonymous"], nil, nil) - -if transformed["email"] != nil || transformed["phone_number"] != nil || transformed["anonymous"] != nil { - return fmt.Errorf("IdentityPlatformProjectDefaultConfig still exists at %s", url) -} \ No newline at end of file diff --git a/mmv1/templates/terraform/custom_check_destroy/identity_platform_project_default_config.go.erb b/mmv1/templates/terraform/custom_check_destroy/identity_platform_project_default_config.go.erb deleted file mode 100644 index f2da2289d922..000000000000 --- a/mmv1/templates/terraform/custom_check_destroy/identity_platform_project_default_config.go.erb +++ /dev/null @@ -1,45 +0,0 @@ -config := acctest.GoogleProviderConfig(t) - -url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{IdentityPlatformBasePath}}projects/{{project}}/config") -if err != nil { - return err -} - -billingProject := "" - -if config.BillingProject != "" { - billingProject = config.BillingProject -} - -res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "GET", - Project: billingProject, - RawURL: url, - UserAgent: config.UserAgent, -}) -if err != nil { - return fmt.Errorf("something went wrong trying to get the IdentityPlatformProjectDefaultConfig at %s", url) -} - -signIn := res["signIn"] -if signIn == nil { - return nil -} - -original := signIn.(map[string]interface{}) -if len(original) == 0 { - return nil -} - -transformed := make(map[string]interface{}) -transformed["email"] = - flattenIdentityPlatformProjectDefaultConfigSignInEmail(original["email"], nil, nil) -transformed["phone_number"] = - flattenIdentityPlatformProjectDefaultConfigSignInPhoneNumber(original["phoneNumber"], nil, nil) -transformed["anonymous"] = - flattenIdentityPlatformProjectDefaultConfigSignInAnonymous(original["anonymous"], nil, nil) - -if transformed["email"] != nil || transformed["phone_number"] != nil || transformed["anonymous"] != nil { - return fmt.Errorf("IdentityPlatformProjectDefaultConfig still exists at %s", url) -} \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/go/identity_platform_project_default_config.tf.tmpl b/mmv1/templates/terraform/examples/go/identity_platform_project_default_config.tf.tmpl deleted file mode 100644 index 54f5b0c1bd49..000000000000 --- a/mmv1/templates/terraform/examples/go/identity_platform_project_default_config.tf.tmpl +++ /dev/null @@ -1,21 +0,0 @@ -resource "google_identity_platform_project_default_config" "{{$.PrimaryResourceId}}" { - sign_in { - allow_duplicate_emails = true - - anonymous { - enabled = true - } - - email { - enabled = true - password_required = false - } - - phone_number { - enabled = true - test_phone_numbers = { - "+11231231234" = "000000" - } - } - } -} \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/identity_platform_project_default_config.tf.erb b/mmv1/templates/terraform/examples/identity_platform_project_default_config.tf.erb deleted file mode 100644 index a863b7a11726..000000000000 --- a/mmv1/templates/terraform/examples/identity_platform_project_default_config.tf.erb +++ /dev/null @@ -1,21 +0,0 @@ -resource "google_identity_platform_project_default_config" "<%= ctx[:primary_resource_id] %>" { - sign_in { - allow_duplicate_emails = true - - anonymous { - enabled = true - } - - email { - enabled = true - password_required = false - } - - phone_number { - enabled = true - test_phone_numbers = { - "+11231231234" = "000000" - } - } - } -} \ No newline at end of file diff --git a/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown b/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown index b7ae2ca8cd75..4e886659ef41 100644 --- a/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown +++ b/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown @@ -214,3 +214,9 @@ Now `lifecycle_rule.condition.no_age` is no longer supported and `lifecycle_rule Removed in favor of the field `lifecycle_rule.condition.send_age_if_zero` which can be used to set zero value for `lifecycle_rule.condition.age` attribute. For a seamless update, if your state today uses `no_age=true`, update it to remove `no_age` and set `send_age_if_zero=false`. If you do not use `no_age=true`, you will need to add `send_age_if_zero=true` to your state to avoid any changes after updating to 6.0.0. + +## Removals + +### Resource: `google_identity_platform_project_default_config` is now removed + +`google_identity_platform_project_default_config` is removed in favor of `google_identity_platform_project_config`