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

keyvaluetags - support Waf Regional #10806

Merged
merged 10 commits into from
Nov 14, 2019

Conversation

DrFaust92
Copy link
Collaborator

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" comments, they generate extra noise for pull request followers and do not help prioritize the request

Relates #10688

Release note for CHANGELOG:

NONE

@DrFaust92 DrFaust92 requested a review from a team November 8, 2019 16:36
@ghost ghost added the size/M Managed by automation to categorize the size of a PR. label Nov 8, 2019
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.

This is a fun one. 😄 Please see some initial recommendations and reach out if you have any questions. Thank you for tackling this weird cross-package handling.

aws/internal/keyvaluetags/generators/listtags/main.go Outdated Show resolved Hide resolved
aws/internal/keyvaluetags/generators/listtags/main.go Outdated Show resolved Hide resolved
aws/internal/keyvaluetags/generators/updatetags/main.go Outdated Show resolved Hide resolved
@DrFaust92
Copy link
Collaborator Author

DrFaust92 commented Nov 9, 2019

Thanks for the comments @bflad, it made things much simpler than i intended.

@@ -182,8 +187,10 @@ package keyvaluetags
import (
"github.com/aws/aws-sdk-go/aws"
{{- range .SliceServiceNames }}
{{- if . | IncludeImport }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i had to add this annoying thing is that i had to add a "filter" for imports the the servicetags generation to skip wafregional import as the package itself is not used in this instance

Copy link
Contributor

Choose a reason for hiding this comment

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

We can actually remove the custom function with eq 👍

{{- if eq . (. | TagPackage) }}

@DrFaust92 DrFaust92 requested a review from bflad November 9, 2019 08:08
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.

Thanks so much for this, @DrFaust92 -- will adjust a few nitpicky things on merge. 🚀

@@ -182,8 +187,10 @@ package keyvaluetags
import (
"github.com/aws/aws-sdk-go/aws"
{{- range .SliceServiceNames }}
{{- if . | IncludeImport }}
Copy link
Contributor

Choose a reason for hiding this comment

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

We can actually remove the custom function with eq 👍

{{- if eq . (. | TagPackage) }}

@@ -102,6 +103,7 @@ func main() {
}
templateFuncMap := template.FuncMap{
"ClientType": keyvaluetags.ServiceClientType,
"ListTagPackage": keyvaluetags.ServiceTagPackage,
Copy link
Contributor

Choose a reason for hiding this comment

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

Will rename to TagPackage for consistency across all generators.

@@ -110,6 +111,7 @@ func main() {
}
templateFuncMap := template.FuncMap{
"ClientType": keyvaluetags.ServiceClientType,
"TagFunctionClass": keyvaluetags.ServiceTagPackage,
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here -- will rename to TagPackage for consistency with other generators.

@bflad bflad merged commit b65fbd8 into hashicorp:master Nov 14, 2019
@bflad bflad added this to the v2.36.0 milestone Nov 14, 2019
@ghost
Copy link

ghost commented Nov 14, 2019

This has been released in version 2.36.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 Dec 14, 2019

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 Dec 14, 2019
@DrFaust92 DrFaust92 deleted the wafregional-keyvalue-tags branch March 22, 2020 21:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
size/M Managed by automation to categorize the size of a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants