Ability to check all vpcs in the region #1

Cloud-Architects · May 24, 2020 · 5ec2aef · 5ec2aef
1 parent 78cb09e
commit 5ec2aef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/aws-network-discovery.py b/aws-network-discovery.py
@@ -45,8 +45,8 @@ def show_options(args="sys.argv[1:]"):
     parser.add_argument(
                         "-v",
                         "--vpc-id",
-                        required=True,
-                        help="Inform VPC to analyze"
+                        required=False,
+                        help="Inform VPC to analyze. If not informed, script try all vpcs."
                         )
     parser.add_argument(
                         "-r",

diff --git a/commands/vpc.py b/commands/vpc.py
@@ -23,8 +23,18 @@ def run(self):
         if self.region_name is not None:
             region_name = self.region_name
 
-        """ init class awscommands """
-        awscommands = AwsCommands(VpcOptions(session=session, vpc_id=self.vpc_id, region_name=region_name))
-        awscommands.run()
+        """ if vpc is none, get all vpcs and check """
+        if self.vpc_id is None:
+            client = session.client('ec2')
+            vpcs = client.describe_vpcs()
+            for data in vpcs['Vpcs']:
+                """ init class awscommands """
+                awscommands = AwsCommands(VpcOptions(session=session, vpc_id=data['VpcId'], region_name=region_name)).run()
+        else:
+            """ init class awscommands """
+            awscommands = AwsCommands(VpcOptions(session=session, vpc_id=self.vpc_id, region_name=region_name)).run()
+
+
+
 
 
diff --git a/shared/internal/network.py b/shared/internal/network.py
@@ -16,10 +16,11 @@ def run(self):
         )
 
         dataresponse = response['Vpcs'][0]
-        message = "VPC: {}\nCIDR Block: {}\nTenancy: {}\nIs default: {}".format(self.vpc_options.vpc_id,
-                                                                    dataresponse['CidrBlock'], 
-                                                                    dataresponse['InstanceTenancy'],
-                                                                    dataresponse['IsDefault'])
+        message = "------------------------------------------------------\n"
+        message = message + "VPC: {}\nCIDR Block: {}\nTenancy: {}\nIs default: {}".format(self.vpc_options.vpc_id,
+                                                                                          dataresponse['CidrBlock'], 
+                                                                                          dataresponse['InstanceTenancy'],
+                                                                                          dataresponse['IsDefault'])
         print(message)
 
         return True