Skip to content
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.

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

r/cognito_user_pool: Add ConflictsWith to a few fields #2425

Merged
merged 2 commits into from
Feb 27, 2019

Conversation

atsushi-ishibashi
Copy link
Contributor

Related: #2423

@radeksimko radeksimko added the documentation Introduces or discusses updates to documentation. label Nov 26, 2017
@atsushi-ishibashi
Copy link
Contributor Author

atsushi-ishibashi commented Dec 1, 2017

According to AWS support,

If both are specified and the values are different, either one is prioritized and updated.
So far verification_message_template is prioritized, but this operation is not specified in the document, possibly at the present moment only, so it may change in the future without notice.

@@ -31,7 +31,11 @@ The following arguments are supported:
* `email_configuration` (Optional) - The [Email Configuration](#email-configuration).
* `name` - (Required) The name of the user pool.
* `email_verification_subject` - (Optional) A string representing the email verification subject.

~> **Note** `verification_message_template.email_subject` replaces this string when you specify these two.
Copy link
Contributor

@Ninir Ninir Dec 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering whether we should set email_verification_subject as ConflictsWith: []string{"verification_message_template.0. email_subject"},, since we cannot have both being different. The same would applies to the email_verification_message

Thus, we could avoid such notice... what do you think @atsushi-ishibashi

Also pinging @radeksimko to get it's opinion :)

Copy link
Contributor Author

@atsushi-ishibashi atsushi-ishibashi Dec 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm worrying that it becomes breaking-change.
There are users who are forced update .tf files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it would be, but since it's one or the other according to the AWS support... this is a required thing IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got it👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@atsushi-ishibashi Correct me if I'm wrong but the API misbehaves and causes spurious diffs if you provide both?

The only case when I see ConflictsWith causing problems/BC is when folks use the exact same values.

We can defer the ConflictsWith addition to 2.0.0 and document this as suggested in the meantime.

@Ninir what do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@atsushi-ishibashi Correct me if I'm wrong but the API misbehaves and causes spurious diffs if you provide both?

Exactly!

We can defer the ConflictsWith addition to 2.0.0 and document this as suggested in the meantime.

Do agree on that :) 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@radeksimko That's right!

We can defer the ConflictsWith addition to 2.0.0 and document this as suggested in the meantime.

I also agree!

@radeksimko radeksimko added breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. enhancement Requests to existing resources that expand the functionality or scope. and removed documentation Introduces or discusses updates to documentation. labels Dec 11, 2017
@radeksimko radeksimko added this to the v2.0.0 milestone Dec 11, 2017
@radeksimko radeksimko changed the title docs/r/cognito_user_pool: Add note to email_verification_message r/cognito_user_pool: Add ConflictsWith to a few fields Dec 11, 2017
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @atsushi-ishibashi 🚀 This will be added to the Version 2 Upgrade Guide on merge.

--- PASS: TestAccAWSCognitoUserPool_basic (11.04s)
--- PASS: TestAccAWSCognitoUserPool_withPasswordPolicy (17.22s)
--- PASS: TestAccAWSCognitoUserPool_withEmailVerificationMessage (17.71s)
--- PASS: TestAccAWSCognitoUserPool_withTags (19.28s)
--- PASS: TestAccAWSCognitoUserPool_withAliasAttributes (19.78s)
--- PASS: TestAccAWSCognitoUserPool_withAdminCreateUserConfiguration (20.77s)
--- PASS: TestAccAWSCognitoUserPool_withEmailConfiguration (21.09s)
--- PASS: TestAccAWSCognitoUserPool_importBasic (21.60s)
--- PASS: TestAccAWSCognitoUserPool_withDeviceConfiguration (21.67s)
--- PASS: TestAccAWSCognitoUserPool_withVerificationMessageTemplate (22.30s)
--- PASS: TestAccAWSCognitoUserPool_withSchemaAttributes (22.67s)
--- PASS: TestAccAWSCognitoUserPool_withSmsVerificationMessage (24.39s)
--- PASS: TestAccAWSCognitoUserPool_withSmsConfiguration (28.07s)
--- PASS: TestAccAWSCognitoUserPool_withSmsConfigurationUpdated (32.73s)
--- PASS: TestAccAWSCognitoUserPool_withAdvancedSecurityMode (33.28s)
--- PASS: TestAccAWSCognitoUserPool_withLambdaConfig (39.78s)
--- PASS: TestAccAWSCognitoUserPool_update (44.01s)

@bflad bflad merged commit cf1ae93 into hashicorp:master Feb 27, 2019
bflad added a commit that referenced this pull request Feb 27, 2019
@ghost
Copy link

ghost commented Mar 31, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Mar 31, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. enhancement Requests to existing resources that expand the functionality or scope.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants