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

4701 aws_service_discovery_private_dns_namespace name length limit #4702

Merged
merged 1 commit into from
Jun 2, 2018

Conversation

ahl
Copy link
Contributor

@ahl ahl commented May 30, 2018

Fixes #4701 aws_service_discovery_private_dns_namespace

Changes proposed in this pull request:

  • use a hash of the name if its length exceeds 32 characters

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSServiceDiscoveryPrivateDnsNamespace'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -run=TestAccAWSServiceDiscoveryPrivateDnsNamespace -timeout 120m
?   	github.com/terraform-providers/terraform-provider-aws	[no test files]
=== RUN   TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic
--- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic (21.61s)
=== RUN   TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname
--- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname (20.86s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	42.513s

@ghost ghost added the size/S Managed by automation to categorize the size of a PR. label May 30, 2018
@bflad bflad added service/servicediscovery Issues and PRs that pertain to the servicediscovery service. bug Addresses a defect in current functionality. labels May 30, 2018
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 for submitting this fix @ahl! 🚀

I believe we actually just need to trim the input into resource.PrefixedUniqueId() which I'll double check post-merge and update if it still passes your new acceptance test 😄

2 tests passed (all tests)
=== RUN   TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname
--- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_longname (10.92s)
=== RUN   TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic
--- PASS: TestAccAWSServiceDiscoveryPrivateDnsNamespace_basic (13.05s)

@@ -1,6 +1,8 @@
package aws

import (
"crypto/sha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

We actually do not need to perform any hashing as resource.PrefixedUniqueId() already includes a mutex with a monotonic counter to ensure it is unique even during concurrent operations with the same prefix:

https://github.com/hashicorp/terraform/blob/ad259b2b9569cadd4a24f051e271fa5e669066f2/helper/resource/id.go#L35-L45

We just need to trim the input string 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a lot simpler. Why even bother with a prefix based on the name if it is irrelevant for uniqueness? Why not use "" or "terraform" or "private_dns_namespace"?

Thanks for merging and cleaning up

@bflad bflad added this to the v1.22.0 milestone Jun 2, 2018
@bflad bflad merged commit 9839c4f into hashicorp:master Jun 2, 2018
bflad added a commit that referenced this pull request Jun 2, 2018
@bflad
Copy link
Contributor

bflad commented Jun 5, 2018

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

@ghost
Copy link

ghost commented Apr 5, 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 Apr 5, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/servicediscovery Issues and PRs that pertain to the servicediscovery service. size/S Managed by automation to categorize the size of a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws_service_discovery_private_dns_namespace name length limit
2 participants