Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use named kwargs rather than args when calling s3 put (#830)

This commit is contained in:
Paul Borg 2017-06-21 04:28:19 +10:00 committed by kevgliss
parent ef08e02333
commit 541fbc9a6d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lemur/plugins/lemur_aws/plugin.py
View File

@ -105,7 +105,8 @@ def get_elb_endpoints(account_number, region, elb_dict):
) )
if listener['PolicyNames']: if listener['PolicyNames']:
policy = elb.describe_load_balancer_policies(elb_dict['LoadBalancerName'], listener['PolicyNames'], account_number=account_number, region=region) policy = elb.describe_load_balancer_policies(elb_dict['LoadBalancerName'], listener['PolicyNames'],
account_number=account_number, region=region)
endpoint['policy'] = format_elb_cipher_policy(policy) endpoint['policy'] = format_elb_cipher_policy(policy)
endpoints.append(endpoint) endpoints.append(endpoint)
@ -122,7 +123,8 @@ def get_elb_endpoints_v2(account_number, region, elb_dict):
:return: :return:
""" """
endpoints = [] endpoints = []
listeners = elb.describe_listeners_v2(account_number=account_number, region=region, LoadBalancerArn=elb_dict['LoadBalancerArn']) listeners = elb.describe_listeners_v2(account_number=account_number, region=region,
LoadBalancerArn=elb_dict['LoadBalancerArn'])
for listener in listeners['Listeners']: for listener in listeners['Listeners']:
if not listener.get('Certificates'): if not listener.get('Certificates'):
continue continue
@ -212,7 +214,8 @@ class AWSSourcePlugin(SourcePlugin):
def get_certificates(self, options, **kwargs): def get_certificates(self, options, **kwargs):
cert_data = iam.get_all_certificates(account_number=self.get_option('accountNumber', options)) cert_data = iam.get_all_certificates(account_number=self.get_option('accountNumber', options))
return [dict(body=c['CertificateBody'], chain=c.get('CertificateChain'), name=c['ServerCertificateMetadata']['ServerCertificateName']) for c in cert_data] return [dict(body=c['CertificateBody'], chain=c.get('CertificateChain'),
name=c['ServerCertificateMetadata']['ServerCertificateName']) for c in cert_data]
def get_endpoints(self, options, **kwargs): def get_endpoints(self, options, **kwargs):
endpoints = [] endpoints = []
@ -249,8 +252,10 @@ class AWSSourcePlugin(SourcePlugin):
arn = iam.create_arn_from_cert(account_number, region, certificate.name) arn = iam.create_arn_from_cert(account_number, region, certificate.name)
if endpoint.type == 'elbv2': if endpoint.type == 'elbv2':
listener_arn = elb.get_listener_arn_from_endpoint(endpoint.name, endpoint.port, account_number=account_number, region=region) listener_arn = elb.get_listener_arn_from_endpoint(endpoint.name, endpoint.port,
elb.attach_certificate_v2(listener_arn, endpoint.port, [{'CertificateArn': arn}], account_number=account_number, region=region) account_number=account_number, region=region)
elb.attach_certificate_v2(listener_arn, endpoint.port, [{'CertificateArn': arn}],
account_number=account_number, region=region)
else: else:
elb.attach_certificate(endpoint.name, endpoint.port, arn, account_number=account_number, region=region) elb.attach_certificate(endpoint.name, endpoint.port, arn, account_number=account_number, region=region)
@ -276,7 +281,7 @@ class S3DestinationPlugin(DestinationPlugin):
'helpMessage': 'Must be a valid S3 bucket name!', 'helpMessage': 'Must be a valid S3 bucket name!',
}, },
{ {
'name': 'accountNumber', 'name': 'account_number',
'type': 'str', 'type': 'str',
'required': True, 'required': True,
'validation': '/^[0-9]{12,12}$/', 'validation': '/^[0-9]{12,12}$/',
@ -326,13 +331,13 @@ class S3DestinationPlugin(DestinationPlugin):
for data, ext in files: for data, ext in files:
s3.put( s3.put(
self.get_option('accountNumber', options), account_number=self.get_option('account_number', options),
self.get_option('region', options), region=self.get_option('region', options),
self.get_option('bucket', options), bucket_name=self.get_option('bucket', options),
'{prefix}/{name}{extension}'.format( prefix='{prefix}/{name}{extension}'.format(
prefix=self.get_option('prefix', options), prefix=self.get_option('prefix', options),
name=name, name=name,
extension=ext), extension=ext),
self.get_option('encrypt', options), data=data,
data encrypt=self.get_option('encrypt', options)
) )