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.

Sign up for GitHub

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

Jump to bottom

resource/aws_msk_cluster: Update encryption_info.encryption_in_transit.client_broker default to match API default #14132

Merged
merged 2 commits into from
Jul 14, 2020
Merged

resource/aws_msk_cluster: Update encryption_info.encryption_in_transit.client_broker default to match API default #14132

merged 2 commits into from
Jul 14, 2020

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Jul 10, 2020

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #10673

Release note for CHANGELOG:

* resource/aws_msk_cluster: Update `encryption_info` `encryption_in_transit` `client_broker` argument default to match API default

Output from acceptance testing:

--- PASS: TestAccAWSMskCluster_basic (1595.73s)
--- PASS: TestAccAWSMskCluster_BrokerNodeGroupInfo_EbsVolumeSize (1760.04s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionAtRestKmsKeyArn (1603.40s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_ClientBroker (1603.85s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_InCluster (1598.02s)
--- PASS: TestAccAWSMskCluster_EnhancedMonitoring (1603.10s)
--- PASS: TestAccAWSMskCluster_LoggingInfo (1806.72s)
--- PASS: TestAccAWSMskCluster_NumberOfBrokerNodes (2036.98s)
--- PASS: TestAccAWSMskCluster_OpenMonitoring (1722.68s)
--- PASS: TestAccAWSMskCluster_Tags (1605.63s)

--- PASS: TestAccAWSMskClusterDataSource_Name (1608.30s)

@bflad bflad added bug Addresses a defect in current functionality. breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. labels Jul 10, 2020
@bflad bflad added this to the v3.0.0 milestone Jul 10, 2020
@bflad bflad requested a review from a team July 10, 2020 00:58
@ghost ghost added size/M Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. service/kafka Issues and PRs that pertain to the kafka service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jul 10, 2020
@anGie44 anGie44 self-requested a review July 14, 2020 18:23
anGie44
anGie44 approved these changes Jul 14, 2020
View reviewed changes
Copy link
Contributor

@anGie44 anGie44 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Just a comment in the data-source test and note conflict w/the upgrade guide and resource docs, otherwise LGTM 👍

Output of acceptance tests:

--- SKIP: TestAccAWSMskCluster_ConfigurationInfo_Revision (0.00s)
--- SKIP: TestAccAWSMskCluster_ClientAuthentication_Tls_CertificateAuthorityArns (0.00s)
--- PASS: TestAccAWSMskCluster_basic (1618.98s)
--- PASS: TestAccAWSMskClusterDataSource_Name (958.37s)
--- PASS: TestAccAWSMskCluster_Tags (977.44s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_InCluster (991.59s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_ClientBroker (1039.18s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionAtRestKmsKeyArn (1058.98s)
--- PASS: TestAccAWSMskCluster_EnhancedMonitoring (1133.72s)
--- PASS: TestAccAWSMskCluster_OpenMonitoring (1318.56s)
--- PASS: TestAccAWSMskCluster_LoggingInfo (1363.17s)
--- PASS: TestAccAWSMskCluster_BrokerNodeGroupInfo_EbsVolumeSize (1369.14s)
--- PASS: TestAccAWSMskCluster_NumberOfBrokerNodes (1590.21s)

aws/data_source_aws_msk_cluster_test.go Outdated
Comment on lines 26 to 27
resource.TestCheckResourceAttr(resourceName, "bootstrap_brokers", ""),
resource.TestMatchResourceAttr(resourceName, "bootstrap_brokers_tls", regexp.MustCompile(`^(([-\w]+\.){1,}[\w]+:\d+,){2,}([-\w]+\.){1,}[\w]+:\d+$`)), // Ordering not guaranteed
Copy link
Contributor

Choose a reason for hiding this comment

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

could we use TestCheckResourceAttrPair checks in exchange of these checks on the resource?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah sorry the Go comment wasn't clear, unfortunately the ordering of the hostnames within the string response isn't guaranteed between read calls, so the resource and the data source may have differing responses. This resource attribute may be a candidate in the future for us going against the API and making a TypeSet for better usability.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ohhh gotcha, makes sense!

@bflad
resource/aws_msk_cluster: Update encryption_info.encryption_in_transi…
e926b92 
…t.client_broker default to match API default

Reference: #10673

Output from acceptance testing:

```
--- PASS: TestAccAWSMskCluster_basic (1595.73s)
--- PASS: TestAccAWSMskCluster_BrokerNodeGroupInfo_EbsVolumeSize (1760.04s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionAtRestKmsKeyArn (1603.40s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_ClientBroker (1603.85s)
--- PASS: TestAccAWSMskCluster_EncryptionInfo_EncryptionInTransit_InCluster (1598.02s)
--- PASS: TestAccAWSMskCluster_EnhancedMonitoring (1603.10s)
--- PASS: TestAccAWSMskCluster_LoggingInfo (1806.72s)
--- PASS: TestAccAWSMskCluster_NumberOfBrokerNodes (2036.98s)
--- PASS: TestAccAWSMskCluster_OpenMonitoring (1722.68s)
--- PASS: TestAccAWSMskCluster_Tags (1605.63s)

--- PASS: TestAccAWSMskClusterDataSource_Name (1608.30s)
```
@bflad bflad force-pushed the td-aws_msk_cluster-TLS-default branch from f6dadf3 to e926b92 Compare July 14, 2020 22:10
@bflad
Copy link
Contributor Author

bflad commented Jul 14, 2020

Rebased the documentation conflicts and I'll clarify that comment in the testing.

@bflad
tests/data-source/aws_msk_cluster: Further clarify why bootstrap_brok…
f4a6f24 
…ers_tls is not using TestCheckResourceAttrPair()
@bflad bflad merged commit f56085b into master Jul 14, 2020
@bflad bflad deleted the td-aws_msk_cluster-TLS-default branch July 14, 2020 23:32
bflad added a commit that referenced this pull request Jul 14, 2020
@bflad
Update CHANGELOG for #14132
b69af05
@ghost
Copy link

ghost commented Jul 31, 2020

This has been released in version 3.0.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Aug 14, 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 Aug 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@anGie44 anGie44 anGie44 approved these changes

Assignees
No one assigned
Labels
breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. bug Addresses a defect in current functionality. documentation Introduces or discusses updates to documentation. service/kafka Issues and PRs that pertain to the kafka service. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.

aws_msk_cluster : default value for client_broker : "TLS"
2 participants
@bflad @anGie44