Merge pull request #110 from grahamc/security-group-type

grahamc · web-flow · commit 9ff8f18d1385 · 2020-09-04T14:56:00.000-04:00
EC2 Backend: compare security groups as lists
diff --git a/nixops_aws/backends/ec2.py b/nixops_aws/backends/ec2.py
@@ -919,7 +919,7 @@ def create_instance(self, defn, zone, user_data, ebs_optimized, args):
             IamInstanceProfile["Name"] = defn.instance_profile
 
         if defn.subnet_id != "":
-            if defn.security_groups != [] and defn.security_groups != ["default"]:
+            if defn.security_groups and list(defn.security_groups) != ["default"]:
                 raise Exception(
                     "‘deployment.ec2.securityGroups’ is incompatible with ‘deployment.ec2.subnetId’"
                 )

Original file line number	Diff line number	Diff line change
`@@ -919,7 +919,7 @@ def create_instance(self, defn, zone, user_data, ebs_optimized, args):`
`919`	`919`	`IamInstanceProfile["Name"] = defn.instance_profile`
`920`	`920`
`921`	`921`	`if defn.subnet_id != "":`
`922`		`- if defn.security_groups != [] and defn.security_groups != ["default"]:`
	`922`	`+ if defn.security_groups and list(defn.security_groups) != ["default"]:`
`923`	`923`	`raise Exception(`
`924`	`924`	`"‘deployment.ec2.securityGroups’ is incompatible with ‘deployment.ec2.subnetId’"`
`925`	`925`	`)`