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

Sort subnets to avoid spurious diffs #5208

Merged
merged 1 commit into from
Mar 7, 2016
Merged

Sort subnets to avoid spurious diffs #5208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 25 additions & 35 deletions builtin/providers/aws/resource_aws_elastic_beanstalk_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,14 @@ func fetchAwsElasticBeanstalkEnvironmentSettings(d *schema.ResourceData, meta in
}

if optionSetting.Value != nil {
m["value"] = *optionSetting.Value
switch *optionSetting.OptionName {
case "SecurityGroups":
m["value"] = dropGeneratedSecurityGroup(*optionSetting.Value, meta)
case "Subnets", "ELBSubnets":
m["value"] = sortValues(*optionSetting.Value)
default:
m["value"] = *optionSetting.Value
}
}

settings.Add(m)
Expand All @@ -339,8 +346,6 @@ func resourceAwsElasticBeanstalkEnvironmentSettingsRead(d *schema.ResourceData,
return err
}

dropGeneratedSecurityGroup(allSettings, meta)

settings := d.Get("setting").(*schema.Set)

log.Printf("[DEBUG] Elastic Beanstalk allSettings: %s", allSettings.GoString())
Expand Down Expand Up @@ -483,44 +488,29 @@ func extractOptionSettings(s *schema.Set) []*elasticbeanstalk.ConfigurationOptio
return settings
}

func dropGeneratedSecurityGroup(settings *schema.Set, meta interface{}) {
func dropGeneratedSecurityGroup(settingValue string, meta interface{}) string {
conn := meta.(*AWSClient).ec2conn

for _, s := range settings.List() {
setting := s.(map[string]interface{})

if setting["name"].(string) != "SecurityGroups" {
continue
}

log.Printf("[DEBUG] Elastic Beanstalk setting: %v", setting)
settingValue, isString := setting["value"].(string)
if !isString {
continue
}

groups := strings.Split(settingValue, ",")
groups := strings.Split(settingValue, ",")

resp, err := conn.DescribeSecurityGroups(&ec2.DescribeSecurityGroupsInput{
GroupIds: aws.StringSlice(groups),
})
resp, err := conn.DescribeSecurityGroups(&ec2.DescribeSecurityGroupsInput{
GroupIds: aws.StringSlice(groups),
})

if err != nil {
log.Printf("[DEBUG] Elastic Beanstalk error describing SecurityGroups: %v", err)
continue
}
if err != nil {
log.Printf("[DEBUG] Elastic Beanstalk error describing SecurityGroups: %v", err)
return settingValue
}

var legitGroups []string
for _, group := range resp.SecurityGroups {
log.Printf("[DEBUG] Elastic Beanstalk SecurityGroup: %v", *group.GroupName)
if !strings.HasPrefix(*group.GroupName, "awseb") {
legitGroups = append(legitGroups, *group.GroupId)
}
var legitGroups []string
for _, group := range resp.SecurityGroups {
log.Printf("[DEBUG] Elastic Beanstalk SecurityGroup: %v", *group.GroupName)
if !strings.HasPrefix(*group.GroupName, "awseb") {
legitGroups = append(legitGroups, *group.GroupId)
}
}

settings.Remove(s)
sort.Strings(legitGroups)

setting["value"] = strings.Join(legitGroups, ",")
settings.Add(setting)
}
return strings.Join(legitGroups, ",")
}