Skip to content

Commit

Permalink
updates to work with python3
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickbcullen
patrickbcullen committed Feb 9, 2018
1 parent 3abdf55 commit 38ef5f4
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 42 deletions.
4 changes: 2 additions & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name='aws-tagger',
version='0.6.0',
version='0.6.1',
packages=find_packages(),
include_package_data=True,
install_requires=[
Expand All @@ -28,7 +28,7 @@
author="Patrick Cullen and the WaPo platform tools team",
author_email="[email protected]",
url="https://github.com/washingtonpost/aws-tagger",
download_url = "https://github.com/washingtonpost/aws-tagger/tarball/v0.6.0",
download_url = "https://github.com/washingtonpost/aws-tagger/tarball/v0.6.1",
keywords = ['tag', 'tagger', 'tagging', 'aws'],
classifiers = []
)
4 changes: 2 additions & 2 deletions tagger/cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ def cli(dryrun, verbose, region, role, resource, tag, csv):
print "Cannot use --resource or --tag with --csv option"
sys.exit(1)
if csv:
tagger = CSVResourceTagger(dryrun, verbose, role, region)
tagger = CSVResourceTagger(dryrun, verbose, role, region, tag_volumes=True)
tagger.tag(csv)
else:
tagger = MultipleResourceTagger(dryrun, verbose, role, region)
tagger = MultipleResourceTagger(dryrun, verbose, role, region, tag_volumes=True)
tags = _tag_options_to_dict(tag)
tagger.tag(resource, tags)

Expand Down
81 changes: 43 additions & 38 deletions tagger/tagger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ def _arn_to_name(resource_arn):

def _format_dict(tags):
output = []
for key, value in tags.iteritems():
for (key, value) in tags.items():
output.append("%s:%s" % (key, value))

return ", ".join(output)

def _dict_to_aws_tags(tags):
return [{'Key': key, 'Value': value} for key, value in tags.iteritems() if not key.startswith('aws:')]
return [{'Key': key, 'Value': value} for (key, value) in tags.items() if not key.startswith('aws:')]

def _aws_tags_to_dict(aws_tags):
return {x['Key']: x['Value'] for x in aws_tags if not x['Key'].startswith('aws:')}
Expand Down Expand Up @@ -58,9 +58,9 @@ def _client(name, role, region):
return boto3.client(name, **kwargs)

class SingleResourceTagger(object):
def __init__(self, dryrun, verbose, role=None, region=None):
def __init__(self, dryrun, verbose, role=None, region=None, tag_volumes=False):
self.taggers = {}
self.taggers['ec2'] = EC2Tagger(dryrun, verbose, role=role, region=region)
self.taggers['ec2'] = EC2Tagger(dryrun, verbose, role=role, region=region, tag_volumes=tag_volumes)
self.taggers['elasticfilesystem'] = EFSTagger(dryrun, verbose, role=role, region=region)
self.taggers['rds'] = RDSTagger(dryrun, verbose, role=role, region=region)
self.taggers['elasticloadbalancing'] = LBTagger(dryrun, verbose, role=role, region=region)
Expand Down Expand Up @@ -103,7 +103,7 @@ def tag(self, resource_id, tags):
if tagger:
tagger.tag(resource_arn, tags)
else:
print "Tagging is not support for this resource %s" % resource_id
print("Tagging is not support for this resource %s" % resource_id)

def _parse_arn(self, resource_arn):
product = None
Expand All @@ -119,17 +119,18 @@ def _parse_arn(self, resource_arn):
return product, resource_id

class MultipleResourceTagger(object):
def __init__(self, dryrun, verbose, role=None, region=None):
self.tagger = SingleResourceTagger(dryrun, verbose, role=role, region=region)
def __init__(self, dryrun, verbose, role=None, region=None, tag_volumes=False):
self.tagger = SingleResourceTagger(dryrun, verbose, role=role, region=region, tag_volumes=tag_volumes)

def tag(self, resource_ids, tags):
for resource_id in resource_ids:
self.tagger.tag(resource_id, tags)

class CSVResourceTagger(object):
def __init__(self, dryrun, verbose, role=None, region=None):
def __init__(self, dryrun, verbose, role=None, region=None, tag_volumes=False):
self.dryrun = dryrun
self.verbose = verbose
self.tag_volumes = tag_volumes
self.role = role
self.region = region
self.regional_tagger = {}
Expand Down Expand Up @@ -159,7 +160,7 @@ def _parse_header(self, header_row):
def _tag_resource(self, tag_index, row):
resource_id = row[tag_index[self.resource_id_column]]
tags = {}
for key, index in tag_index.iteritems():
for (key, index) in tag_index.items():
value = row[index]
if key != self.resource_id_column and key != self.region_column and value != "":
tags[key] = value
Expand All @@ -178,17 +179,21 @@ def _lookup_tagger(self, tag_index, row):

tagger = self.regional_tagger.get(region)
if tagger is None:
tagger = SingleResourceTagger(self.dryrun, self.verbose, role=self.role, region=region)
tagger = SingleResourceTagger(self.dryrun, self.verbose, role=self.role, region=region, tag_volumes=self.tag_volumes)
self.regional_tagger[region] = tagger

return tagger

class EC2Tagger(object):
def __init__(self, dryrun, verbose, role=None, region=None):
def __init__(self, dryrun, verbose, role=None, region=None, tag_volumes=False):
self.dryrun = dryrun
self.verbose = verbose
self.ec2 = _client('ec2', role=role, region=region)
self.volume_cache = {}
if tag_volumes:
self.add_volume_cache()

def add_volume_cache(self):
#TODO implement paging for describe instances
reservations = self._ec2_describe_instances(MaxResults=1000)

Expand All @@ -208,13 +213,13 @@ def tag(self, instance_id, tags):
resource_ids = [instance_id]
resource_ids.extend(self.volume_cache.get(instance_id, []))
if self.verbose:
print "tagging %s with %s" % (", ".join(resource_ids), _format_dict(tags))
print("tagging %s with %s" % (", ".join(resource_ids), _format_dict(tags)))
if not self.dryrun:
try:
self._ec2_create_tags(Resources=resource_ids, Tags=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['InvalidSnapshot.NotFound', 'InvalidVolume.NotFound', 'InvalidInstanceID.NotFound']:
print "Resource not found: %s" % instance_id
print("Resource not found: %s" % instance_id)
else:
raise exception

Expand All @@ -238,13 +243,13 @@ def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)

if self.verbose:
print "tagging %s with %s" % (file_system_id, _format_dict(tags))
print("tagging %s with %s" % (file_system_id, _format_dict(tags)))
if not self.dryrun:
try:
self._efs_create_tags(FileSystemId=file_system_id, Tags=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['FileSystemNotFound']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -261,13 +266,13 @@ def __init__(self, dryrun, verbose, role=None, region=None):
def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
self._dynamodb_tag_resource(ResourceArn=resource_arn, Tags=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['ResourceNotFoundException']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -284,17 +289,17 @@ def __init__(self, dryrun, verbose, role=None, region=None):

def tag(self, resource_arn, tags):
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
self._lambda_tag_resource(Resource=resource_arn, Tags=tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['ResourceNotFoundException']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

#TODO @retry(retry_on_exception=_is_retryable_exception, stop_max_delay=30000, wait_exponential_multiplier=1000)
@retry(retry_on_exception=_is_retryable_exception, stop_max_delay=30000, wait_exponential_multiplier=1000)
def _lambda_tag_resource(self, **kwargs):
return self.alambda.tag_resource(**kwargs)

Expand All @@ -307,22 +312,22 @@ def __init__(self, dryrun, verbose, role=None, region=None):

def tag(self, resource_arn, tags):
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
log_group = None
parts = resource_arn.split(':')
if len(parts) > 0:
log_group = parts[-1]

if not log_group:
print "Invalid ARN format for CloudWatch Logs: %s" % resource_arn
print("Invalid ARN format for CloudWatch Logs: %s" % resource_arn)
return

if not self.dryrun:
try:
self._logs_tag_log_group(logGroupName=log_group, tags=tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['ResourceNotFoundException']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -340,13 +345,13 @@ def __init__(self, dryrun, verbose, role=None, region=None):
def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
self._rds_add_tags_to_resource(ResourceName=resource_arn, Tags=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['DBInstanceNotFound']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -365,7 +370,7 @@ def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)

if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
if ':loadbalancer/app/' in resource_arn:
Expand All @@ -375,7 +380,7 @@ def tag(self, resource_arn, tags):
self._elb_add_tags(LoadBalancerNames=[elb_name], Tags=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['LoadBalancerNotFound']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -395,14 +400,14 @@ def __init__(self, dryrun, verbose, role=None, region=None):

def tag(self, resource_arn, tags):
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
stream_name = _arn_to_name(resource_arn)
self._kinesis_add_tags_to_stream(StreamName=stream_name, Tags=tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['ResourceNotFoundException']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -419,13 +424,13 @@ def __init__(self, dryrun, verbose, role=None, region=None):
def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
self._es_add_tags(ARN=resource_arn, TagList=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['ValidationException']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -442,13 +447,13 @@ def __init__(self, dryrun, verbose, role=None, region=None):
def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
self._elasticache_add_tags_to_resource(ResourceName=resource_arn, Tags=aws_tags)
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['CacheClusterNotFound']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -465,13 +470,13 @@ def __init__(self, dryrun, verbose, role=None, region=None):
def tag(self, resource_arn, tags):
aws_tags = _dict_to_aws_tags(tags)
if self.verbose:
print "tagging %s with %s" % (resource_arn, _format_dict(tags))
print("tagging %s with %s" % (resource_arn, _format_dict(tags)))
if not self.dryrun:
try:
self._cloudfront_tag_resource(Resource=resource_arn, Tags={'Items': aws_tags})
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['NoSuchResource']:
print "Resource not found: %s" % resource_arn
print("Resource not found: %s" % resource_arn)
else:
raise exception

Expand All @@ -489,7 +494,7 @@ def tag(self, bucket_name, tags):
try:
response = self._s3_get_bucket_tagging(Bucket=bucket_name)
# add existing tags
for key, value in _aws_tags_to_dict(response.get('TagSet', [])).iteritems():
for (key, value) in _aws_tags_to_dict(response.get('TagSet', [])).items():
if key not in tags:
tags[key] = value
except botocore.exceptions.ClientError as exception:
Expand All @@ -498,13 +503,13 @@ def tag(self, bucket_name, tags):

aws_tags = _dict_to_aws_tags(tags)
if self.verbose:
print "tagging %s with %s" % (bucket_name, _format_dict(tags))
print("tagging %s with %s" % (bucket_name, _format_dict(tags)))
if not self.dryrun:
try:
self._s3_put_bucket_tagging(Bucket=bucket_name, Tagging={'TagSet': aws_tags})
except botocore.exceptions.ClientError as exception:
if exception.response["Error"]["Code"] in ['NoSuchBucket']:
print "Resource not found: %s" % bucket_name
print("Resource not found: %s" % bucket_name)
else:
raise exception

Expand Down

0 comments on commit 38ef5f4

Please sign in to comment.