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.

Sign up for GitHub

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

Jump to bottom

fix(synthetics): generated role has incorrect permissions for cloudwatch logs #18946

Merged
merged 4 commits into from
Feb 14, 2022
Merged

fix(synthetics): generated role has incorrect permissions for cloudwatch logs #18946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a534f8
fix(synthetics): incorrect permissions for cloudwatch logs
kaizencc Feb 11, 2022
4b0d102
Merge branch 'master' into conroy/canary
kaizencc Feb 11, 2022
8234130
Merge branch 'master' into conroy/canary
mergify[bot] Feb 14, 2022
2eb4f7e
Merge branch 'master' into conroy/canary
kaizencc Feb 14, 2022
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
12 changes: 10 additions & 2 deletions packages/@aws-cdk/aws-synthetics/lib/canary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ export class Canary extends cdk.Resource {
* Returns a default role for the canary
*/
private createDefaultRole(prefix?: string): iam.IRole {
const { partition } = cdk.Stack.of(this);
// Created role will need these policies to run the Canary.
// https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-executionrolearn
const policy = new iam.PolicyDocument({
Expand All @@ -313,7 +312,7 @@ export class Canary extends cdk.Resource {
conditions: { StringEquals: { 'cloudwatch:namespace': 'CloudWatchSynthetics' } },
}),
new iam.PolicyStatement({
resources: [`arn:${partition}:logs:::*`],
resources: [this.logGroupArn()],
actions: ['logs:CreateLogStream', 'logs:CreateLogGroup', 'logs:PutLogEvents'],
}),
],
Expand All @@ -327,6 +326,15 @@ export class Canary extends cdk.Resource {
});
}

private logGroupArn() {
return cdk.Stack.of(this).formatArn({
service: 'logs',
resource: 'log-group',
arnFormat: cdk.ArnFormat.COLON_RESOURCE_NAME,
resourceName: '/aws/lambda/cwsyn-*',
});
}

/**
* Returns the code object taken in by the canary resource.
*/
Expand Down
95 changes: 95 additions & 0 deletions packages/@aws-cdk/aws-synthetics/test/canary.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,3 +440,98 @@ test('can specify custom test', () => {
},
});
});

test('Role policy generated as expected', () => {
// GIVEN
const stack = new Stack();

// WHEN
new synthetics.Canary(stack, 'Canary', {
test: synthetics.Test.custom({
handler: 'index.handler',
code: synthetics.Code.fromInline('/* Synthetics handler code */'),
}),
runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Role', {
Policies: [{
PolicyDocument: {
Statement: [
{
Action: 's3:ListAllMyBuckets',
Effect: 'Allow',
Resource: '*',
},
{
Action: 's3:GetBucketLocation',
Effect: 'Allow',
Resource: {
'Fn::GetAtt': [
'CanaryArtifactsBucket4A60D32B',
'Arn',
],
},
},
{
Action: 's3:PutObject',
Effect: 'Allow',
Resource: {
'Fn::Join': [
'',
[
{
'Fn::GetAtt': [
'CanaryArtifactsBucket4A60D32B',
'Arn',
],
},
'/*',
],
],
},
},
{
Action: 'cloudwatch:PutMetricData',
Condition: {
StringEquals: {
'cloudwatch:namespace': 'CloudWatchSynthetics',
},
},
Effect: 'Allow',
Resource: '*',
},
{
Action: [
'logs:CreateLogStream',
'logs:CreateLogGroup',
'logs:PutLogEvents',
],
Effect: 'Allow',
Resource: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':logs:',
{
Ref: 'AWS::Region',
},
':',
{
Ref: 'AWS::AccountId',
},
':log-group:/aws/lambda/cwsyn-*',
],
],
},
},
],
},
}],
});
});
50 changes: 45 additions & 5 deletions packages/@aws-cdk/aws-synthetics/test/integ.canary.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,15 @@
{
"Ref": "AWS::Partition"
},
":logs:::*"
":logs:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":log-group:/aws/lambda/cwsyn-*"
]
]
}
Expand Down Expand Up @@ -269,7 +277,15 @@
{
"Ref": "AWS::Partition"
},
":logs:::*"
":logs:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":log-group:/aws/lambda/cwsyn-*"
]
]
}
Expand Down Expand Up @@ -490,7 +506,15 @@
{
"Ref": "AWS::Partition"
},
":logs:::*"
":logs:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":log-group:/aws/lambda/cwsyn-*"
]
]
}
Expand Down Expand Up @@ -711,7 +735,15 @@
{
"Ref": "AWS::Partition"
},
":logs:::*"
":logs:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":log-group:/aws/lambda/cwsyn-*"
]
]
}
Expand Down Expand Up @@ -932,7 +964,15 @@
{
"Ref": "AWS::Partition"
},
":logs:::*"
":logs:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":log-group:/aws/lambda/cwsyn-*"
]
]
}
Expand Down