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

service/elasticache: Support longer Cluster and Replication Group identifiers #9941

Merged
merged 3 commits into from
Sep 6, 2019

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Aug 30, 2019

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request

Closes #9906
Closes #9131
Closes #7409
Closes #5381

Release note for CHANGELOG:

* resource/aws_elasticache_cluster: Support `cluster_id` validation up to 50 characters
* resource/aws_elasticache_replication_group: Support `replication_group_id` validation up to 40 characters

To match the new service limits.

This also switches some of the hardcoded us-west-2 testing to use the aws_availability_zones data source so the testing is more region agnostic. Now its at least possible to run parallel testing locally in us-east-1 of an EC2-Classic enabled AWS account.

The aws_dax_cluster refactoring is just to remove the now defunct validation function naming in support of #8424.

Output from acceptance testing:

--- PASS: TestAccAWSElasticacheCluster_AZMode_Memcached_Ec2Classic (515.21s)
--- PASS: TestAccAWSElasticacheCluster_AZMode_Redis_Ec2Classic (507.64s)
--- PASS: TestAccAWSElasticacheCluster_Engine_Memcached_Ec2Classic (663.59s)
--- PASS: TestAccAWSElasticacheCluster_Engine_Redis_Ec2Classic (595.65s)
--- PASS: TestAccAWSElasticacheCluster_EngineVersion_Memcached_Ec2Classic (1260.72s)
--- PASS: TestAccAWSElasticacheCluster_EngineVersion_Redis_Ec2Classic (1303.63s)
--- PASS: TestAccAWSElasticacheCluster_multiAZInVpc (737.16s)
--- PASS: TestAccAWSElasticacheCluster_NodeTypeResize_Memcached_Ec2Classic (954.44s)
--- PASS: TestAccAWSElasticacheCluster_NodeTypeResize_Redis_Ec2Classic (1022.11s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_Decrease (995.54s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_Increase (1038.00s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_IncreaseWithPreferredAvailabilityZones (958.56s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_Redis_Ec2Classic (6.63s)
--- PASS: TestAccAWSElasticacheCluster_ParameterGroupName_Default (596.16s)
--- PASS: TestAccAWSElasticacheCluster_Port_Ec2Classic (576.63s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_AvailabilityZone_Ec2Classic (1214.33s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_InvalidAttributes (8.37s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_MultipleReplica_Ec2Classic (1884.91s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_SingleReplica_Ec2Classic (1746.94s)
--- PASS: TestAccAWSElasticacheCluster_SecurityGroup (626.97s)
--- PASS: TestAccAWSElasticacheCluster_snapshotsWithUpdates (1167.22s)
--- PASS: TestAccAWSElasticacheCluster_vpc (646.18s)
--- PASS: TestAccAWSElasticacheReplicationGroup_basic (1857.56s)
--- PASS: TestAccAWSElasticacheReplicationGroup_clusteringAndCacheNodesCausesError (10.99s)
--- PASS: TestAccAWSElasticacheReplicationGroup_ClusterMode_Basic (1875.48s)
--- PASS: TestAccAWSElasticacheReplicationGroup_ClusterMode_NumNodeGroups (3713.74s)
--- PASS: TestAccAWSElasticacheReplicationGroup_enableAtRestEncryption (1419.18s)
--- PASS: TestAccAWSElasticacheReplicationGroup_enableAuthTokenTransitEncryption (734.55s)
--- PASS: TestAccAWSElasticacheReplicationGroup_enableSnapshotting (1917.01s)
--- PASS: TestAccAWSElasticacheReplicationGroup_importBasic (806.91s)
--- PASS: TestAccAWSElasticacheReplicationGroup_multiAzInVpc (950.44s)
--- PASS: TestAccAWSElasticacheReplicationGroup_NumberCacheClusters (2821.85s)
--- PASS: TestAccAWSElasticacheReplicationGroup_NumberCacheClusters_Failover_AutoFailoverDisabled (2029.86s)
--- PASS: TestAccAWSElasticacheReplicationGroup_NumberCacheClusters_Failover_AutoFailoverEnabled (1919.87s)
--- PASS: TestAccAWSElasticacheReplicationGroup_redisClusterInVpc2 (737.16s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateDescription (1240.24s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateMaintenanceWindow (1047.59s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateNodeSize (1985.53s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateParameterGroup (900.33s)
--- PASS: TestAccAWSElasticacheReplicationGroup_Uppercase (594.69s)
--- PASS: TestAccAWSElasticacheReplicationGroup_vpc (1355.75s)

--- PASS: TestAccAWSDAXCluster_encryption_disabled (739.98s)
--- PASS: TestAccAWSDAXCluster_basic (756.03s)
--- PASS: TestAccAWSDAXCluster_importBasic (796.86s)
--- PASS: TestAccAWSDAXCluster_encryption_enabled (865.80s)
--- PASS: TestAccAWSDAXCluster_resize (1414.26s)

…ntifiers

This also switches some of the hardcoded us-west-2 testing to use the aws_availability_zones data source so the testing is more region agnostic. Now its at least possible to run parallel testing locally in us-east-1 of an EC2-Classic enabled AWS account.

References:

- #9906
- #9131
- #7409
- #5381

Output from acceptance testing:

```
--- PASS: TestAccAWSElasticacheCluster_AZMode_Memcached_Ec2Classic (515.21s)
--- PASS: TestAccAWSElasticacheCluster_AZMode_Redis_Ec2Classic (507.64s)
--- PASS: TestAccAWSElasticacheCluster_Engine_Memcached_Ec2Classic (663.59s)
--- PASS: TestAccAWSElasticacheCluster_Engine_Redis_Ec2Classic (595.65s)
--- PASS: TestAccAWSElasticacheCluster_EngineVersion_Memcached_Ec2Classic (1260.72s)
--- PASS: TestAccAWSElasticacheCluster_EngineVersion_Redis_Ec2Classic (1303.63s)
--- PASS: TestAccAWSElasticacheCluster_multiAZInVpc (737.16s)
--- PASS: TestAccAWSElasticacheCluster_NodeTypeResize_Memcached_Ec2Classic (954.44s)
--- PASS: TestAccAWSElasticacheCluster_NodeTypeResize_Redis_Ec2Classic (1022.11s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_Decrease (995.54s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_Increase (1038.00s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_IncreaseWithPreferredAvailabilityZones (958.56s)
--- PASS: TestAccAWSElasticacheCluster_NumCacheNodes_Redis_Ec2Classic (6.63s)
--- PASS: TestAccAWSElasticacheCluster_ParameterGroupName_Default (596.16s)
--- PASS: TestAccAWSElasticacheCluster_Port_Ec2Classic (576.63s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_AvailabilityZone_Ec2Classic (1214.33s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_InvalidAttributes (8.37s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_MultipleReplica_Ec2Classic (1884.91s)
--- PASS: TestAccAWSElasticacheCluster_ReplicationGroupID_SingleReplica_Ec2Classic (1746.94s)
--- PASS: TestAccAWSElasticacheCluster_SecurityGroup (626.97s)
--- PASS: TestAccAWSElasticacheCluster_snapshotsWithUpdates (1167.22s)
--- PASS: TestAccAWSElasticacheCluster_vpc (646.18s)
--- PASS: TestAccAWSElasticacheReplicationGroup_basic (1857.56s)
--- PASS: TestAccAWSElasticacheReplicationGroup_clusteringAndCacheNodesCausesError (10.99s)
--- PASS: TestAccAWSElasticacheReplicationGroup_ClusterMode_Basic (1875.48s)
--- PASS: TestAccAWSElasticacheReplicationGroup_ClusterMode_NumNodeGroups (3713.74s)
--- PASS: TestAccAWSElasticacheReplicationGroup_enableAtRestEncryption (1419.18s)
--- PASS: TestAccAWSElasticacheReplicationGroup_enableAuthTokenTransitEncryption (734.55s)
--- PASS: TestAccAWSElasticacheReplicationGroup_enableSnapshotting (1917.01s)
--- PASS: TestAccAWSElasticacheReplicationGroup_importBasic (806.91s)
--- PASS: TestAccAWSElasticacheReplicationGroup_multiAzInVpc (950.44s)
--- PASS: TestAccAWSElasticacheReplicationGroup_NumberCacheClusters (2821.85s)
--- PASS: TestAccAWSElasticacheReplicationGroup_NumberCacheClusters_Failover_AutoFailoverDisabled (2029.86s)
--- PASS: TestAccAWSElasticacheReplicationGroup_NumberCacheClusters_Failover_AutoFailoverEnabled (1919.87s)
--- PASS: TestAccAWSElasticacheReplicationGroup_redisClusterInVpc2 (737.16s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateDescription (1240.24s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateMaintenanceWindow (1047.59s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateNodeSize (1985.53s)
--- PASS: TestAccAWSElasticacheReplicationGroup_updateParameterGroup (900.33s)
--- PASS: TestAccAWSElasticacheReplicationGroup_Uppercase (594.69s)
--- PASS: TestAccAWSElasticacheReplicationGroup_vpc (1355.75s)
```
…sterId into inline ValidateFunc

Reference: #8424

Output from acceptance testing:

```
--- PASS: TestAccAWSDAXCluster_encryption_disabled (739.98s)
--- PASS: TestAccAWSDAXCluster_basic (756.03s)
--- PASS: TestAccAWSDAXCluster_importBasic (796.86s)
--- PASS: TestAccAWSDAXCluster_encryption_enabled (865.80s)
--- PASS: TestAccAWSDAXCluster_resize (1414.26s)
```
@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. service/elasticache Issues and PRs that pertain to the elasticache service. labels Aug 30, 2019
@bflad bflad requested a review from a team August 30, 2019 21:20
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. service/dax Issues and PRs that pertain to the dax service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Aug 30, 2019
Copy link
Contributor

@nywilken nywilken left a comment

Choose a reason for hiding this comment

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

LGTM 👍 👍

@nywilken nywilken added this to the v2.28.0 milestone Sep 6, 2019
@bflad bflad merged commit 44e089f into master Sep 6, 2019
@bflad bflad deleted the f-elasticache-length-updates branch September 6, 2019 17:03
bflad added a commit that referenced this pull request Sep 6, 2019
@ghost
Copy link

ghost commented Sep 12, 2019

This has been released in version 2.28.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!

@ghost
Copy link

ghost commented Nov 1, 2019

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 Nov 1, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/dax Issues and PRs that pertain to the dax service. service/elasticache Issues and PRs that pertain to the elasticache service. size/XL 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
2 participants