Merge pull request #4075 from elblivion/fix-elb-ec2-classic

provider/aws: Skip SG ID determination logic for Classic ELBs
hashicorp · Dec 3, 2015 · 79c9953 · 79c9953
2 parents dbd6a1f + 5753efa
commit 79c9953
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/builtin/providers/aws/resource_aws_elb.go b/builtin/providers/aws/resource_aws_elb.go
@@ -350,12 +350,12 @@ func resourceAwsElbRead(d *schema.ResourceData, meta interface{}) error {
 		var elbVpc string
 		if lb.VPCId != nil {
 			elbVpc = *lb.VPCId
-		}
-		sgId, err := sourceSGIdByName(meta, *lb.SourceSecurityGroup.GroupName, elbVpc)
-		if err != nil {
-			return fmt.Errorf("[WARN] Error looking up ELB Security Group ID: %s", err)
-		} else {
-			d.Set("source_security_group_id", sgId)
+			sgId, err := sourceSGIdByName(meta, *lb.SourceSecurityGroup.GroupName, elbVpc)
+			if err != nil {
+				return fmt.Errorf("[WARN] Error looking up ELB Security Group ID: %s", err)
+			} else {
+				d.Set("source_security_group_id", sgId)
+			}
 		}
 	}
 	d.Set("subnets", lb.Subnets)