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

Add ability to import aws_iam_user_ssh_key #6727

Merged
merged 1 commit into from
Dec 7, 2018

Conversation

AMeng
Copy link
Contributor

@AMeng AMeng commented Dec 5, 2018

Changes proposed in this pull request:

  • Add ability to import aws_iam_user_ssh_key
  • Ignore newlines and comments in aws_iam_user_ssh_key.public_key diffs

While testing importing, I noticed that AWS strips out any comments in SSH formatted keys. Comments are anything after the key itself (usually a username or email). I think it makes sense to ignore these since they're extremely common, and Terraform will perpetually think there is a diff if present. I also ignored newlines since AWS strips those as well.

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSUserSSHKey'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -parallel 20 -run=TestAccAWSUserSSHKey -timeout 120m
?   	github.com/terraform-providers/terraform-provider-aws	[no test files]
=== RUN   TestAccAWSUserSSHKey_basic
=== PAUSE TestAccAWSUserSSHKey_basic
=== RUN   TestAccAWSUserSSHKey_pemEncoding
=== PAUSE TestAccAWSUserSSHKey_pemEncoding
=== CONT  TestAccAWSUserSSHKey_basic
=== CONT  TestAccAWSUserSSHKey_pemEncoding
--- PASS: TestAccAWSUserSSHKey_pemEncoding (12.66s)
--- PASS: TestAccAWSUserSSHKey_basic (12.90s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	15.713s

Ignore newlines and comments in aws_iam_user_ssh_key.public_key diffs
@ghost ghost added size/M Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. service/iam Issues and PRs that pertain to the iam service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 5, 2018
@bflad bflad added the enhancement Requests to existing resources that expand the functionality or scope. label Dec 7, 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.

LGTM, thanks @AMeng 🚀

--- PASS: TestAccAWSUserSSHKey_pemEncoding (8.50s)
--- PASS: TestAccAWSUserSSHKey_basic (9.17s)

@bflad bflad added this to the v1.52.0 milestone Dec 7, 2018
@bflad bflad merged commit d64d95f into hashicorp:master Dec 7, 2018
bflad added a commit that referenced this pull request Dec 7, 2018
@bflad
Copy link
Contributor

bflad commented Dec 13, 2018

This has been released in version 1.52.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 1, 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 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/iam Issues and PRs that pertain to the iam 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
Development

Successfully merging this pull request may close these issues.

2 participants