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 support for target failover, flow stickiness for GWLB target group #27334

Merged
merged 10 commits into from
Nov 2, 2022
Merged

Add support for target failover, flow stickiness for GWLB target group #27334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f53f3d4
Add attributes to schema & resource create
ddericco Oct 19, 2022
c29ecdc
Add acceptance tests for target failover attr
ddericco Oct 19, 2022
582e03e
Add acceptance tests for GWLB flow stickiness
ddericco Oct 19, 2022
754a035
Add changelog
ddericco Oct 19, 2022
3d4a2cf
Update docs
ddericco Oct 19, 2022
4f2b612
Fix linting issues
ddericco Oct 19, 2022
430f0ff
Additional linting fixes
ddericco Oct 19, 2022
b7e1d2a
Apply suggestions from code review
ddericco Oct 27, 2022
0250b1f
Additional updates from code review
ddericco Oct 27, 2022
b2f3775
Merge branch 'main' into HEAD
ewbankkit Nov 2, 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
3 changes: 3 additions & 0 deletions .changelog/27334.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_lb_target_group: Add support for `target_failover` and `stickiness` attributes for GENEVE protocol target groups
```
243 changes: 165 additions & 78 deletions internal/service/elbv2/target_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func ResourceTargetGroup() *schema.Resource {
ValidateFunc: validation.IntBetween(0, 604800),
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
switch d.Get("protocol").(string) {
case elbv2.ProtocolEnumTcp, elbv2.ProtocolEnumUdp, elbv2.ProtocolEnumTcpUdp, elbv2.ProtocolEnumTls:
case elbv2.ProtocolEnumTcp, elbv2.ProtocolEnumUdp, elbv2.ProtocolEnumTcpUdp, elbv2.ProtocolEnumTls, elbv2.ProtocolEnumGeneve:
return true
}
return false
Expand All @@ -248,9 +248,11 @@ func ResourceTargetGroup() *schema.Resource {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
"lb_cookie", // Only for ALBs
"app_cookie", // Only for ALBs
"source_ip", // Only for NLBs
"lb_cookie", // Only for ALBs
"app_cookie", // Only for ALBs
"source_ip", // Only for NLBs
"source_ip_dest_ip", // Only for GWLBs
"source_ip_dest_ip_proto", // Only for GWLBs
}, false),
},
},
Expand All @@ -263,6 +265,31 @@ func ResourceTargetGroup() *schema.Resource {
ForceNew: true,
ValidateFunc: validation.StringInSlice(elbv2.TargetGroupIpAddressTypeEnum_Values(), false),
},
"target_failover": {
Type: schema.TypeList,
Optional: true,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"on_deregistration": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
"rebalance",
"no_rebalance",
}, false),
},
"on_unhealthy": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
"rebalance",
"no_rebalance",
}, false),
},
},
},
},
"target_type": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -475,43 +502,59 @@ func resourceTargetGroupCreate(d *schema.ResourceData, meta interface{}) error {
})
}

if v, ok := d.Get("protocol").(string); ok && v != elbv2.ProtocolEnumGeneve {
if v, ok := d.GetOk("stickiness"); ok && len(v.([]interface{})) > 0 {
stickinessBlocks := v.([]interface{})
stickiness := stickinessBlocks[0].(map[string]interface{})

// Only supported for GWLB
if v, ok := d.Get("protocol").(string); ok && v == elbv2.ProtocolEnumGeneve {
if v, ok := d.GetOk("target_failover"); ok {
failoverBlock := v.([]interface{})
failover := failoverBlock[0].(map[string]interface{})
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.enabled"),
Value: aws.String(strconv.FormatBool(stickiness["enabled"].(bool))),
Key: aws.String("target_failover.on_deregistration"),
Value: aws.String(failover["on_deregistration"].(string)),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.type"),
Value: aws.String(stickiness["type"].(string)),
})
Key: aws.String("target_failover.on_unhealthy"),
Value: aws.String(failover["on_unhealthy"].(string)),
},
)
}
}

switch d.Get("protocol").(string) {
case elbv2.ProtocolEnumHttp, elbv2.ProtocolEnumHttps:
switch stickiness["type"].(string) {
case "lb_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.lb_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
})
case "app_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.cookie_name"),
Value: aws.String(stickiness["cookie_name"].(string)),
})
default:
log.Printf("[WARN] Unexpected stickiness type. Expected lb_cookie or app_cookie, got %s", stickiness["type"].(string))
}
if v, ok := d.GetOk("stickiness"); ok && len(v.([]interface{})) > 0 {
stickinessBlocks := v.([]interface{})
stickiness := stickinessBlocks[0].(map[string]interface{})

attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.enabled"),
Value: aws.String(strconv.FormatBool(stickiness["enabled"].(bool))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.type"),
Value: aws.String(stickiness["type"].(string)),
})

switch d.Get("protocol").(string) {
case elbv2.ProtocolEnumHttp, elbv2.ProtocolEnumHttps:
switch stickiness["type"].(string) {
case "lb_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.lb_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
})
case "app_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.cookie_name"),
Value: aws.String(stickiness["cookie_name"].(string)),
})
default:
log.Printf("[WARN] Unexpected stickiness type. Expected lb_cookie or app_cookie, got %s", stickiness["type"].(string))
}
}
}
Expand Down Expand Up @@ -700,51 +743,48 @@ func resourceTargetGroupUpdate(d *schema.ResourceData, meta interface{}) error {
})
}

if v, ok := d.Get("protocol").(string); ok && v != elbv2.ProtocolEnumGeneve {
if d.HasChange("stickiness") {
stickinessBlocks := d.Get("stickiness").([]interface{})
if len(stickinessBlocks) == 1 {
stickiness := stickinessBlocks[0].(map[string]interface{})

attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.enabled"),
Value: aws.String(strconv.FormatBool(stickiness["enabled"].(bool))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.type"),
Value: aws.String(stickiness["type"].(string)),
})

switch d.Get("protocol").(string) {
case elbv2.ProtocolEnumHttp, elbv2.ProtocolEnumHttps:
switch stickiness["type"].(string) {
case "lb_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.lb_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
})
case "app_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.cookie_name"),
Value: aws.String(stickiness["cookie_name"].(string)),
})
default:
log.Printf("[WARN] Unexpected stickiness type. Expected lb_cookie or app_cookie, got %s", stickiness["type"].(string))
}
}
} else if len(stickinessBlocks) == 0 {
attrs = append(attrs, &elbv2.TargetGroupAttribute{
if d.HasChange("stickiness") {
stickinessBlocks := d.Get("stickiness").([]interface{})
if len(stickinessBlocks) == 1 {
stickiness := stickinessBlocks[0].(map[string]interface{})
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.enabled"),
Value: aws.String("false"),
Value: aws.String(strconv.FormatBool(stickiness["enabled"].(bool))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.type"),
Value: aws.String(stickiness["type"].(string)),
})

switch d.Get("protocol").(string) {
case elbv2.ProtocolEnumHttp, elbv2.ProtocolEnumHttps:
switch stickiness["type"].(string) {
case "lb_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.lb_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
})
case "app_cookie":
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.duration_seconds"),
Value: aws.String(fmt.Sprintf("%d", stickiness["cookie_duration"].(int))),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.app_cookie.cookie_name"),
Value: aws.String(stickiness["cookie_name"].(string)),
})
default:
log.Printf("[WARN] Unexpected stickiness type. Expected lb_cookie or app_cookie, got %s", stickiness["type"].(string))
}
}
} else if len(stickinessBlocks) == 0 {
attrs = append(attrs, &elbv2.TargetGroupAttribute{
Key: aws.String("stickiness.enabled"),
Value: aws.String("false"),
})
}
}

Expand All @@ -754,6 +794,24 @@ func resourceTargetGroupUpdate(d *schema.ResourceData, meta interface{}) error {
Value: aws.String(d.Get("load_balancing_algorithm_type").(string)),
})
}

if d.HasChange("target_failover") {
failoverBlock := d.Get("target_failover").([]interface{})
if len(failoverBlock) == 1 {
failover := failoverBlock[0].(map[string]interface{})
attrs = append(attrs,
&elbv2.TargetGroupAttribute{
Key: aws.String("target_failover.on_deregistration"),
Value: aws.String(failover["on_deregistration"].(string)),
},
&elbv2.TargetGroupAttribute{
Key: aws.String("target_failover.on_unhealthy"),
Value: aws.String(failover["on_unhealthy"].(string)),
},
)
}
}

case elbv2.TargetTypeEnumLambda:
if d.HasChange("lambda_multi_value_headers_enabled") {
attrs = append(attrs, &elbv2.TargetGroupAttribute{
Expand Down Expand Up @@ -986,6 +1044,16 @@ func flattenTargetGroupResource(d *schema.ResourceData, meta interface{}, target
return fmt.Errorf("setting stickiness: %w", err)
}

// Set target failover attributes for GWLB
targetFailoverAttr := flattenTargetGroupFailover(attrResp.Attributes)
if err != nil {
return fmt.Errorf("flattening target failover: %w", err)
}

if err := d.Set("target_failover", targetFailoverAttr); err != nil {
return fmt.Errorf("setting target failover: %w", err)
}

tags, err := ListTags(conn, d.Id())

if verify.ErrorISOUnsupported(conn.PartitionID, err) {
Expand All @@ -1011,6 +1079,25 @@ func flattenTargetGroupResource(d *schema.ResourceData, meta interface{}, target
return nil
}

func flattenTargetGroupFailover(attributes []*elbv2.TargetGroupAttribute) []interface{} {
if len(attributes) == 0 {
return []interface{}{}
}

m := make(map[string]interface{})

for _, attr := range attributes {
switch aws.StringValue(attr.Key) {
case "target_failover.on_deregistration":
m["on_deregistration"] = aws.StringValue(attr.Value)
case "target_failover.on_unhealthy":
m["on_unhealthy"] = aws.StringValue(attr.Value)
}
}

return []interface{}{m}
}

func flattenTargetGroupStickiness(attributes []*elbv2.TargetGroupAttribute) ([]interface{}, error) {
if len(attributes) == 0 {
return []interface{}{}, nil
Expand Down
Loading