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

internal/keyvaluetags: Create {SERVICE}GetTag generator, support EC2 list/get, use in aws_ec2_tag implementation #13745

Merged
merged 2 commits into from
Jun 16, 2020

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Jun 13, 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

Reference: #9061

Release note for CHANGELOG:

NONE

The {SERVICE}GetTag generator simplifies the creation of the new individual service tag resources into a consistent implementation. This consistent implementation can be used to automatically generate the service tag resources themselves in the future.

Output from acceptance testing:

--- PASS: TestAccAWSEc2Tag_basic (485.52s)
--- PASS: TestAccAWSEc2Tag_disappears (529.67s)
--- PASS: TestAccAWSEc2Tag_Value (588.49s)

…list/get, use in aws_ec2_tag implementation

Reference: #9061

The GetTag generator simplifies the creation of the new individual service tag resources into a consistent implementation. This consistent implementation can be used to automatically generate the service tag resources themselves in the future.

Output from acceptance testing:

```
--- PASS: TestAccAWSEc2Tag_basic (485.52s)
--- PASS: TestAccAWSEc2Tag_disappears (529.67s)
--- PASS: TestAccAWSEc2Tag_Value (588.49s)
```
@bflad bflad added the enhancement Requests to existing resources that expand the functionality or scope. label Jun 13, 2020
@bflad bflad requested a review from a team June 13, 2020 18:23
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. provider Pertains to the provider itself, rather than any interaction with AWS. service/ec2 Issues and PRs that pertain to the ec2 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jun 13, 2020
// The two types must be equivalent.
func ServiceTagType2(serviceName string) string {
switch serviceName {
case "ec2":
Copy link
Contributor

@ewbankkit ewbankkit Jun 15, 2020

Choose a reason for hiding this comment

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

Copy link
Contributor

@ewbankkit ewbankkit Jun 15, 2020

Choose a reason for hiding this comment

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

We could also get rid of ec2TagSpecificationsFromMap by adding

func (tags KeyValueTags) Ec2TagSpecifications(resourceType string) []*ec2.TagSpecification {

but that's another issue: #13870.

func {{ . | Title }}GetTag(conn {{ . | ClientType }}, identifier string{{ if . | ListTagsInputResourceTypeField }}, resourceType string{{ end }}, key string) (bool, *string, error) {
{{- if . | ListTagsInputFilterIdentifierName }}
input := &{{ . | TagPackage }}.{{ . | ListTagsFunction }}Input{
Filters: []*{{ . | TagPackage }}.Filter{
Copy link
Contributor

Choose a reason for hiding this comment

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

We should be able to use the namevaluesfilters functionality from #13313 when that's merged (reminds me I need to get back to that).

@anGie44 anGie44 self-requested a review June 16, 2020 17:03
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

From my recent read-up on data templates in Go 😅 , looks great @bflad 🚀

Output of acceptance tests:

--- PASS: TestAccAWSEc2Tag_disappears (436.48s)
--- PASS: TestAccAWSEc2Tag_basic (437.68s)
--- PASS: TestAccAWSEc2Tag_Value (453.68s)

@bflad bflad added this to the v2.67.0 milestone Jun 16, 2020
@bflad bflad merged commit e65bb84 into master Jun 16, 2020
@bflad bflad deleted the f-keyvalue-tags-gettag branch June 16, 2020 23:29
@ghost
Copy link

ghost commented Jun 19, 2020

This has been released in version 2.67.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 Jul 17, 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 Jul 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. provider Pertains to the provider itself, rather than any interaction with AWS. service/ec2 Issues and PRs that pertain to the ec2 service. size/XL 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
Development

Successfully merging this pull request may close these issues.

3 participants