Merge pull request #24 from john-shaskin/feature/unique-codepipeline-…

…resource-names Fix naming for pipeline role and CodeBuild projects. Make physical na…
brettswift · Oct 15, 2018 · a66bcc4 · a66bcc4
2 parents 74b26c3 + 3fdf25b
commit a66bcc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cumulus/steps/dev_tools/code_build_action.py b/cumulus/steps/dev_tools/code_build_action.py
@@ -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
+        role_name = "CodeBuildRole%s" % full_action_name
 
         codebuild_role = iam.Role(
             role_name,
@@ -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(
@@ -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)
@@ -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),
             ServiceRole=troposphere.GetAtt(codebuild_role, 'Arn'),
             Source=codebuild.Source(
                 "Deploy",

diff --git a/cumulus/steps/dev_tools/pipeline.py b/cumulus/steps/dev_tools/pipeline.py
@@ -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"