-
Notifications
You must be signed in to change notification settings - Fork 237
Ability to use codestar sources in deployment map #312
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -436,6 +436,10 @@ Resources: | |
| Resource: | ||
| - !Sub arn:aws:codepipeline:${AWS::Region}:${AWS::AccountId}:webhook:adf-webhook-* | ||
| - !Sub arn:aws:codepipeline:${AWS::Region}:${AWS::AccountId}:${PipelinePrefix}* | ||
| - Effect: Allow | ||
| Action: | ||
| - "codestar-connections:*" | ||
|
||
| Resource: "*" | ||
| Roles: | ||
| - !Ref PipelineProvisionerCodeBuildRole | ||
| CloudFormationRole: | ||
|
|
@@ -894,6 +898,11 @@ Resources: | |
| - elasticbeanstalk.amazonaws.com | ||
| - ec2.amazonaws.com | ||
| - ecs-tasks.amazonaws.com | ||
| - Effect: Allow | ||
| Sid: "AllowCodeStarConnections" | ||
| Action: | ||
| - "codestar-connections:*" | ||
|
||
| Resource: "*" | ||
| Roles: | ||
| - !Ref CodePipelineRole | ||
| PipelineBucketPolicy: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,6 +59,18 @@ pipelines: | |
| - path: /banking/testing | ||
| name: fancy-name | ||
|
|
||
| - name: sample-ecs-app | ||
| default_providers: # if we omit build and deploy type we get a default of codebuild as the build and cloudformation as the deploy. if using codecommit, account_id is required | ||
| source: | ||
| provider: codestar | ||
| properties: | ||
| repository: my-ecs-app # Optional, above name property will be used if this is not specified | ||
| owner: github-enterprise-team-org | ||
| codestar_connection_path: /ghes/connection1/arn # The path in AWS Systems Manager Parameter Store that holds the AWS CodeStar Connection arn | ||
|
||
| params: | ||
| notification_endpoint: [email protected] | ||
|
||
| targets: | ||
| - [ /ecoin/testing, /ephone/testing ] | ||
|
||
|
|
||
| - name: sample-custom # using a custom pipeline, we can execute code within CodeBuild to perform whichever tasks are required. | ||
| default_providers: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
|
|
||
| import os | ||
| import json | ||
| import boto3 | ||
|
|
||
| from aws_cdk import ( | ||
| aws_codepipeline as _codepipeline, | ||
|
|
@@ -91,6 +92,22 @@ def _generate_configuration(self): #pylint: disable=R0912, R0911, R0915 | |
| 'properties', {}).get( | ||
| 'object_key') | ||
| } | ||
| if self.provider == "CodeStarSourceConnection": | ||
| owner = self.map_params.get('default_providers', {}).get('source').get('properties', {}).get('owner', {}) | ||
| repo = self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('repository', {}) or self.map_params['name'] | ||
| codestar_connection_path = self.map_params.get('default_providers', {}).get('source').get('properties', {}).get('codestar_connection_path', {}) | ||
| ssm_client = boto3.client('ssm') | ||
| try: | ||
| response = ssm_client.get_parameter(Name=codestar_connection_path) | ||
| except Exception as e: | ||
| print(f"No parameter found at {codestar_connection_path}. Check the path/value.") | ||
|
||
| raise e | ||
| connection_arn = response['Parameter']['Value'] | ||
| return { | ||
| "ConnectionArn": connection_arn, | ||
| "FullRepositoryId": f"{owner}/{repo}", | ||
| "BranchName": self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', {}) or 'master' | ||
| } | ||
| if self.provider == "GitHub": | ||
| return { | ||
| "Owner": self.map_params.get('default_providers', {}).get('source').get('properties', {}).get('owner', {}), | ||
|
|
@@ -238,6 +255,8 @@ def _generate_codepipeline_access_role(self): #pylint: disable=R0911 | |
| return "arn:aws:iam::{0}:role/adf-codecommit-role".format(self.map_params['default_providers']['source']['properties']['account_id']) | ||
| if self.provider == "GitHub": | ||
| return None | ||
| if self.provider == "CodeStarSourceConnection": | ||
| return None | ||
| if self.provider == "CodeBuild": | ||
| return None | ||
| if self.provider == "S3" and self.category == "Source": | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # SPDX-License-Identifier: MIT-0 | ||
|
|
||
| """Construct related to CodeStarConnection Codepipeline Input | ||
| """ | ||
|
|
||
| import os | ||
|
|
||
| from aws_cdk import ( | ||
| aws_codepipeline as _codepipeline, | ||
| core | ||
| ) | ||
|
|
||
| from cdk_constructs.adf_codepipeline import Action | ||
|
|
||
| ADF_DEPLOYMENT_REGION = os.environ["AWS_REGION"] | ||
| ADF_DEPLOYMENT_ACCOUNT_ID = os.environ["ACCOUNT_ID"] | ||
| ADF_DEFAULT_BUILD_TIMEOUT = 20 | ||
|
|
||
|
|
||
| class CodeStar(core.Construct): | ||
| def __init__(self, scope: core.Construct, id: str, map_params: dict, **kwargs): #pylint: disable=W0622 | ||
| super().__init__(scope, id, **kwargs) | ||
| self.source = _codepipeline.CfnPipeline.StageDeclarationProperty( | ||
| name="Source-CodeStar", | ||
| actions=[ | ||
| Action( | ||
| name="source", | ||
| provider="CodeStarSourceConnection", | ||
| owner="AWS", | ||
| category="Source", | ||
| run_order=1, | ||
| map_params=map_params, | ||
| action_name="source" | ||
| ).config | ||
| ] | ||
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a newline above the Properties title here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done