Fix for ebs_block_devices disappearing in data source, and fix instan… #10045
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
size/XL
bflad
added a commit
to hashicorp/terraform-plugin-sdk
that referenced
this pull request
Oct 8, 2019
… block contains only Computed attributes Reference: hashicorp/terraform-provider-aws#7198 Reference: hashicorp/terraform-provider-aws#10045 Reference: hashicorp/terraform-provider-aws#10339 Reference: hashicorp/terraform#22719 When a resource schema contains the following: ```go "config_block_attribute": { Type: schema.TypeSet, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "attribute1": { Type: schema.TypeBool, Computed: true, }, "attribute2": { Type: schema.TypeString, Computed: true, }, }, }, }, ``` The TypeSet hash values were previously all collapsed to the zero-value, which meant that multiple set entries were lost. Here we check that all of the attributes are not just `Computed: true`. If they are all `Computed: true` attributes, ignore the check for user-defined attributes to compute the hash value.
aeschright
reviewed
Oct 8, 2019
aws/data_source_aws_instance_test.go
Outdated
| @@ -841,7 +885,7 @@ data "aws_ami" "amzn-ami-minimal-hvm-ebs" { | |||
|
|
|||
| resource "aws_vpc" "test" { | |||
| cidr_block = "172.16.0.0/16" | |||
|
|
|||
There was a problem hiding this comment.
Looks like some whitespace got added here and below on 897, 941, 950
aeschright
approved these changes
Oct 8, 2019
There was a problem hiding this comment.
Just need to rebase
--- PASS: TestAccAWSInstanceDataSource_creditSpecification (83.47s)
--- PASS: TestAccAWSInstanceDataSource_GetUserData (109.88s)
--- PASS: TestAccAWSInstanceDataSource_GetUserData_NoUserData (108.75s)
--- PASS: TestAccAWSInstanceDataSource_SecurityGroups (126.30s)
--- PASS: TestAccAWSInstanceDataSource_PlacementGroup (73.58s)
--- PASS: TestAccAWSInstanceDataSource_VPC (112.64s)
--- PASS: TestAccAWSInstanceDataSource_VPCSecurityGroups (84.25s)
--- PASS: TestAccAWSInstanceDataSource_rootInstanceStore (88.44s)
--- PASS: TestAccAWSInstanceDataSource_RootBlockDevice_KmsKeyId (98.38s)
--- PASS: TestAccAWSInstanceDataSource_EbsBlockDevice_KmsKeyId (88.85s)
--- PASS: TestAccAWSInstanceDataSource_basic (127.80s)
--- PASS: TestAccAWSInstanceDataSource_tags (127.90s)
--- PASS: TestAccAWSInstanceDataSource_AzUserData (128.13s)
--- PASS: TestAccAWSInstanceDataSource_getPasswordData_trueToFalse (161.39s)
--- PASS: TestAccAWSInstanceDataSource_gp2IopsDevice (67.84s)
--- PASS: TestAccAWSInstanceDataSource_getPasswordData_falseToTrue (181.95s)
--- PASS: TestAccAWSInstanceDataSource_blockDevices (68.17s)
--- PASS: TestAccAWSInstanceDataSource_privateIP (196.68s)
--- PASS: TestAccAWSInstanceDataSource_keyPair (91.83s)
ryndaniels
force-pushed
the
rfd-instance-ebs-block-device
branch
from
ec64659 to
869f103
Compare
…ce data source tests
ryndaniels
force-pushed
the
rfd-instance-ebs-block-device
branch
from
869f103 to
89eca59
Compare
|
This has been released in version 2.39.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks! |
appilon
pushed a commit
to hashicorp/terraform-plugin-sdk
that referenced
this pull request
Feb 13, 2020
… block contains only Computed attributes Reference: hashicorp/terraform-provider-aws#7198 Reference: hashicorp/terraform-provider-aws#10045 Reference: hashicorp/terraform-provider-aws#10339 Reference: hashicorp/terraform#22719 When a resource schema contains the following: ```go "config_block_attribute": { Type: schema.TypeSet, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "attribute1": { Type: schema.TypeBool, Computed: true, }, "attribute2": { Type: schema.TypeString, Computed: true, }, }, }, }, ``` The TypeSet hash values were previously all collapsed to the zero-value, which meant that multiple set entries were lost. Here we check that all of the attributes are not just `Computed: true`. If they are all `Computed: true` attributes, ignore the check for user-defined attributes to compute the hash value.
appilon
pushed a commit
to hashicorp/terraform-plugin-sdk
that referenced
this pull request
Feb 13, 2020
… block contains only Computed attributes Reference: hashicorp/terraform-provider-aws#7198 Reference: hashicorp/terraform-provider-aws#10045 Reference: hashicorp/terraform-provider-aws#10339 Reference: hashicorp/terraform#22719 When a resource schema contains the following: ```go "config_block_attribute": { Type: schema.TypeSet, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "attribute1": { Type: schema.TypeBool, Computed: true, }, "attribute2": { Type: schema.TypeString, Computed: true, }, }, }, }, ``` The TypeSet hash values were previously all collapsed to the zero-value, which meant that multiple set entries were lost. Here we check that all of the attributes are not just `Computed: true`. If they are all `Computed: true` attributes, ignore the check for user-defined attributes to compute the hash value.
appilon
pushed a commit
to hashicorp/terraform-plugin-sdk
that referenced
this pull request
Feb 20, 2020
… block contains only Computed attributes Reference: hashicorp/terraform-provider-aws#7198 Reference: hashicorp/terraform-provider-aws#10045 Reference: hashicorp/terraform-provider-aws#10339 Reference: hashicorp/terraform#22719 When a resource schema contains the following: ```go "config_block_attribute": { Type: schema.TypeSet, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "attribute1": { Type: schema.TypeBool, Computed: true, }, "attribute2": { Type: schema.TypeString, Computed: true, }, }, }, }, ``` The TypeSet hash values were previously all collapsed to the zero-value, which meant that multiple set entries were lost. Here we check that all of the attributes are not just `Computed: true`. If they are all `Computed: true` attributes, ignore the check for user-defined attributes to compute the hash value.
appilon
pushed a commit
to hashicorp/terraform-plugin-sdk
that referenced
this pull request
Mar 4, 2020
… block contains only Computed attributes Reference: hashicorp/terraform-provider-aws#7198 Reference: hashicorp/terraform-provider-aws#10045 Reference: hashicorp/terraform-provider-aws#10339 Reference: hashicorp/terraform#22719 When a resource schema contains the following: ```go "config_block_attribute": { Type: schema.TypeSet, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "attribute1": { Type: schema.TypeBool, Computed: true, }, "attribute2": { Type: schema.TypeString, Computed: true, }, }, }, }, ``` The TypeSet hash values were previously all collapsed to the zero-value, which meant that multiple set entries were lost. Here we check that all of the attributes are not just `Computed: true`. If they are all `Computed: true` attributes, ignore the check for user-defined attributes to compute the hash value.
appilon
pushed a commit
to hashicorp/terraform-plugin-sdk
that referenced
this pull request
Mar 11, 2020
… block contains only Computed attributes Reference: hashicorp/terraform-provider-aws#7198 Reference: hashicorp/terraform-provider-aws#10045 Reference: hashicorp/terraform-provider-aws#10339 Reference: hashicorp/terraform#22719 When a resource schema contains the following: ```go "config_block_attribute": { Type: schema.TypeSet, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "attribute1": { Type: schema.TypeBool, Computed: true, }, "attribute2": { Type: schema.TypeString, Computed: true, }, }, }, }, ``` The TypeSet hash values were previously all collapsed to the zero-value, which meant that multiple set entries were lost. Here we check that all of the attributes are not just `Computed: true`. If they are all `Computed: true` attributes, ignore the check for user-defined attributes to compute the hash value.
|
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
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…ce data source tests
Note that this is in addition to the upstream fix.
Community Note
Closes #7198
Release note for CHANGELOG:
Output from acceptance testing: