Skip to content

Commit

Permalink
r/codedeploy_deployment_group: Add nil checks for load_balancer_info
Browse files Browse the repository at this point in the history
  • Loading branch information
radeksimko committed Oct 11, 2017
1 parent 9b8b0d0 commit 78777df
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions aws/resource_aws_codedeploy_deployment_group.go
Expand Up @@ -749,8 +749,13 @@ func expandLoadBalancerInfo(list []interface{}) *codedeploy.LoadBalancerInfo {

for _, v := range elbs {
elb := v.(map[string]interface{})
name, ok := elb["name"].(string)
if !ok {
continue
}

loadBalancerInfo.ElbInfoList = append(loadBalancerInfo.ElbInfoList, &codedeploy.ELBInfo{
Name: aws.String(elb["name"].(string)),
Name: aws.String(name),
})
}
}
Expand All @@ -761,8 +766,13 @@ func expandLoadBalancerInfo(list []interface{}) *codedeploy.LoadBalancerInfo {

for _, v := range targetGroups {
targetGroup := v.(map[string]interface{})
name, ok := targetGroup["name"].(string)
if !ok {
continue
}

loadBalancerInfo.TargetGroupInfoList = append(loadBalancerInfo.TargetGroupInfoList, &codedeploy.TargetGroupInfo{
Name: aws.String(targetGroup["name"].(string)),
Name: aws.String(name),
})
}
}
Expand Down Expand Up @@ -952,13 +962,19 @@ func flattenLoadBalancerInfo(loadBalancerInfo *codedeploy.LoadBalancerInfo) []ma

elbs := make([]interface{}, 0, len(loadBalancerInfo.ElbInfoList))
for _, elb := range loadBalancerInfo.ElbInfoList {
if elb.Name == nil {
continue
}
item := make(map[string]interface{})
item["name"] = *elb.Name
elbs = append(elbs, item)
}

targetGroups := make([]interface{}, 0, len(loadBalancerInfo.TargetGroupInfoList))
for _, targetGroup := range loadBalancerInfo.TargetGroupInfoList {
if targetGroup.Name == nil {
continue
}
item := make(map[string]interface{})
item["name"] = *targetGroup.Name
targetGroups = append(targetGroups, item)
Expand Down

0 comments on commit 78777df

Please sign in to comment.