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

Fix aws_iam_user_ssh_key update method, set key status after creation #3390

Merged
merged 4 commits into from
Feb 15, 2018
Merged

Fix aws_iam_user_ssh_key update method, set key status after creation #3390

merged 4 commits into from
Feb 15, 2018

Conversation

pawelsocha
Copy link

This PR solves #3363.

Test reasults

--- PASS: TestAccAWSUserSSHKey_basic (26.10s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	26.139s

@ghost ghost added the size/S Managed by automation to categorize the size of a PR. label Feb 15, 2018
bflad
bflad suggested changes Feb 15, 2018
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.

Thanks for diving into this one! Some minor changes then this should be good to go. 🚀

aws/resource_aws_iam_user_ssh_key.go Outdated
@@ -69,9 +69,10 @@ func resourceAwsIamUserSshKeyCreate(d *schema.ResourceData, meta interface{}) er
}

d.Set("ssh_public_key_id", createResp.SSHPublicKey.SSHPublicKeyId)
d.Set("fingerprint", createResp.SSHPublicKey.Fingerprint)
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 really only be calling d.Set() during Read functions. Can you remove this here and move the ssh_public_key_id one above to resourceAwsIamUserSshKeyRead? Thanks!

Copy link
Author

Choose a reason for hiding this comment

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

@bflad so, ssh_public_key_id set should be also removed?

aws/resource_aws_iam_user_ssh_key.go Outdated
@@ -119,7 +120,7 @@ func resourceAwsIamUserSshKeyUpdate(d *schema.ResourceData, meta interface{}) er
}
return fmt.Errorf("Error updating IAM User SSH Key %s: %s", d.Id(), err)
}
return resourceAwsIamUserRead(d, meta)
return resourceAwsIamUserSshKeyRead(d, meta)
Copy link
Contributor

Choose a reason for hiding this comment

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

😬 yikes, good catch. Instead of having this only called during d.HasChange("status"), can you remove this line here and replace the return nil right below this with return resourceAwsIamUserSshKeyRead(d, meta)? Thanks!

@ghost ghost added the size/S Managed by automation to categorize the size of a PR. label Feb 15, 2018
@bflad
Copy link
Contributor

bflad commented Feb 15, 2018

The code changes look good, but the testing change does not work across both tests, can you fix this please?

make testacc TEST=./aws TESTARGS='-run=TestAccAWSUserSSHKey'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSUserSSHKey -timeout 120m
=== RUN   TestAccAWSUserSSHKey_basic
--- PASS: TestAccAWSUserSSHKey_basic (8.99s)
=== RUN   TestAccAWSUserSSHKey_pemEncoding
--- FAIL: TestAccAWSUserSSHKey_pemEncoding (4.54s)
	testing.go:513: Step 0 error: Check failed: Check 1/1 error: Key status has wrong status should be Inactive is Active
FAIL
exit status 1
FAIL	github.com/terraform-providers/terraform-provider-aws/aws	13.577s

@bflad bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Feb 15, 2018
@ghost ghost added the size/S Managed by automation to categorize the size of a PR. label Feb 15, 2018
@pawelsocha
Copy link
Author

pawelsocha commented Feb 15, 2018 •
edited
Loading

@bflad of course, my bad :-|

My test results:

TF_ACC=1 go test ./... -v -run=TestAccAWSUserSSHKey -timeout 120m
?   	github.com/terraform-providers/terraform-provider-aws	[no test files]
=== RUN   TestAccAWSUserSSHKey_basic
--- PASS: TestAccAWSUserSSHKey_basic (25.50s)
=== RUN   TestAccAWSUserSSHKey_pemEncoding
--- PASS: TestAccAWSUserSSHKey_pemEncoding (24.74s)
PASS

@bflad bflad added bug Addresses a defect in current functionality. service/iam Issues and PRs that pertain to the iam service. and removed waiting-response Maintainers are waiting on response from community or contributor. labels Feb 15, 2018
bflad
bflad approved these changes Feb 15, 2018
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.

LGTM, thanks! 🚀

make testacc TEST=./aws TESTARGS='-run=TestAccAWSUserSSHKey'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSUserSSHKey -timeout 120m
=== RUN   TestAccAWSUserSSHKey_basic
--- PASS: TestAccAWSUserSSHKey_basic (9.37s)
=== RUN   TestAccAWSUserSSHKey_pemEncoding
--- PASS: TestAccAWSUserSSHKey_pemEncoding (7.40s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	16.822s

@bflad bflad added this to the v1.10.0 milestone Feb 15, 2018
@bflad bflad merged commit 86febf8 into hashicorp:master Feb 15, 2018
bflad added a commit that referenced this pull request Feb 15, 2018
@bflad
Update CHANGELOG for #3390
085b946
@pawelsocha pawelsocha deleted the aws_iam_user_ssh_key-fix-update branch February 15, 2018 17:36
@bflad
Copy link
Contributor

bflad commented Feb 27, 2018

This has been released in version 1.10.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 7, 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 7, 2020
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/iam Issues and PRs that pertain to the iam service. size/S Managed by automation to categorize the size of a PR.
Projects
None yet
Milestone
v1.10.0
Development

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