Skip to content

Commit 61815c0

Browse files
authored
PLFM-9253: Changes to support using Code Pipeline with Synapse (#1512)
PLFM-9253: Allow code pipeline roles to access synapse dev KMS key; update description of CMK policy statements
1 parent 80d2390 commit 61815c0

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

org-formation/650-identity-providers/_tasks.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ GithubOidcSageBionetworksSynapseBuild:
204204
- owner: "Sage-Bionetworks"
205205
name: "Synapse-Repository-Services"
206206
branches: ["*"]
207+
- owner: "Sage-Bionetworks"
208+
name: "Synapse-Stack-Builder"
209+
branches: ["develop"]
207210
- owner: "brucehoff"
208211
name: "Synapse-Repository-Services"
209212
branches: ["*"]

sceptre/synapsedev/templates/SynapseCMK-template.json

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
"Id": "key-default-1",
310310
"Statement": [
311311
{
312-
"Sid": "Deny administration of the key",
312+
"Sid": "Deny administration of the key to unapproved IAM entities",
313313
"Effect": "Deny",
314314
"Principal": {
315315
"AWS": "*"
@@ -325,29 +325,18 @@
325325
{ "Fn::ImportValue": "us-east-1-accounts-AWSIAMAdminRoleArn" },
326326
{ "Fn::GetAtt": [ "SynapseDeploymentRole", "Arn" ] },
327327
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/sagebase-github-oidc-sage-bionetworks-it" },
328-
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/aws-reserved/sso.amazonaws.com/AWSReservedSSO_Administrator_693a85eb20cd5043" }
328+
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/aws-reserved/sso.amazonaws.com/AWSReservedSSO_Administrator_693a85eb20cd5043" },
329+
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/Synapse-Build-*-CodeBuildServiceRole" },
330+
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/Deployment-Pipeline-CodeBuildServiceRole" }
329331
]
330332
}
331333
}
332334
},
333335
{
334-
"Sid": "Allow root administration of the key",
336+
"Sid": "Allow administration of the key to those not denied access.",
335337
"Effect": "Allow",
336338
"Principal": {
337-
"AWS": [
338-
{
339-
"Fn::GetAtt": [
340-
"SynapseDeploymentRole",
341-
"Arn"
342-
]
343-
},
344-
{
345-
"Fn::ImportValue": "us-east-1-accounts-AWSIAMAdminRoleArn"
346-
},
347-
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:root" },
348-
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/sagebase-github-oidc-sage-bionetworks-it" },
349-
{ "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:role/aws-reserved/sso.amazonaws.com/AWSReservedSSO_Administrator_693a85eb20cd5043" }
350-
]
339+
"AWS": "*"
351340
},
352341
"Action": [
353342
"kms:*"

0 commit comments

Comments
 (0)