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

CloudHSM v2 resource & datasource #4125

Merged
merged 8 commits into from
Oct 18, 2018
Merged

CloudHSM v2 resource & datasource #4125

merged 8 commits into from
Oct 18, 2018

Conversation

greg-gajda
Copy link
Contributor

No description provided.

@ghost ghost added the size/XXL Managed by automation to categorize the size of a PR. label Apr 9, 2018
@greg-gajda
Copy link
Contributor Author

CloudHSM vendor is required for this one to work.
It is separate PR, as you suggested in contribution docs.

@bflad bflad added new-resource Introduces a new resource. new-data-source Introduces a new data source. service/cloudhsmv2 Issues and PRs that pertain to the cloudhsmv2 service. labels Apr 9, 2018
@ghost ghost added the size/XXL Managed by automation to categorize the size of a PR. label Apr 9, 2018
@netflash
Copy link

netflash commented Apr 9, 2018

#3434

@ghost ghost added the dependencies Used to indicate dependency changes. label Apr 10, 2018
@greg-gajda
Copy link
Contributor Author

I merged it with CloudHSMv2_vendor branch, as PR for that one was accepted

@bflad
Copy link
Contributor

bflad commented Apr 11, 2018

This is good to rebase now -- thanks! 👍

@bflad
Copy link
Contributor

bflad commented Apr 20, 2018

@greg-gajda can you please rebase this?

@bflad bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Apr 20, 2018
@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. dependencies Used to indicate dependency changes. labels Apr 23, 2018
@greg-gajda
Copy link
Contributor Author

It is rebased now

@bflad
Copy link
Contributor

bflad commented Apr 23, 2018 •
edited
Loading

Did you push it up? Still seeing vendor changes 😄

For reference, master has v1.13.32 of cloudhsmv2:

https://github.com/terraform-providers/terraform-provider-aws/blob/a28d44b774cb857974a16cd886beef1f1a73e8a9/vendor/vendor.json#L385-L392

@greg-gajda
Copy link
Contributor Author

Previously I merged it with vendor branch (separate PR, already merged) to pass internal checks.
Do you want me to remove vendor files?
It's exactly the same what's on master, so shouldn't have any negative impact.

@bflad
Copy link
Contributor

bflad commented Apr 23, 2018

I presume its just Github not refreshing then. I'd run this and we can see how it looks:

git rebase origin/master
git push -f

master has v1.13.32 of the SDK vendoring and the Github UI is showing this branch as adding v1.13.28.

https://github.com/terraform-providers/terraform-provider-aws/blob/a28d44b774cb857974a16cd886beef1f1a73e8a9/vendor/vendor.json#L385-L392

@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. dependencies Used to indicate dependency changes. labels Apr 24, 2018
@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. and removed dependencies Used to indicate dependency changes. labels Apr 24, 2018
@greg-gajda
Copy link
Contributor Author

My mistake.
I forgot to fetch upstream before rebase.

@bflad bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Apr 24, 2018
@ghost ghost added documentation Introduces or discusses updates to documentation. service/cloudhsm labels Oct 17, 2018
@bflad bflad removed service/apigateway Issues and PRs that pertain to the apigateway service. service/cloudformation Issues and PRs that pertain to the cloudformation service. service/cloudfront Issues and PRs that pertain to the cloudfront service. service/cloudhsm service/ec2 Issues and PRs that pertain to the ec2 service. service/elasticache Issues and PRs that pertain to the elasticache service. service/emr Issues and PRs that pertain to the emr service. service/firehose Issues and PRs that pertain to the firehose service. service/gamelift Issues and PRs that pertain to the gamelift service. service/opsworks Issues and PRs that pertain to the opsworks service. service/rds Issues and PRs that pertain to the rds service. labels Oct 17, 2018
@ghost ghost added the service/cloudhsm label Oct 18, 2018
@greg-gajda greg-gajda force-pushed the CloudHSMv2 branch 2 times, most recently from 4f6b773 to 04d236d Compare October 18, 2018 10:58
@greg-gajda
Copy link
Contributor Author

greg-gajda commented Oct 18, 2018 •
edited
Loading

I had some problems with formatting, caused by older version of go.
Unfortunately I didn't pay enough attention to it and accidentally push wrongly formatted code, so this branch was labelled incorrectly.
Nonetheless I hope to address all of the requested improvements, like changing 'cluster_certificates' data type for TypeList, adding tests for imports, etc. @bflad

@bflad
Copy link
Contributor

bflad commented Oct 18, 2018 •
edited
Loading

@greg-gajda if you upgrade to Go 1.11 it should work better. 😄 There was a change in go fmt between 1.10 and 1.11 with struct whitespace alignment.

Edit: Looks like you figured it out 🎉 I'll take a look at the changes now!

@bflad bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Oct 18, 2018
bflad
bflad approved these changes Oct 18, 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 so much @greg-gajda for your work here! Looks good to me and I think we'll let this release today with the one note below about aws_cloudhsm_v2_cluster tags -- please let us know if you have time to fix that up or not at some point in the near future. Thanks again! 🚀

--- PASS: TestAccDataSourceCloudHsm2Cluster_basic (300.54s)
--- PASS: TestAccAWSCloudHsm2Cluster_basic (259.05s)
--- PASS: TestAccAWSCloudHsm2Hsm_basic (1103.11s)

aws/resource_aws_cloudhsm2_cluster.go
return resourceAwsCloudHsm2ClusterRead(d, meta)
}

func resourceAwsCloudHsm2ClusterRead(d *schema.ResourceData, meta interface{}) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

To properly detect tags configuration drift, this should include a call to ListTags 😄

https://docs.aws.amazon.com/sdk-for-go/api/service/cloudhsmv2/#CloudHSMV2.ListTags

Generally any additions to ImportStateVerifyIgnore is a good hint about when additional Read functionality needs to be implemented.

@bflad bflad added this to the v1.41.0 milestone Oct 18, 2018
@bflad bflad merged commit c18b4ef into hashicorp:master Oct 18, 2018
bflad added a commit that referenced this pull request Oct 18, 2018
@bflad
Update CHANGELOG for #4125
766b8ee
@bflad
Copy link
Contributor

bflad commented Oct 18, 2018

This has been released in version 1.41.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 2, 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 2, 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
documentation Introduces or discusses updates to documentation. new-data-source Introduces a new data source. new-resource Introduces a new resource. service/cloudhsmv2 Issues and PRs that pertain to the cloudhsmv2 service. size/XXL 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
Milestone
v1.41.0
Development

Successfully merging this pull request may close these issues.
9 participants
@greg-gajda @netflash @bflad @brandonstevens @mattburgess @emmanuel @ccovarru @GolubevV @ericmmears