diff --git a/.changelog/2185.txt b/.changelog/2185.txt new file mode 100644 index 0000000000..0758de23c8 --- /dev/null +++ b/.changelog/2185.txt @@ -0,0 +1,7 @@ +```release-note:breaking-change +resource/mongodbatlas_federated_settings_identity_provider: Import can only use a 24-hexadecimal digit string that identifies the IdP, `idp_id`, instead of `okta_idp_id` +``` + +```release-note:breaking-change +data-source/mongodbatlas_federated_settings_identity_provider: The only allowed format for `identity_provider_id` is a 24-hexadecimal digit string +``` diff --git a/website/docs/d/federated_settings_identity_provider.html.markdown b/website/docs/d/federated_settings_identity_provider.html.markdown index 07a53526b0..5f0f14d2f9 100644 --- a/website/docs/d/federated_settings_identity_provider.html.markdown +++ b/website/docs/d/federated_settings_identity_provider.html.markdown @@ -29,7 +29,7 @@ resource "mongodbatlas_federated_settings_identity_provider" "identity_provider" data "mongodbatlas_federated_settings_identity_provider" "identity_provider_ds" { federation_settings_id = mongodbatlas_federated_settings_identity_provider.identity_provider.id - identity_provider_id = "0oad47f7fXnk1297" + identity_provider_id = "0oad4fas87jL5Xnk12971234" } ``` @@ -37,9 +37,7 @@ data "mongodbatlas_federated_settings_identity_provider" "identity_provider_ds" ## Argument Reference * `federation_settings_id` - (Required) Unique 24-hexadecimal digit string that identifies the federated authentication configuration. -* `identity_provider_id` - (Required) Unique 20-hexadecimal or 24-hexadecimal digit string that identifies the IdP. - -**WARNING:** Starting from terraform provider version 1.16.0, the only allowed format for `identity_provider_id` will be 24-hexadecimal digit string. See more [here](../guides/1.15.0-upgrade-guide.html.markdown) +* `identity_provider_id` - (Required) Unique 24-hexadecimal digit string that identifies the IdP. ## Attributes Reference diff --git a/website/docs/d/federated_settings_identity_providers.html.markdown b/website/docs/d/federated_settings_identity_providers.html.markdown index 1fda1dd4d3..41367a8902 100644 --- a/website/docs/d/federated_settings_identity_providers.html.markdown +++ b/website/docs/d/federated_settings_identity_providers.html.markdown @@ -16,7 +16,7 @@ description: |- ```terraform resource "mongodbatlas_federated_settings_identity_provider" "identity_provider" { - federation_settings_id = "627a9687f7f7f7f774de306f14" + federation_settings_id = "627a9687f7f7f7f774de306f" name = "mongodb_federation_test" associated_domains = ["yourdomain.com"] sso_debug_enabled = true @@ -77,7 +77,7 @@ In addition to all arguments above, the following attributes are exported: * `audience_uri` - Identifier for the intended audience of the SAML Assertion. * `display_name` - Human-readable label that identifies the IdP. * `issuer_uri` - Identifier for the issuer of the SAML Assertion. -* `idp_id` - Unique 20-hexadecimal digit string that identifies the IdP. +* `idp_id` - Unique 24-hexadecimal digit string that identifies the IdP. ### Pem File Info - List that contains the file information, including: start date, and expiration date for the identity provider's PEM-encoded public key certificate. * `not_after` - Expiration Date. * `not_before` - Start Date. diff --git a/website/docs/guides/1.16.0-upgrade-guide.html.markdown b/website/docs/guides/1.16.0-upgrade-guide.html.markdown index e2cc61997f..8f5d743470 100644 --- a/website/docs/guides/1.16.0-upgrade-guide.html.markdown +++ b/website/docs/guides/1.16.0-upgrade-guide.html.markdown @@ -12,11 +12,12 @@ The Terraform MongoDB Atlas Provider version 1.16.0 has a number of new and exci **New Resources, Data Sources, and Features:** - +- The HashiCorp Terraform Version Compatibility Matrix has been published for the Terraform MongoDB Atlas Provider. See full details at https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs#hashicorp-terraform-version-compatibility-matrix **Deprecations and Removals:** -- The HashiCorp Terraform Version Compatibility Matrix has been published for the Terraform MongoDB Atlas Provider. See full details at https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs#hashicorp-terraform-version-compatibility-matrix +- Format of IdP Id that uniquely identifies the identity provider when importing [`mongodbatlas_federated_settings_identity_provider`](https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs/resources/federated_settings_identity_provider) resource and [`mongodbatlas_federated_settings_identity_provider`](https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs/data-sources/federated_settings_identity_provider) data source only accepts the new IdP Id format that is a 24-hex characters long string. +More info can be found in the [previous guide](https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs/guides/1.15.0-upgrade-guide). ### Helpful Links diff --git a/website/docs/r/federated_settings_identity_provider.html.markdown b/website/docs/r/federated_settings_identity_provider.html.markdown index 89f502d7a2..cfc581268a 100644 --- a/website/docs/r/federated_settings_identity_provider.html.markdown +++ b/website/docs/r/federated_settings_identity_provider.html.markdown @@ -64,9 +64,7 @@ In addition to all arguments above, the following attributes are exported: Identity Provider **must** be imported before using federation_settings_id-idp_id, e.g. ``` -$ terraform import mongodbatlas_federated_settings_identity_provider.identity_provider 6287a663c660f52b1c441c6c-0oad4fas87jL5Xnk1297 +$ terraform import mongodbatlas_federated_settings_identity_provider.identity_provider 6287a663c660f52b1c441c6c-0oad4fas87jL5Xnk12971234 ``` -**WARNING:** Starting from terraform provider version 1.16.0, to import the resource a 24-hexadecimal digit string that identifies the IdP (`idp_id`) will have to be used instead of `okta_idp_id`. See more [here](../guides/1.15.0-upgrade-guide.html.markdown) - For more information see: [MongoDB Atlas API Reference.](https://www.mongodb.com/docs/atlas/reference/api/federation-configuration/) \ No newline at end of file