diff --git a/cumulus/steps/dev_tools/pipeline.py b/cumulus/steps/dev_tools/pipeline.py index e505a0e..c35f484 100644 --- a/cumulus/steps/dev_tools/pipeline.py +++ b/cumulus/steps/dev_tools/pipeline.py @@ -204,8 +204,8 @@ def handle(self, chain_context): ) pipeline_output = troposphere.Output( - "PipelineLogicalName", - Description="Pipeline (logical id)", + "PipelineName", + Description="Code Pipeline", Value=Ref(generic_pipeline), ) diff --git a/cumulus/steps/dev_tools/pipeline_source_action.py b/cumulus/steps/dev_tools/pipeline_source_action.py index abd0330..eabdb19 100644 --- a/cumulus/steps/dev_tools/pipeline_source_action.py +++ b/cumulus/steps/dev_tools/pipeline_source_action.py @@ -5,6 +5,7 @@ import awacs.logs import awacs.s3 import awacs.sts +import troposphere from troposphere import iam, \ codepipeline @@ -42,6 +43,8 @@ def __init__(self, def handle(self, chain_context): print("Adding source action %s." % self.action_name) + template = chain_context.template + policy_name = "CodeBuildPolicy%s" % chain_context.instance_name codebuild_policy = cumulus.policies.codebuild.get_policy_code_build_general_access(policy_name) @@ -81,7 +84,7 @@ def handle(self, chain_context): }, ) - chain_context.template.add_resource(codebuild_role) + template.add_resource(codebuild_role) found_pipelines = TemplateQuery.get_resource_by_type( template=chain_context.template, @@ -98,3 +101,19 @@ def handle(self, chain_context): # TODO accept a parallel action to the previous action, and don't +1 here. first_stage.Actions.append(source_action) + + template.add_output( + troposphere.Output( + "PipelineBucket%s" % self.action_name, + Value=self.s3_bucket_name, + Description="A pipeline source bucket", + ) + ) + template.add_output( + troposphere.Output( + "PipelineTriggerObject%s" % self.action_name, + Value=self.s3_object_key, + Description="An s3 object key in the pipeline bucket " + "that will trigger the pipeline", + ) + ) diff --git a/cumulus/steps/dev_tools/pipeline_source_action_code_commit.py b/cumulus/steps/dev_tools/pipeline_source_action_code_commit.py index 440e119..ff71b93 100644 --- a/cumulus/steps/dev_tools/pipeline_source_action_code_commit.py +++ b/cumulus/steps/dev_tools/pipeline_source_action_code_commit.py @@ -5,6 +5,7 @@ import awacs.logs import awacs.s3 import awacs.sts +import troposphere from troposphere import iam, \ codepipeline, Ref @@ -38,6 +39,7 @@ def __init__(self, def handle(self, chain_context): print("Adding source action %s." % self.action_name) + template = chain_context.template policy_name = "CodeBuildPolicy%s" % chain_context.instance_name codebuild_policy = cumulus.policies.codebuild.get_policy_code_build_general_access(policy_name) @@ -78,7 +80,7 @@ def handle(self, chain_context): }, ) - chain_context.template.add_resource(codebuild_role) + template.add_resource(codebuild_role) found_pipelines = TemplateQuery.get_resource_by_type( template=chain_context.template, @@ -95,3 +97,17 @@ def handle(self, chain_context): # TODO accept a parallel action to the previous action, and don't +1 here. first_stage.Actions.append(source_action) + + template.add_output( + troposphere.Output( + "RepoName%s" % self.action_name, + Value=Ref("RepositoryName") + ) + ) + + template.add_output( + troposphere.Output( + "RepoBranch%s" % self.action_name, + Value=Ref("RepositoryBranch") + ) + )