vpc_idは指定しなくても良いようにした

siroken3 · siroken3 · commit c6a5f00583e8 · 2012-12-20T11:05:23.000+09:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # floccus
 
-AWS の CloudFormation が VPC (Virutal Private Cloud) に対応していないので代替として動作するCLIツールです。VPCIDを指定すると標準出力にCloudFormationのJSONファイルを出力します。
+AWS の CloudFormation が VPC (Virutal Private Cloud) に対応していないので代替として動作するCLIツールです。regionを指定すると標準出力にCloudFormationのJSONファイルを出力します。
 
 ## 動作環境
 Linux/MacOS 10以降で動作します。また必要なライブラリは以下のとおりです。
@@ -33,11 +33,11 @@ ${FLOCCUS_HOME} 以下に bin/ と lib/ ができますので ${FLOCCUS_HOME}/bi
 
 ## 使い方
 
-環境変数 AWS_ACCESS_KEY, AWS_SECRET_KEY へEC2でDescribeできる権限のアクセスキー、シークレットキーを設定してCloudFormationのJSONを出力したいVPCのIDを指定します。
+環境変数 AWS_ACCESS_KEY, AWS_SECRET_KEY へEC2でDescribeできる権限のアクセスキー、シークレットキーを設定し、CloudFormationのJSONを出力したいリージョンを指定します。
 
     $ export AWS_ACCESS_KEY=アクセスキー
     $ export AWS_SECRET_KEY=シークレットキー
-    $ flcs VPCID
+    $ flcs REGION
     {
         "AWSTemplateFormatVersion": "2010-09-09",
         "Description": "This is auto generated cloudformation file.",
@@ -46,20 +46,16 @@ ${FLOCCUS_HOME} 以下に bin/ と lib/ ができますので ${FLOCCUS_HOME}/bi
 
 アクセスキー、シークレットキーは引数で指定することもできます。
 
-    $ flcs --aws-access-key アクセスキー --aws-secret-key シークレットキー VPCID
+    $ flcs --aws-access-key アクセスキー --aws-secret-key シークレットキー
 
-対象のVPCが us-east-1 以外のリージョンに存在する場合は --region 引数で指定する必要があります。
+us-east-1 以外のリージョンを使用する場合は引数で指定できます
 
-    $ flcs --region 'ap-northeast-1' VPCID
+    $ flcs --region 'ap-northeast-1'
 
 --help で簡単なヘルプを見ることができます。
 
     bin/flcs --help
     usage: flcs [-h] [-O AWS_ACCESS_KEY] [-W AWS_SECRET_KEY] [--region REGION]
-                vpcid
-    
-    positional arguments:
-      vpcid
     
     optional arguments:
       -h, --help            show this help message and exit
@@ -69,7 +65,6 @@ ${FLOCCUS_HOME} 以下に bin/ と lib/ ができますので ${FLOCCUS_HOME}/bi
 
 ## TODO
 * 一部のResourceにしか対応していないので拡充
-* Tagへの対応
 * cloudformerのようなWebアプリケーション化
 
 ## LICENCE
diff --git a/bin/flcs b/bin/flcs
@@ -2,8 +2,6 @@
 
 import sys
 sys.path.insert(0, sys.path[0] + '/../lib')
-from floccus import main
-
-main.main()
-
+from floccus import cli
 
+cli.main()
diff --git a/lib/floccus/cli.py b/lib/floccus/cli.py
@@ -11,15 +11,14 @@
 def main():
 # parse arguments
     parser = argparse.ArgumentParser()
-    parser.add_argument('vpcid')
+    parser.add_argument('--region', default='us-east-1')
     parser.add_argument('-O','--aws-access-key', default=None)
     parser.add_argument('-W','--aws-secret-key', default=None)
-    parser.add_argument('--region')
     parsed = parser.parse_args()
     access_key, secret_key = utils.get_aws_key(parsed.aws_access_key, parsed.aws_secret_key)
 
 # do form
-    former = CloudFormer(vpc_id=parsed.vpcid, access_key=access_key, secret_key=secret_key, region_name=parsed.region)
+    former = CloudFormer(access_key=access_key, secret_key=secret_key, region_name=parsed.region)
     model = former.form()
 
 # output
diff --git a/lib/floccus/former.py b/lib/floccus/former.py
@@ -8,15 +8,14 @@
 from models import *
 
 class CloudFormer:
-    def __init__(self, access_key, secret_key, vpc_id, region_name='us-east-1'):
+    def __init__(self, access_key, secret_key, region_name='us-east-1'):
         self.access_key = access_key if access_key is not None else ''
         self.secret_key = secret_key if secret_key is not None else ''
         self.region = boto.ec2.get_region(
             region_name,
             aws_access_key_id=self.access_key,
             aws_secret_access_key=self.secret_key
             )
-        self.vpc_id = vpc_id
 
     def form(self):
         self.vpcconn = boto.connect_vpc(
@@ -25,62 +24,63 @@ def form(self):
             aws_secret_access_key=self.secret_key
             )
         context = {}
-        self._form_vpc(context)
-        self._form_internet_gateway(context)
-        self._form_gateway_attachments(context)
-        self._form_subnets(context)
-        self._form_instances(context)
-        self._form_route_tables(context)
-        self._form_route(context)
-        self._form_subnet_route_table_association(context)
+        vpcs = self._form_vpc(context)
+        for vpc in vpcs:
+            internet_gateways = self._form_internet_gateway(context, vpc)
+            subnets           = self._form_subnets(context, vpc)
+            instances         = self._form_instances(context, vpc, subnets)
+            route_tables      = self._form_route_tables(context, vpc)
+            self._form_gateway_attachments(context, vpc, internet_gateways)
+            self._form_route(context, route_tables, internet_gateways, instances)
+            self._form_subnet_route_table_association(context, route_tables, subnets)
         return context
 
     def _form_vpc(self, context):
-        vpcs = self.vpcconn.get_all_vpcs(
-            filters=[('vpc-id', self.vpc_id)]
-            )
-        context['vpc'] = CfnVpc(vpcs[0])
+        vpcs = [CfnVpc(vpc) for vpc in self.vpcconn.get_all_vpcs()]
+        context['vpcs'] = vpcs
+        return vpcs
 
-    def _form_internet_gateway(self, context):
-        context['internet_gateways'] = [
+    def _form_internet_gateway(self, context, vpc):
+        internet_gateways = [
             CfnInternetGateWay(igw)
             for igw in self.vpcconn.get_all_internet_gateways(
-                filters=[('attachment.vpc-id',self.vpc_id)]
+                filters=[('attachment.vpc-id', vpc.id)]
                 )
             ]
+        context['internet_gateways'] = internet_gateways
+        return internet_gateways
 
-    def _form_gateway_attachments(self, context):
-        vpc               = context['vpc']
-        internet_gateways = context['internet_gateways'] if 'internet_gateways' in context else []
+    def _form_gateway_attachments(self, context, vpc, internet_gateways):
         attachments       = []
         for internet_gateway in internet_gateways:
             attachments.extend([
                     CfnVpcGatewayAttachment(att, cfn_vpc=vpc, cfn_gateway=internet_gateway)
                     for att in internet_gateway.attachments
                     ])
         context['gateway_attachments'] = attachments
+        return attachments
 
-    def _form_subnets(self, context):
-        vpc                = context['vpc']
-        context['subnets'] = [
+    def _form_subnets(self, context, vpc):
+        subnets = [
             CfnSubnet(s, vpc)
             for s in self.vpcconn.get_all_subnets(
                 filters=[('vpc-id', vpc.id)]
                 )
             ]
+        context['subnets'] = subnets
+        return subnets
 
-    def _form_route_tables(self, context):
-        vpc                     = context['vpc']
-        context['route_tables'] = [
+    def _form_route_tables(self, context, vpc):
+        route_tables = [
             CfnRouteTable(rtb, cfn_vpc=vpc)
             for rtb in self.vpcconn.get_all_route_tables(
                 filters=[('vpc-id', vpc.id)]
                 )
             ]
+        context['route_tables'] = route_tables
+        return route_tables
 
-    def _form_instances(self, context):
-        vpc       = context['vpc']
-        subnets   = context['subnets'] if 'subnets' in context else []
+    def _form_instances(self, context, vpc, subnets):
         instances = []
         for reservation in self.vpcconn.get_all_instances(filters={'vpc-id': vpc.id}):
             for instance in reservation.instances:
@@ -90,15 +90,12 @@ def _form_instances(self, context):
                             if subnet.id == instance.subnet_id
                         ])
         context['instances'] = instances
+        return instances
 
-    def _form_route(self, context):
-        route_tables       = context['route_tables'] if 'route_tables' in context else []
-        gateways           = context['internet_gateways'] if 'internet_gateways' in context else []
-        instances          = context['instances'] if 'instances' in context else []
-        network_interfaces = context['network_interfaces'] if 'network_interfaces' in context else []
+    def _form_route(self, context, route_tables=[], internet_gateways=[], instances=[], network_interfaces=[]):
         routes             = []
         for route_table in route_tables:
-            for gateway in gateways:
+            for gateway in internet_gateways:
                 routes.extend([
                         CfnRoute(route, cfn_route_table=route_table, cfn_gateway=gateway)
                         for route in route_table.routes
@@ -117,10 +114,9 @@ def _form_route(self, context):
                         if network_interfaces.id == route.network_interface_id
                         ])
         context['routes'] = routes
+        return routes
 
-    def _form_subnet_route_table_association(self, context):
-        route_tables = context['route_tables']
-        subnets      = context['subnets']
+    def _form_subnet_route_table_association(self, context, route_tables, subnets):
         associations = []
         for subnet in subnets:
             for route_table in route_tables:
@@ -130,4 +126,4 @@ def _form_subnet_route_table_association(self, context):
                         if assoc.subnet_id == subnet.id
                         ])
         context['subnet_route_table_associations'] = associations
-
+        return associations
diff --git a/lib/floccus/models.py b/lib/floccus/models.py
@@ -29,7 +29,7 @@ def cfn_resource_name(self):
             return self.tag_name
 
     def default_cfn_resource_name(self):
-        return None
+        return (self.id).replace('-','')
 
 class CfnVpc(CfnAWSResource):
     def __init__(self, vpc):
@@ -46,7 +46,7 @@ def __init__(self, attachment, cfn_vpc, cfn_gateway):
         self.gateway = cfn_gateway
 
     def cfn_resource_name(self):
-        return self.vpc.cfn_resource_name() + self.gateway.cfn_resource_name() + "GateWayAttachment"
+        return self.vpc.cfn_resource_name() + self.gateway.cfn_resource_name() + "GatewayAttachment"
 
 class CfnSubnet(CfnAWSResource):
     def __init__(self, subnet, cfn_vpc):
@@ -61,9 +61,6 @@ def __init__(self, route_table, cfn_vpc):
         CfnTaggedResource.__init__(self, route_table)
         self.vpc = cfn_vpc
 
-    def default_cfn_resource_name(self):
-        return (self.id).replace('-','')
-
 class CfnSubnetRouteTableAssociation(CfnAWSResource):
     def __init__(self, route_table_association, cfn_route_table, cfn_subnet):
         CfnAWSResource.__init__(self, route_table_association)
@@ -85,7 +82,3 @@ class CfnEC2Instance(CfnTaggedResource):
     def __init__(self, instance, cfn_subnet):
         CfnTaggedResource.__init__(self, instance)
         self.subnet = cfn_subnet
-
-    def default_cfn_resource_name(self):
-        return (self.id).replace('-','')
-
diff --git a/lib/floccus/templates/metatemplate.jinja2 b/lib/floccus/templates/metatemplate.jinja2
@@ -1,14 +1,17 @@
 {
     "AWSTemplateFormatVersion": "2010-09-09",
-    "Description": "This is auto generated cloudformation file. VPC:{{ model.vpc.id }}",
+    "Description": "This is auto generated cloudformation file.",
     "Resources": {
-        "{{ model.vpc.cfn_resource_name() }}" : {
+
+{% for vpc in model.vpcs %}
+        "{{ vpc.cfn_resource_name() }}" : {
             "Type" : "AWS::EC2::VPC",
             "Properties" : {
-                "CidrBlock" : "{{ model.vpc.cidr_block }}",
-                "InstanceTenancy" : "{{ model.vpc.instanceTenancy }}"
+                "CidrBlock" : "{{ vpc.cidr_block }}",
+                "InstanceTenancy" : "{{ vpc.instanceTenancy }}"
             }
         },
+{% endfor %}
 {% for gateway in model.internet_gateways %}
         "{{ gateway.cfn_resource_name() }}" : {
            "Type" : "AWS::EC2::InternetGateway"
