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.

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

Fix repository creation permission in pipeline management #536

Merged
merged 1 commit into from
Oct 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,8 @@ Resources:
Principal:
AWS:
- !GetAtt PipelineProvisionerCodeBuildRole.Arn
- !GetAtt PipelineManagementApplication.Outputs.CreateRepositoryLambdaRoleArn
- !GetAtt PipelineManagementApplication.Outputs.CreateOrUpdateRuleLambdaRoleArn
Action:
- sts:AssumeRole
Path: /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def lambda_handler(pipeline, _):
"""Main Lambda Entry point"""
parameter_store = ParameterStore(DEPLOYMENT_ACCOUNT_REGION, boto3)
auto_create_repositories = parameter_store.fetch_parameter(
"auto_create_repositories"
)
"auto_create_repositories"
)
LOGGER.info(auto_create_repositories)
if auto_create_repositories == "enabled":
code_account_id = (
Expand All @@ -46,11 +46,17 @@ def lambda_handler(pipeline, _):
and not has_custom_repo
):
repo = Repo(
code_account_id, pipeline.get("name"), pipeline.get("description")
code_account_id,
pipeline.get("name"),
pipeline.get("description"),
)
repo.create_update()
METRICS.put_metric_data(
{"MetricName": "CreateOrUpdate", "Value": 1, "Unit": "Count"}
{
"MetricName": "CreateOrUpdate",
"Value": 1,
"Unit": "Count",
}
)

return pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ Resources:
Type: "AWS::IAM::Role"
Properties:
Path: "/adf-automation/"
RoleName: "adf-pipeline-create-update-rule"
AssumeRolePolicyDocument:
Version: "2012-10-17"
Statement:
Expand All @@ -164,6 +165,7 @@ Resources:
Type: "AWS::IAM::Role"
Properties:
Path: "/adf-automation/"
RoleName: "adf-pipeline-create-repository"
AssumeRolePolicyDocument:
Version: "2012-10-17"
Statement:
Expand Down Expand Up @@ -1006,3 +1008,9 @@ Resources:
Outputs:
Bucket:
Value: !Ref ADFPipelineBucket

CreateOrUpdateRuleLambdaRoleArn:
Value: !GetAtt CreateOrUpdateRuleLambdaRole.Arn

CreateRepositoryLambdaRoleArn:
Value: !GetAtt CreateRepositoryLambdaRole.Arn
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ Resources:
Principal:
AWS:
- !Sub arn:${AWS::Partition}:iam::${DeploymentAccountId}:role/adf-pipeline-provisioner-codebuild-role
- !Sub arn:${AWS::Partition}:iam::${DeploymentAccountId}:role/adf-automation/adf-pipeline-create-update-rule
- !Sub arn:${AWS::Partition}:iam::${DeploymentAccountId}:role/adf-automation/adf-pipeline-create-repository
Action:
- sts:AssumeRole
Path: /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,19 @@ def __init__(self, account_id, name, description=''):

def repo_exists(self):
try:
codecommit = self.session.client('codecommit', DEPLOYMENT_ACCOUNT_REGION)
codecommit = self.session.client(
'codecommit',
DEPLOYMENT_ACCOUNT_REGION,
)
repository = codecommit.get_repository(repositoryName=self.name)
if repository['repositoryMetadata']['Arn']:
return True
except Exception: # pylint: disable=broad-except
LOGGER.debug('Attempted to find the repo %s but it failed.', self.name)
return False # Return False if the Repo Doesnt Exist
except Exception: # pylint: disable=broad-except
LOGGER.debug(
'Attempted to find the repo %s but it failed.',
self.name,
)
return False # Return False if the repository does not exist

def define_repo_parameters(self):
return [{
Expand Down Expand Up @@ -78,8 +84,14 @@ def create_update(self):
_repo_exists = self.repo_exists()
_stack_exists = cloudformation.get_stack_status()
if _repo_exists and not _stack_exists:
# return when the repository exists without a stack (previously made)
# No need to create or update the CloudFormation stack to
# deploy the repository if the repo exists already and it was not
# created with the ADF CodeCommit Repository stack.
return

LOGGER.info(f"Ensuring State for CodeCommit Repository Stack {self.name} on Account {self.account_id}")
LOGGER.info(
"Ensuring State for CodeCommit Repository Stack %s on Account %s",
self.name,
self.account_id,
)
cloudformation.create_stack()