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

Add elasticache ip discovery #27856

Merged
merged 17 commits into from
Nov 23, 2022
Merged

Add elasticache ip discovery #27856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b0c7dec
Adding ip_discovery for elasticache
jms200 Nov 16, 2022
5d11caf
Adding tests
jms200 Nov 17, 2022
d0036bd
Syntax in documentation.
jms200 Nov 17, 2022
d93a41d
updating changelog
jms200 Nov 17, 2022
b839d9b
Merge branch 'main' into HEAD
ewbankkit Nov 22, 2022
f8472a0
Fix terrafmt error.
ewbankkit Nov 22, 2022
ba22683
Fix semgrep 'ci.caps5-in-func-name'.
ewbankkit Nov 22, 2022
6979dce
r/aws_elasticache_cluster: Alphabetize attributes.
ewbankkit Nov 22, 2022
595da70
d/aws_elasticache_cluster: Alphabetize attributes.
ewbankkit Nov 22, 2022
918e348
r/aws_elasticache_cluster: Use '_Values()' for enumeration validation…
ewbankkit Nov 22, 2022
d5212d9
d/aws_elasticache_cluster: Add 'ip_discovery' attribute.
ewbankkit Nov 22, 2022
ba2eb33
Tweak CHANGELOG entry.
ewbankkit Nov 22, 2022
46f42bb
r/aws_elasticache_cluster: Tidy up acceptance test configurations.
ewbankkit Nov 22, 2022
d9a346f
d/aws_elasticache_cluster: Don't forget to set 'ip_discovery'.
ewbankkit Nov 23, 2022
4c64087
TestAccElastiCacheCluster_ipDiscovery: Need IPv6-enabled VPC for test…
ewbankkit Nov 23, 2022
685302d
TestAccElastiCacheCluster_Engine_redis: Default Redis version is now …
ewbankkit Nov 23, 2022
e2e946b
r/aws_elasticache_cluster: Add 'network_type' argument.
ewbankkit Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/27856.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_elasticache_cluster: Add `ip_discovery` and `network_type` arguments in support of [IPv6 clusters](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/network-type.html)
```

```release-note:enhancement
data-source/aws_elasticache_cluster: Add `ip_discovery` and `network_type` attributes
```
100 changes: 62 additions & 38 deletions internal/service/elasticache/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,33 +67,30 @@ func ResourceCluster() *schema.Resource {
ForceNew: true,
},
"az_mode": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
elasticache.AZModeCrossAz,
elasticache.AZModeSingleAz,
}, false),
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice(elasticache.AZMode_Values(), false),
},
"cache_nodes": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"id": {
"address": {
Type: schema.TypeString,
Computed: true,
},
"address": {
"availability_zone": {
Type: schema.TypeString,
Computed: true,
},
"port": {
Type: schema.TypeInt,
"id": {
Type: schema.TypeString,
Computed: true,
},
"availability_zone": {
Type: schema.TypeString,
"port": {
Type: schema.TypeInt,
Computed: true,
},
},
Expand Down Expand Up @@ -129,8 +126,8 @@ func ResourceCluster() *schema.Resource {
Type: schema.TypeString,
Optional: true,
Computed: true,
ExactlyOneOf: []string{"engine", "replication_group_id"},
ForceNew: true,
ExactlyOneOf: []string{"engine", "replication_group_id"},
ValidateFunc: validation.StringInSlice(engine_Values(), false),
},
"engine_version": {
Expand All @@ -142,21 +139,31 @@ func ResourceCluster() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"final_snapshot_identifier": {
Type: schema.TypeString,
Optional: true,
},
"ip_discovery": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice(elasticache.IpDiscovery_Values(), false),
},
"log_delivery_configuration": {
Type: schema.TypeSet,
Optional: true,
MaxItems: 2,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"destination": {
Type: schema.TypeString,
Required: true,
},
"destination_type": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(elasticache.DestinationType_Values(), false),
},
"destination": {
Type: schema.TypeString,
Required: true,
},
"log_format": {
Type: schema.TypeString,
Required: true,
Expand All @@ -181,6 +188,13 @@ func ResourceCluster() *schema.Resource {
},
ValidateFunc: verify.ValidOnceAWeekWindowFormat,
},
"network_type": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice(elasticache.NetworkType_Values(), false),
},
"node_type": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -222,8 +236,8 @@ func ResourceCluster() *schema.Resource {
Type: schema.TypeString,
Optional: true,
Computed: true,
ExactlyOneOf: []string{"replication_group_id", "engine"},
ForceNew: true,
ExactlyOneOf: []string{"replication_group_id", "engine"},
ValidateFunc: validateReplicationGroupID,
ConflictsWith: []string{
"az_mode",
Expand All @@ -243,27 +257,25 @@ func ResourceCluster() *schema.Resource {
"subnet_group_name",
},
},
"security_group_ids": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"security_group_names": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
Deprecated: `With the retirement of EC2-Classic the security_group_names attribute has been deprecated and will be removed in a future version.`,
},
"security_group_ids": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
"snapshot_arns": {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
ForceNew: true,
MaxItems: 1,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validation.All(
Expand All @@ -272,6 +284,11 @@ func ResourceCluster() *schema.Resource {
),
},
},
"snapshot_name": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"snapshot_retention_limit": {
Type: schema.TypeInt,
Optional: true,
Expand All @@ -283,21 +300,12 @@ func ResourceCluster() *schema.Resource {
Computed: true,
ValidateFunc: verify.ValidOnceADayWindowFormat,
},
"snapshot_name": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"subnet_group_name": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
},
"final_snapshot_identifier": {
Type: schema.TypeString,
Optional: true,
},
"tags": tftags.TagsSchema(),
"tags_all": tftags.TagsSchemaComputed(),
},
Expand Down Expand Up @@ -422,6 +430,14 @@ func resourceClusterCreate(d *schema.ResourceData, meta interface{}) error {
req.PreferredAvailabilityZones = flex.ExpandStringList(v.([]interface{}))
}

if v, ok := d.GetOk("ip_discovery"); ok {
req.IpDiscovery = aws.String(v.(string))
}

if v, ok := d.GetOk("network_type"); ok {
req.NetworkType = aws.String(v.(string))
}

id, arn, err := createCacheCluster(conn, req)
if err != nil {
return fmt.Errorf("error creating ElastiCache Cache Cluster: %w", err)
Expand Down Expand Up @@ -508,6 +524,9 @@ func resourceClusterRead(d *schema.ResourceData, meta interface{}) error {

d.Set("arn", c.ARN)

d.Set("ip_discovery", c.IpDiscovery)
d.Set("network_type", c.NetworkType)

tags, err := ListTags(conn, aws.StringValue(c.ARN))

if err != nil && !verify.ErrorISOUnsupported(conn.PartitionID, err) {
Expand Down Expand Up @@ -585,6 +604,11 @@ func resourceClusterUpdate(d *schema.ResourceData, meta interface{}) error {
requestUpdate = true
}

if d.HasChange("ip_discovery") {
req.IpDiscovery = aws.String(d.Get("ip_discovery").(string))
requestUpdate = true
}

if d.HasChange("log_delivery_configuration") {
oldLogDeliveryConfig, newLogDeliveryConfig := d.GetChange("log_delivery_configuration")

Expand Down
Loading