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

Refactor Opswork stack resource to use keyvaluetags package #11373

Merged
merged 1 commit into from
Dec 19, 2019
Merged

Refactor Opswork stack resource to use keyvaluetags package #11373

merged 1 commit into from
Dec 19, 2019

Conversation

ewbankkit
Copy link
Contributor

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

Relates #10688.

Release note for CHANGELOG:

NONE

Output from acceptance testing:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSOpsworksStack_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws/ -v -count 1 -parallel 1 -run=TestAccAWSOpsworksStack_ -timeout 120m
=== RUN   TestAccAWSOpsworksStack_noVpcBasic
=== PAUSE TestAccAWSOpsworksStack_noVpcBasic
=== RUN   TestAccAWSOpsworksStack_noVpcChangeServiceRoleForceNew
=== PAUSE TestAccAWSOpsworksStack_noVpcChangeServiceRoleForceNew
=== RUN   TestAccAWSOpsworksStack_vpc
=== PAUSE TestAccAWSOpsworksStack_vpc
=== RUN   TestAccAWSOpsworksStack_noVpcCreateTags
=== PAUSE TestAccAWSOpsworksStack_noVpcCreateTags
=== RUN   TestAccAWSOpsworksStack_CustomCookbooks_SetPrivateProperties
=== PAUSE TestAccAWSOpsworksStack_CustomCookbooks_SetPrivateProperties
=== CONT  TestAccAWSOpsworksStack_noVpcBasic
--- PASS: TestAccAWSOpsworksStack_noVpcBasic (34.13s)
=== CONT  TestAccAWSOpsworksStack_noVpcCreateTags
--- PASS: TestAccAWSOpsworksStack_noVpcCreateTags (68.07s)
=== CONT  TestAccAWSOpsworksStack_vpc
--- PASS: TestAccAWSOpsworksStack_vpc (81.98s)
=== CONT  TestAccAWSOpsworksStack_noVpcChangeServiceRoleForceNew
--- PASS: TestAccAWSOpsworksStack_noVpcChangeServiceRoleForceNew (55.83s)
=== CONT  TestAccAWSOpsworksStack_CustomCookbooks_SetPrivateProperties
--- PASS: TestAccAWSOpsworksStack_CustomCookbooks_SetPrivateProperties (43.90s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	284.012s

@ewbankkit ewbankkit requested a review from a team December 19, 2019 19:30
@ghost ghost added needs-triage Waiting for first response or review from a maintainer. size/M Managed by automation to categorize the size of a PR. service/opsworks Issues and PRs that pertain to the opsworks service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 19, 2019
ewbankkit
ewbankkit commented Dec 19, 2019
View reviewed changes
aws/resource_aws_opsworks_stack.go
@@ -366,6 +367,16 @@ func resourceAwsOpsworksStackRead(d *schema.ResourceData, meta interface{}) erro
}
resourceAwsOpsworksSetStackCustomCookbooksSource(d, stack.CustomCookbooksSource)

tags, err := keyvaluetags.OpsworksListTags(client, arn)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We weren't getting tags in the resource's Read method previously.

Copy link
Contributor

Choose a reason for hiding this comment

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

Overall this is a good change as it helps Terraform perform drift detection for tags (and fixes their import) when the Opsworks Stack is in the same region as the provider, although I worry a little bit about the cross-region abilities of this resource. Going forward tag listing errors for invalid ARNs will now always report. See also: #6381

I'm okay merging this in an effort of moving the resource into a better spot, although this may mean other bug reports similar to #6381 will start coming if the reads start failing now.

ewbankkit
ewbankkit commented Dec 19, 2019
View reviewed changes
aws/resource_aws_opsworks_stack_test.go
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"tags"},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Checking tags as we now get them in the Read method.

@bflad bflad added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Dec 19, 2019
bflad
bflad approved these changes Dec 19, 2019
View reviewed changes
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.

Left one reply, but looks good to move this resource forward, thanks @ewbankkit 🚀

Output from acceptance testing:

--- PASS: TestAccAWSOpsworksStack_CustomCookbooks_SetPrivateProperties (30.54s)
--- PASS: TestAccAWSOpsworksStack_noVpcBasic (31.40s)
--- PASS: TestAccAWSOpsworksStack_noVpcCreateTags (39.24s)
--- PASS: TestAccAWSOpsworksStack_vpc (40.29s)
--- PASS: TestAccAWSOpsWorksStack_classicEndpoints (48.97s)
--- PASS: TestAccAWSOpsworksStack_noVpcChangeServiceRoleForceNew (53.44s)

aws/resource_aws_opsworks_stack.go
@@ -366,6 +367,16 @@ func resourceAwsOpsworksStackRead(d *schema.ResourceData, meta interface{}) erro
}
resourceAwsOpsworksSetStackCustomCookbooksSource(d, stack.CustomCookbooksSource)

tags, err := keyvaluetags.OpsworksListTags(client, arn)
Copy link
Contributor

Choose a reason for hiding this comment

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

Overall this is a good change as it helps Terraform perform drift detection for tags (and fixes their import) when the Opsworks Stack is in the same region as the provider, although I worry a little bit about the cross-region abilities of this resource. Going forward tag listing errors for invalid ARNs will now always report. See also: #6381

I'm okay merging this in an effort of moving the resource into a better spot, although this may mean other bug reports similar to #6381 will start coming if the reads start failing now.

@bflad bflad added this to the v2.44.0 milestone Dec 19, 2019
@bflad bflad merged commit abd7feb into hashicorp:master Dec 19, 2019
bflad added a commit that referenced this pull request Dec 19, 2019
@bflad
Update CHANGELOG for #11373
d2ded60
@ghost
Copy link

ghost commented Jan 10, 2020

This has been released in version 2.44.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 Mar 27, 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 27, 2020
@ewbankkit ewbankkit deleted the opsworks-keyvaluetags branch December 1, 2022 13:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bflad bflad bflad approved these changes

Assignees
No one assigned
Labels
bug Addresses a defect in current functionality. service/opsworks Issues and PRs that pertain to the opsworks 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
v2.44.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ewbankkit @bflad