Partially reverse commit 744564c in preparation of generic approach t…

…o region selection [Issue(s) #50, #53]
sopel · Feb 26, 2014 · 5187a87 · 5187a87
1 parent 108d6c4
commit 5187a87
Show file tree

Hide file tree

Showing 35 changed files with 34 additions and 36 deletions.
diff --git a/botocross/__init__.py b/botocross/__init__.py
@@ -79,8 +79,6 @@ def build_common_parser():
 def build_region_parser():
     parser = argparse.ArgumentParser(add_help=False)
     parser.add_argument("-r", "--region", help="A region substring selector (e.g. 'us-west')")
-    parser.add_argument("--include_govcloud", action='store_true', help="Include 'GovCloud' regions. [default: False]")
-    parser.add_argument("--only_govcloud", action='store_true', help="Return only 'GovCloud' region(s). [default: False]")
     return parser
 
 def build_filter_parser(resource_name, add_ids=True):

diff --git a/scripts/authorize-securitygroups.py b/scripts/authorize-securitygroups.py
@@ -65,7 +65,7 @@ def authorizeIp():
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 group_name = args.name if args.name else ""

diff --git a/scripts/create-buckets.py b/scripts/create-buckets.py
@@ -39,7 +39,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-locations = bc.filter_regions_s3(class_iterator(Location), args.region, args.include_govcloud, args.only_govcloud)
+locations = bc.filter_regions_s3(class_iterator(Location), args.region)
 
 # execute business logic
 log.info("Creating S3 buckets named '" + args.bucket + "':")

diff --git a/scripts/create-images.py b/scripts/create-images.py
@@ -40,7 +40,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 
 # execute business logic

diff --git a/scripts/create-securitygroups.py b/scripts/create-securitygroups.py
@@ -39,7 +39,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 log.info("Creating EC2 security groups named '" + args.group + "':")

diff --git a/scripts/create-snapshots.py b/scripts/create-snapshots.py
@@ -39,7 +39,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 
 # execute business logic

diff --git a/scripts/create-stacks.py b/scripts/create-stacks.py
@@ -45,7 +45,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.cloudformation.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.cloudformation.regions(), args.region)
 
 def processParameter(parameter, region_name, account_id):
     replacement = parameter[1].replace('{REGION}', region_name).replace('{ACCOUNT}', account_id)

diff --git a/scripts/create-topics.py b/scripts/create-topics.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.sns.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.sns.regions(), args.region)
 
 # execute business logic
 log.info("Creating SNS topics named '" + args.topic + "':")

diff --git a/scripts/delete-buckets.py b/scripts/delete-buckets.py
@@ -40,7 +40,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-locations = bc.filter_regions_s3(class_iterator(Location), args.region, args.include_govcloud, args.only_govcloud)
+locations = bc.filter_regions_s3(class_iterator(Location), args.region)
 
 # execute business logic
 log.info("Deleting S3 buckets named '" + args.bucket + "':")

diff --git a/scripts/delete-keypairs.py b/scripts/delete-keypairs.py
@@ -37,7 +37,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 log.info("Deleting key pair named '" + args.key_name + "':")

diff --git a/scripts/delete-keys.py b/scripts/delete-keys.py
@@ -40,7 +40,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-locations = bc.filter_regions_s3(class_iterator(Location), args.region, args.include_govcloud, args.only_govcloud)
+locations = bc.filter_regions_s3(class_iterator(Location), args.region)
 
 # execute business logic
 log.info("Deleting from S3 buckets named '" + args.bucket + "':")

diff --git a/scripts/delete-securitygroups.py b/scripts/delete-securitygroups.py
@@ -40,7 +40,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 groupname = args.name if args.name else ""

diff --git a/scripts/delete-snapshots.py b/scripts/delete-snapshots.py
@@ -36,7 +36,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 log.info(args.resource_ids)
 

diff --git a/scripts/delete-stacks.py b/scripts/delete-stacks.py
@@ -37,7 +37,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.cloudformation.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.cloudformation.regions(), args.region)
 
 # execute business logic
 log.info("Deleting CloudFormation stacks named '" + args.stack_name_or_id + "':")

diff --git a/scripts/delete-topics.py b/scripts/delete-topics.py
@@ -37,7 +37,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.sns.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.sns.regions(), args.region)
 
 def createTopicArn(region_name, topic_name):
     from botocross.iam.accountinfo import AccountInfo

diff --git a/scripts/deregister-images.py b/scripts/deregister-images.py
@@ -36,7 +36,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 log.info(args.resource_ids)
 

diff --git a/scripts/describe-images.py b/scripts/describe-images.py
@@ -36,7 +36,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 log.info(args.resource_ids)
 

diff --git a/scripts/describe-instances.py b/scripts/describe-instances.py
@@ -36,7 +36,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 log.info(args.resource_ids)
 

diff --git a/scripts/describe-regions.py b/scripts/describe-regions.py
@@ -35,7 +35,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 log.info("Describing regions for EC2:")

diff --git a/scripts/describe-securitygroups.py b/scripts/describe-securitygroups.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 
 # execute business logic

diff --git a/scripts/describe-snapshots.py b/scripts/describe-snapshots.py
@@ -36,7 +36,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 log.info(args.resource_ids)
 

diff --git a/scripts/describe-stacks.py b/scripts/describe-stacks.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.cloudformation.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.cloudformation.regions(), args.region)
 
 # execute business logic
 log.info("Describing CloudFormation stacks:")

diff --git a/scripts/describe-tags.py b/scripts/describe-tags.py
@@ -37,7 +37,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filters = bc.build_filter_params(args.filter)
 
 # execute business logic

diff --git a/scripts/describe-volumes.py b/scripts/describe-volumes.py
@@ -36,7 +36,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 log.info(args.resource_ids)
 

diff --git a/scripts/expire-images.py b/scripts/expire-images.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 
 # execute business logic

diff --git a/scripts/expire-snapshots.py b/scripts/expire-snapshots.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 filter = bc.build_filter(args.filter, args.exclude)
 
 # execute business logic

diff --git a/scripts/import-keypairs.py b/scripts/import-keypairs.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 log.info("Importing key pair named '" + args.key_name + "':")

diff --git a/scripts/list-subscriptions.py b/scripts/list-subscriptions.py
@@ -37,7 +37,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.sns.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.sns.regions(), args.region)
 
 # execute business logic
 log.info("Describing SNS topics:")

diff --git a/scripts/list-topics.py b/scripts/list-topics.py
@@ -35,7 +35,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.sns.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.sns.regions(), args.region)
 
 # execute business logic
 log.info("Describing SNS topics:")

diff --git a/scripts/read-buckets.py b/scripts/read-buckets.py
@@ -40,7 +40,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-locations = bc.filter_regions_s3(class_iterator(Location), args.region, args.include_govcloud, args.only_govcloud)
+locations = bc.filter_regions_s3(class_iterator(Location), args.region)
 
 # execute business logic
 log.info("Reading S3 buckets named '" + args.bucket + "':")

diff --git a/scripts/revoke-securitygroups.py b/scripts/revoke-securitygroups.py
@@ -65,7 +65,7 @@ def revokeIp():
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.ec2.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.ec2.regions(), args.region)
 
 # execute business logic
 group_name = args.name if args.name else ""

diff --git a/scripts/subscribe-topics.py b/scripts/subscribe-topics.py
@@ -39,7 +39,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.sns.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.sns.regions(), args.region)
 
 # execute business logic
 log.info("Subscribing to SNS topics named '" + args.topic + ' with protocol ' + args.protocol + ' and endpoint ' + args.endpoint + "':")

diff --git a/scripts/update-stacks.py b/scripts/update-stacks.py
@@ -45,7 +45,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.cloudformation.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.cloudformation.regions(), args.region)
 
 def processParameter(parameter, region_name, account_id):
     replacement = parameter[1].replace('{REGION}', region_name).replace('{ACCOUNT}', account_id)

diff --git a/scripts/upload-keys.py b/scripts/upload-keys.py
@@ -42,7 +42,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-locations = bc.filter_regions_s3(class_iterator(Location), args.region, args.include_govcloud, args.only_govcloud)
+locations = bc.filter_regions_s3(class_iterator(Location), args.region)
 
 # execute business logic
 log.info("Uploading to S3 buckets named '" + args.bucket + "':")

diff --git a/scripts/validate-template.py b/scripts/validate-template.py
@@ -38,7 +38,7 @@
 log = logging.getLogger('botocross')
 bc.configure_logging(log, args.log_level)
 credentials = bc.parse_credentials(args)
-regions = bc.filter_regions(boto.cloudformation.regions(), args.region, args.include_govcloud, args.only_govcloud)
+regions = bc.filter_regions(boto.cloudformation.regions(), args.region)
 
 def processArgument(argument, region_name):
     return argument.replace('{REGION}', region_name)