Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix naming for pipeline role and CodeBuild projects. Make physical na… #24

Merged
merged 1 commit into from
Oct 15, 2018
Merged

Fix naming for pipeline role and CodeBuild projects. Make physical na… #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cumulus/steps/dev_tools/code_build_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ def __init__(self,
def handle(self, chain_context):

print("Adding action %s Stage." % self.action_name)
suffix = "%s%s" % (self.stage_name_to_add, self.action_name)
full_action_name = "%s%s" % (self.stage_name_to_add, self.action_name)

policy_name = "CodeBuildPolicy%s" % chain_context.instance_name
role_name = "CodeBuildRole%s" % suffix
policy_name = "%sCodeBuildPolicy" % chain_context.instance_name
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't a managed policy so we won't see the name in AWS, but I guess it asks the question if consistency even here would be helpful? Suffix vs prefix...

role_name = "CodeBuildRole%s" % full_action_name

codebuild_role = iam.Role(
role_name,
Expand Down Expand Up @@ -91,7 +91,7 @@ def handle(self, chain_context):
chain_context=chain_context,
codebuild_role=codebuild_role,
codebuild_environment=self.environment,
name=self.action_name + suffix,
name=full_action_name,
)

code_build_action = cumulus.types.codebuild.buildaction.CodeBuildAction(
Expand Down Expand Up @@ -145,7 +145,7 @@ def create_project(self, chain_context, codebuild_role, codebuild_environment, n
SecurityGroupIds=[Ref(sg)],
)}

project_name = "project%s" % name
project_name = "Project%s" % name

print("Action %s is using buildspec: " % self.action_name)
print(self.buildspec)
Expand All @@ -155,7 +155,7 @@ def create_project(self, chain_context, codebuild_role, codebuild_environment, n
DependsOn=codebuild_role,
Artifacts=artifacts,
Environment=codebuild_environment,
Name=project_name,
Name="%s-%s" % (chain_context.instance_name, project_name),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is different too. It has a dash.

I'm sure there are a bunch of other inconsistencies.. so not asking for a change in this PR, but I'll create an issue on this board to address it.

ServiceRole=troposphere.GetAtt(codebuild_role, 'Arn'),
Source=codebuild.Source(
"Deploy",
Expand Down
2 changes: 1 addition & 1 deletion cumulus/steps/dev_tools/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def handle(self, chain_context):
"""
# TODO: let (force?) bucket to be injected.
pipeline_bucket = Bucket(
"pipelinebucket%s" % chain_context.instance_name,
"PipelineBucket%s" % self.name,
BucketName=self.bucket_name,
VersioningConfiguration=VersioningConfiguration(
Status="Enabled"
Expand Down