ZeroDownTime
/
CloudBender
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Implement S3 support for CFN operations

This commit is contained in:
Stefan Reimer 2020-08-12 17:20:37 +01:00
parent 16f5c2be90
commit 3738f3fcdc
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloudbender/connection.py
View File

@ -41,10 +41,12 @@ class BotoConnection():
def _get_client(self, service, profile=None, region=None): def _get_client(self, service, profile=None, region=None):
if self._clients.get((profile, region, service)): if self._clients.get((profile, region, service)):
logger.debug("Reusing boto session for {} {} {}".format(profile, region, service))
return self._clients[(profile, region, service)] return self._clients[(profile, region, service)]
session = self._get_session(profile, region) session = self._get_session(profile, region)
client = boto3.Session(botocore_session=session).client(service) client = boto3.Session(botocore_session=session).client(service)
logger.debug("New boto session for {} {} {}".format(profile, region, service))
self._clients[(profile, region, service)] = client self._clients[(profile, region, service)] = client
return client return client
@ -53,6 +55,7 @@ class BotoConnection():
while True: while True:
try: try:
client = self._get_client(service, profile, region) client = self._get_client(service, profile, region)
logger.debug("Calling {}:{}".format(client, command))
return getattr(client, command)(**kwargs) return getattr(client, command)(**kwargs)
except botocore.exceptions.ClientError as e: except botocore.exceptions.ClientError as e:

62
cloudbender/stack.py
View File

@ -540,16 +540,16 @@ class Stack(object):
self.resolve_parameters() self.resolve_parameters()
logger.info('Creating {0} {1}'.format(self.region, self.stackname)) logger.info('Creating {0} {1}'.format(self.region, self.stackname))
kwargs = {'StackName': self.stackname,
'Parameters': self.cfn_parameters,
'OnFailure': self.onfailure,
'NotificationARNs': self.notfication_sns,
'Tags': [{"Key": str(k), "Value": str(v)} for k, v in self.tags.items()],
'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND']}
kwargs = self._add_template_arg(kwargs)
self.aws_stackid = self.connection_manager.call( self.aws_stackid = self.connection_manager.call(
'cloudformation', 'create_stack', 'cloudformation', 'create_stack', kwargs, profile=self.profile, region=self.region)
{'StackName': self.stackname,
'TemplateBody': self.cfn_template,
'Parameters': self.cfn_parameters,
'OnFailure': self.onfailure,
'NotificationARNs': self.notfication_sns,
'Tags': [{"Key": str(k), "Value": str(v)} for k, v in self.tags.items()],
'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND']},
profile=self.profile, region=self.region)
status = self._wait_for_completion() status = self._wait_for_completion()
self.get_outputs() self.get_outputs()
@ -565,15 +565,15 @@ class Stack(object):
logger.info('Updating {0} {1}'.format(self.region, self.stackname)) logger.info('Updating {0} {1}'.format(self.region, self.stackname))
try: try:
kwargs = {'StackName': self.stackname,
'Parameters': self.cfn_parameters,
'NotificationARNs': self.notfication_sns,
'Tags': [{"Key": str(k), "Value": str(v)} for k, v in self.tags.items()],
'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND']}
kwargs = self._add_template_arg(kwargs)
self.aws_stackid = self.connection_manager.call( self.aws_stackid = self.connection_manager.call(
'cloudformation', 'update_stack', 'cloudformation', 'update_stack', kwargs, profile=self.profile, region=self.region)
{'StackName': self.stackname,
'TemplateBody': self.cfn_template,
'Parameters': self.cfn_parameters,
'NotificationARNs': self.notfication_sns,
'Tags': [{"Key": str(k), "Value": str(v)} for k, v in self.tags.items()],
'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND']},
profile=self.profile, region=self.region)
except ClientError as e: except ClientError as e:
if 'No updates are to be performed' in e.response['Error']['Message']: if 'No updates are to be performed' in e.response['Error']['Message']:
@ -607,15 +607,15 @@ class Stack(object):
self.read_template_file() self.read_template_file()
logger.info('Creating change set {0} for stack {1}'.format(change_set_name, self.stackname)) logger.info('Creating change set {0} for stack {1}'.format(change_set_name, self.stackname))
kwargs = {'StackName': self.stackname,
'ChangeSetName': change_set_name,
'Parameters': self.cfn_parameters,
'Tags': [{"Key": str(k), "Value": str(v)} for k, v in self.tags.items()],
'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM']}
kwargs = self._add_template_arg(kwargs)
self.connection_manager.call( self.connection_manager.call(
'cloudformation', 'create_change_set', 'cloudformation', 'create_change_set', kwargs, profile=self.profile, region=self.region)
{'StackName': self.stackname,
'ChangeSetName': change_set_name,
'TemplateBody': self.cfn_template,
'Parameters': self.cfn_parameters,
'Tags': [{"Key": str(k), "Value": str(v)} for k, v in self.tags.items()],
'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM']},
profile=self.profile, region=self.region)
return self._wait_for_completion() return self._wait_for_completion()
def get_status(self): def get_status(self):
@ -758,3 +758,15 @@ class Stack(object):
# Add outputs from stacks into the data for jinja under StackOutput # Add outputs from stacks into the data for jinja under StackOutput
return stack_outputs return stack_outputs
def _add_template_arg(self, kwargs):
if self.template_bucket_url:
# https://bucket-name.s3.Region.amazonaws.com/key name
# so we need the region, AWS as usual
(bucket, path) = get_s3_url(self.template_bucket_url, self.rel_path, self.stackname + ".yaml")
bucket_region = self.connection_manager.call('s3', 'get_bucket_location', {'Bucket': bucket}, profile=self.profile, region=self.region)['LocationConstraint']
kwargs['TemplateURL'] = 'https://{}.s3.{}.amazonaws.com/{}'.format(bucket, bucket_region, path)
else:
kwargs['TemplateBody'] = self.cfn_template
return kwargs