Move security_groups_to_ids to ec2_utils

NixOS · Oct 30, 2017 · dad0ccf · dad0ccf
1 parent 92e0fac
commit dad0ccf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/nixops/backends/ec2.py b/nixops/backends/ec2.py
@@ -598,14 +598,7 @@ def _assign_elastic_ip(self, elastic_ipv4, check):
                     self.ssh_pinged = False
 
     def security_groups_to_ids(self, subnetId, groups):
-        sg_names = filter(lambda g: not g.startswith('sg-'), groups)
-        if sg_names != [ ] and subnetId != "":
-            self.connect()
-            subnet_id_filter = {'Name': 'subnet-id', 'Values': [vpc_id]}
-            vpc_id = [vpc.vpc_id for vpc in self._conn.subnets.filter(Filters=[subnet_id_filter]).limit(1)][0]
-            groups = map(lambda g: nixops.ec2_utils.name_to_security_group(self._conn, g, vpc_id), groups)
-
-        return groups
+        return nixops.ec2_utils.security_groups_to_ids(self._conn, subnetId, groups)
 
     def _get_network_interfaces(self, defn):
         groups = self.security_groups_to_ids(defn.subnet_id, defn.security_group_ids)

diff --git a/nixops/ec2_utils.py b/nixops/ec2_utils.py
@@ -158,3 +158,13 @@ def id_to_security_group_name(conn, sg_id, vpc_id):
             name = sg.group_name
             return name
     raise Exception("could not resolve security group id '{0}' in VPC '{1}'".format(sg_id, vpc_id))
+
+def security_groups_to_ids(conn, subnetId, groups):
+    sg_names = filter(lambda g: not g.startswith('sg-'), groups)
+    if sg_names != [ ] and subnetId != "":
+        self.connect()
+        subnet_id_filter = {'Name': 'subnet-id', 'Values': [vpc_id]}
+        vpc_id = [vpc.vpc_id for vpc in self._conn.subnets.filter(Filters=[subnet_id_filter]).limit(1)][0]
+        groups = map(lambda g: nixops.ec2_utils.name_to_security_group(self._conn, g, vpc_id), groups)
+
+    return groups
diff --git a/nixops/resources/elastic_file_system_mount_target.py b/nixops/resources/elastic_file_system_mount_target.py
@@ -168,11 +168,4 @@ def destroy(self, wipe=False):
 
     def security_groups_to_ids(self, region, access_key_id, subnetId, groups):
         conn = nixops.ec2_utils.connect(region, access_key_id)
-        conn_vpc = nixops.ec2_utils.connect_vpc(region, access_key_id)
-
-        sg_names = filter(lambda g: not g.startswith('sg-'), groups)
-        if sg_names != [ ] and subnetId != "":
-            vpc_id = conn_vpc.get_all_subnets([subnetId])[0].vpc_id
-            groups = map(lambda g: nixops.ec2_utils.name_to_security_group(conn, g, vpc_id), groups)
-
-        return groups
+        return nixops.ec2_utils.security_groups_to_ids(set)