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

provider/aws: Add support for encryption and kms_key_id to aws_ami #7181

Merged
merged 1 commit into from
Jul 5, 2016

Conversation

stack72
Copy link
Contributor

@stack72 stack72 commented Jun 15, 2016

This fixes #7157. It doesn't change the way aws_ami works

make testacc TEST=./builtin/providers/aws
TESTARGS='-run=TestAccAWSAMICopy'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSAMICopy
-timeout 120m
=== RUN   TestAccAWSAMICopy
--- PASS: TestAccAWSAMICopy (479.75s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    479.769s

@@ -506,6 +506,20 @@ func resourceAwsAmiCommonSchema(computed bool) map[string]*schema.Schema {
},
},

"encrypted": &schema.Schema{
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't feel like these should be added to resourceAwsAmiCommonSchema, since they only apply to the aws_ami_copy resource. Can we add them where we add source_ami_region and source_ami_id, instead?

@stack72
Copy link
Contributor Author

stack72 commented Jun 17, 2016

@catsby you are indeed correct on both counts :) Added as requested - test are just going through atm

This fixes #7157. It doesn't change the way aws_ami works

```
make testacc TEST=./builtin/providers/aws
TESTARGS='-run=TestAccAWSAMICopy'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSAMICopy
-timeout 120m
=== RUN   TestAccAWSAMICopy
--- PASS: TestAccAWSAMICopy (479.75s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    479.769s
```
@stack72 stack72 force-pushed the ami_copy_encrypted branch from 63674f2 to 2ab9813 Compare June 17, 2016 11:05
@catsby catsby merged commit 58c3246 into master Jul 5, 2016
@catsby catsby deleted the ami_copy_encrypted branch July 5, 2016 14:50
@ghost
Copy link

ghost commented Apr 24, 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 have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked and limited conversation to collaborators Apr 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add encryption to aws_ami_copy
2 participants