From d5a7c50fa2d4f21ec5a0ed3d5c5c022e5e1cd524 Mon Sep 17 00:00:00 2001 From: Zainab Date: Fri, 6 Dec 2019 09:24:31 +0800 Subject: [PATCH 1/2] feat(policy-template): adding cloudwatch:describeAlarmHistory policy (#1264) --- .../all_policy_templates.yaml | 2 + .../policy_templates.json | 15 +++ .../input/all_policy_templates.yaml | 2 + .../output/all_policy_templates.json | 112 ++++++++++-------- .../output/aws-cn/all_policy_templates.json | 112 ++++++++++-------- .../aws-us-gov/all_policy_templates.json | 112 ++++++++++-------- 6 files changed, 208 insertions(+), 147 deletions(-) diff --git a/examples/2016-10-31/policy_templates/all_policy_templates.yaml b/examples/2016-10-31/policy_templates/all_policy_templates.yaml index 6b25355d7..c37661d54 100644 --- a/examples/2016-10-31/policy_templates/all_policy_templates.yaml +++ b/examples/2016-10-31/policy_templates/all_policy_templates.yaml @@ -14,6 +14,8 @@ Resources: - LambdaInvokePolicy: FunctionName: name + - CloudWatchDescribeAlarmHistoryPolicy: {} + - CloudWatchPutMetricPolicy: {} - EC2DescribePolicy: {} diff --git a/samtranslator/policy_templates_data/policy_templates.json b/samtranslator/policy_templates_data/policy_templates.json index f44f171ad..7f6854457 100644 --- a/samtranslator/policy_templates_data/policy_templates.json +++ b/samtranslator/policy_templates_data/policy_templates.json @@ -62,6 +62,21 @@ ] } }, + "CloudWatchDescribeAlarmHistoryPolicy": { + "Description": "Gives permissions to describe CloudWatch alarm history", + "Parameters": {}, + "Definition": { + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "cloudwatch:DescribeAlarmHistory" + ], + "Resource": "*" + } + ] + } + }, "CloudWatchPutMetricPolicy": { "Description": "Gives permissions to put metrics to CloudWatch", "Parameters": { diff --git a/tests/translator/input/all_policy_templates.yaml b/tests/translator/input/all_policy_templates.yaml index f48a6abd9..ebf5b2c7a 100644 --- a/tests/translator/input/all_policy_templates.yaml +++ b/tests/translator/input/all_policy_templates.yaml @@ -18,6 +18,8 @@ Resources: - LambdaInvokePolicy: FunctionName: name + - CloudWatchDescribeAlarmHistoryPolicy: {} + - CloudWatchPutMetricPolicy: {} - EC2DescribePolicy: {} diff --git a/tests/translator/output/all_policy_templates.json b/tests/translator/output/all_policy_templates.json index 835d4e53f..0a5e71689 100644 --- a/tests/translator/output/all_policy_templates.json +++ b/tests/translator/output/all_policy_templates.json @@ -89,7 +89,7 @@ "Statement": [ { "Action": [ - "cloudwatch:PutMetricData" + "cloudwatch:DescribeAlarmHistory" ], "Resource": "*", "Effect": "Allow" @@ -99,6 +99,20 @@ }, { "PolicyName": "KitchenSinkFunctionRolePolicy3", + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "cloudwatch:PutMetricData" + ], + "Resource": "*", + "Effect": "Allow" + } + ] + } + }, + { + "PolicyName": "KitchenSinkFunctionRolePolicy4", "PolicyDocument": { "Statement": [ { @@ -113,7 +127,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy4", + "PolicyName": "KitchenSinkFunctionRolePolicy5", "PolicyDocument": { "Statement": [ { @@ -154,7 +168,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy5", + "PolicyName": "KitchenSinkFunctionRolePolicy6", "PolicyDocument": { "Statement": [ { @@ -189,7 +203,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy6", + "PolicyName": "KitchenSinkFunctionRolePolicy7", "PolicyDocument": { "Statement": [ { @@ -210,7 +224,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy7", + "PolicyName": "KitchenSinkFunctionRolePolicy8", "PolicyDocument": { "Statement": [ { @@ -232,7 +246,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy8", + "PolicyName": "KitchenSinkFunctionRolePolicy9", "PolicyDocument": { "Statement": [ { @@ -267,7 +281,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy9", + "PolicyName": "KitchenSinkFunctionRolePolicy10", "PolicyDocument": { "Statement": [ { @@ -306,7 +320,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy10", + "PolicyName": "KitchenSinkFunctionRolePolicy11", "PolicyDocument": { "Statement": [ { @@ -322,7 +336,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy11", + "PolicyName": "KitchenSinkFunctionRolePolicy12", "PolicyDocument": { "Statement": [ { @@ -338,7 +352,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy12", + "PolicyName": "KitchenSinkFunctionRolePolicy13", "PolicyDocument": { "Statement": [ { @@ -362,7 +376,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy13", + "PolicyName": "KitchenSinkFunctionRolePolicy14", "PolicyDocument": { "Statement": [ { @@ -386,7 +400,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy14", + "PolicyName": "KitchenSinkFunctionRolePolicy15", "PolicyDocument": { "Statement": [ { @@ -408,7 +422,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy15", + "PolicyName": "KitchenSinkFunctionRolePolicy16", "PolicyDocument": { "Statement": [ { @@ -429,7 +443,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy16", + "PolicyName": "KitchenSinkFunctionRolePolicy17", "PolicyDocument": { "Statement": [ { @@ -450,7 +464,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy17", + "PolicyName": "KitchenSinkFunctionRolePolicy18", "PolicyDocument": { "Statement": [ { @@ -467,7 +481,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy18", + "PolicyName": "KitchenSinkFunctionRolePolicy19", "PolicyDocument": { "Statement": [ { @@ -492,7 +506,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy19", + "PolicyName": "KitchenSinkFunctionRolePolicy20", "PolicyDocument": { "Statement": [ { @@ -525,7 +539,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy20", + "PolicyName": "KitchenSinkFunctionRolePolicy21", "PolicyDocument": { "Statement": [ { @@ -549,7 +563,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy21", + "PolicyName": "KitchenSinkFunctionRolePolicy22", "PolicyDocument": { "Statement": [ { @@ -574,7 +588,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy22", + "PolicyName": "KitchenSinkFunctionRolePolicy23", "PolicyDocument": { "Statement": [ { @@ -607,7 +621,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy23", + "PolicyName": "KitchenSinkFunctionRolePolicy24", "PolicyDocument": { "Statement": [ { @@ -626,7 +640,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy24", + "PolicyName": "KitchenSinkFunctionRolePolicy25", "PolicyDocument": { "Statement": [ { @@ -664,7 +678,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy25", + "PolicyName": "KitchenSinkFunctionRolePolicy26", "PolicyDocument": { "Statement": [ { @@ -717,7 +731,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy26", + "PolicyName": "KitchenSinkFunctionRolePolicy27", "PolicyDocument": { "Statement": [ { @@ -732,7 +746,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy27", + "PolicyName": "KitchenSinkFunctionRolePolicy28", "PolicyDocument": { "Statement": [ { @@ -756,7 +770,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy28", + "PolicyName": "KitchenSinkFunctionRolePolicy29", "PolicyDocument": { "Statement": [ { @@ -777,7 +791,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy29", + "PolicyName": "KitchenSinkFunctionRolePolicy30", "PolicyDocument": { "Statement": [ { @@ -798,7 +812,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy30", + "PolicyName": "KitchenSinkFunctionRolePolicy31", "PolicyDocument": { "Statement": [ { @@ -815,7 +829,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy31", + "PolicyName": "KitchenSinkFunctionRolePolicy32", "PolicyDocument": { "Statement": [ { @@ -830,7 +844,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy32", + "PolicyName": "KitchenSinkFunctionRolePolicy33", "PolicyDocument": { "Statement": [ { @@ -845,7 +859,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy33", + "PolicyName": "KitchenSinkFunctionRolePolicy34", "PolicyDocument": { "Statement": [ { @@ -883,7 +897,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy34", + "PolicyName": "KitchenSinkFunctionRolePolicy35", "PolicyDocument": { "Statement": [ { @@ -924,7 +938,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy35", + "PolicyName": "KitchenSinkFunctionRolePolicy36", "PolicyDocument": { "Statement": [ { @@ -945,7 +959,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy36", + "PolicyName": "KitchenSinkFunctionRolePolicy37", "PolicyDocument": { "Statement": [ { @@ -983,7 +997,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy37", + "PolicyName": "KitchenSinkFunctionRolePolicy38", "PolicyDocument": { "Statement": [ { @@ -997,7 +1011,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy38", + "PolicyName": "KitchenSinkFunctionRolePolicy39", "PolicyDocument": { "Statement": [ { @@ -1020,7 +1034,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy39", + "PolicyName": "KitchenSinkFunctionRolePolicy40", "PolicyDocument": { "Statement": [ { @@ -1037,7 +1051,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy40", + "PolicyName": "KitchenSinkFunctionRolePolicy41", "PolicyDocument": { "Statement": [ { @@ -1062,7 +1076,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy41", + "PolicyName": "KitchenSinkFunctionRolePolicy42", "PolicyDocument": { "Statement": [ { @@ -1077,7 +1091,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy42", + "PolicyName": "KitchenSinkFunctionRolePolicy43", "PolicyDocument": { "Statement": [{ "Effect": "Allow", @@ -1094,7 +1108,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy43", + "PolicyName": "KitchenSinkFunctionRolePolicy44", "PolicyDocument": { "Statement": [ { @@ -1108,7 +1122,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy44", + "PolicyName": "KitchenSinkFunctionRolePolicy45", "PolicyDocument": { "Statement": [ { @@ -1129,7 +1143,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy45", + "PolicyName": "KitchenSinkFunctionRolePolicy46", "PolicyDocument": { "Statement": [ { @@ -1155,7 +1169,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy46", + "PolicyName": "KitchenSinkFunctionRolePolicy47", "PolicyDocument": { "Statement": [ { @@ -1174,7 +1188,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy47", + "PolicyName": "KitchenSinkFunctionRolePolicy48", "PolicyDocument": { "Statement": [ { @@ -1195,7 +1209,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy48", + "PolicyName": "KitchenSinkFunctionRolePolicy49", "PolicyDocument": { "Statement": [ { @@ -1225,7 +1239,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy49", + "PolicyName": "KitchenSinkFunctionRolePolicy50", "PolicyDocument": { "Statement": [ { @@ -1246,7 +1260,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy50", + "PolicyName": "KitchenSinkFunctionRolePolicy51", "PolicyDocument": { "Statement": [ { @@ -1328,7 +1342,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy51", + "PolicyName": "KitchenSinkFunctionRolePolicy52", "PolicyDocument": { "Statement": [ { diff --git a/tests/translator/output/aws-cn/all_policy_templates.json b/tests/translator/output/aws-cn/all_policy_templates.json index 4acf58a36..1b9e90804 100644 --- a/tests/translator/output/aws-cn/all_policy_templates.json +++ b/tests/translator/output/aws-cn/all_policy_templates.json @@ -89,7 +89,7 @@ "Statement": [ { "Action": [ - "cloudwatch:PutMetricData" + "cloudwatch:DescribeAlarmHistory" ], "Resource": "*", "Effect": "Allow" @@ -99,6 +99,20 @@ }, { "PolicyName": "KitchenSinkFunctionRolePolicy3", + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "cloudwatch:PutMetricData" + ], + "Resource": "*", + "Effect": "Allow" + } + ] + } + }, + { + "PolicyName": "KitchenSinkFunctionRolePolicy4", "PolicyDocument": { "Statement": [ { @@ -113,7 +127,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy4", + "PolicyName": "KitchenSinkFunctionRolePolicy5", "PolicyDocument": { "Statement": [ { @@ -153,7 +167,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy5", + "PolicyName": "KitchenSinkFunctionRolePolicy6", "PolicyDocument": { "Statement": [ { @@ -188,7 +202,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy6", + "PolicyName": "KitchenSinkFunctionRolePolicy7", "PolicyDocument": { "Statement": [ { @@ -209,7 +223,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy7", + "PolicyName": "KitchenSinkFunctionRolePolicy8", "PolicyDocument": { "Statement": [ { @@ -231,7 +245,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy8", + "PolicyName": "KitchenSinkFunctionRolePolicy9", "PolicyDocument": { "Statement": [ { @@ -266,7 +280,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy9", + "PolicyName": "KitchenSinkFunctionRolePolicy10", "PolicyDocument": { "Statement": [ { @@ -305,7 +319,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy10", + "PolicyName": "KitchenSinkFunctionRolePolicy11", "PolicyDocument": { "Statement": [ { @@ -321,7 +335,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy11", + "PolicyName": "KitchenSinkFunctionRolePolicy12", "PolicyDocument": { "Statement": [ { @@ -337,7 +351,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy12", + "PolicyName": "KitchenSinkFunctionRolePolicy13", "PolicyDocument": { "Statement": [ { @@ -361,7 +375,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy13", + "PolicyName": "KitchenSinkFunctionRolePolicy14", "PolicyDocument": { "Statement": [ { @@ -385,7 +399,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy14", + "PolicyName": "KitchenSinkFunctionRolePolicy15", "PolicyDocument": { "Statement": [ { @@ -407,7 +421,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy15", + "PolicyName": "KitchenSinkFunctionRolePolicy16", "PolicyDocument": { "Statement": [ { @@ -428,7 +442,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy16", + "PolicyName": "KitchenSinkFunctionRolePolicy17", "PolicyDocument": { "Statement": [ { @@ -449,7 +463,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy17", + "PolicyName": "KitchenSinkFunctionRolePolicy18", "PolicyDocument": { "Statement": [ { @@ -466,7 +480,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy18", + "PolicyName": "KitchenSinkFunctionRolePolicy19", "PolicyDocument": { "Statement": [ { @@ -491,7 +505,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy19", + "PolicyName": "KitchenSinkFunctionRolePolicy20", "PolicyDocument": { "Statement": [ { @@ -524,7 +538,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy20", + "PolicyName": "KitchenSinkFunctionRolePolicy21", "PolicyDocument": { "Statement": [ { @@ -548,7 +562,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy21", + "PolicyName": "KitchenSinkFunctionRolePolicy22", "PolicyDocument": { "Statement": [ { @@ -573,7 +587,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy22", + "PolicyName": "KitchenSinkFunctionRolePolicy23", "PolicyDocument": { "Statement": [ { @@ -606,7 +620,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy23", + "PolicyName": "KitchenSinkFunctionRolePolicy24", "PolicyDocument": { "Statement": [ { @@ -625,7 +639,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy24", + "PolicyName": "KitchenSinkFunctionRolePolicy25", "PolicyDocument": { "Statement": [ { @@ -663,7 +677,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy25", + "PolicyName": "KitchenSinkFunctionRolePolicy26", "PolicyDocument": { "Statement": [ { @@ -716,7 +730,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy26", + "PolicyName": "KitchenSinkFunctionRolePolicy27", "PolicyDocument": { "Statement": [ { @@ -731,7 +745,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy27", + "PolicyName": "KitchenSinkFunctionRolePolicy28", "PolicyDocument": { "Statement": [ { @@ -755,7 +769,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy28", + "PolicyName": "KitchenSinkFunctionRolePolicy29", "PolicyDocument": { "Statement": [ { @@ -776,7 +790,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy29", + "PolicyName": "KitchenSinkFunctionRolePolicy30", "PolicyDocument": { "Statement": [ { @@ -797,7 +811,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy30", + "PolicyName": "KitchenSinkFunctionRolePolicy31", "PolicyDocument": { "Statement": [ { @@ -814,7 +828,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy31", + "PolicyName": "KitchenSinkFunctionRolePolicy32", "PolicyDocument": { "Statement": [ { @@ -829,7 +843,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy32", + "PolicyName": "KitchenSinkFunctionRolePolicy33", "PolicyDocument": { "Statement": [ { @@ -844,7 +858,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy33", + "PolicyName": "KitchenSinkFunctionRolePolicy34", "PolicyDocument": { "Statement": [ { @@ -882,7 +896,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy34", + "PolicyName": "KitchenSinkFunctionRolePolicy35", "PolicyDocument": { "Statement": [ { @@ -923,7 +937,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy35", + "PolicyName": "KitchenSinkFunctionRolePolicy36", "PolicyDocument": { "Statement": [ { @@ -944,7 +958,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy36", + "PolicyName": "KitchenSinkFunctionRolePolicy37", "PolicyDocument": { "Statement": [ { @@ -982,7 +996,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy37", + "PolicyName": "KitchenSinkFunctionRolePolicy38", "PolicyDocument": { "Statement": [ { @@ -996,7 +1010,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy38", + "PolicyName": "KitchenSinkFunctionRolePolicy39", "PolicyDocument": { "Statement": [ { @@ -1019,7 +1033,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy39", + "PolicyName": "KitchenSinkFunctionRolePolicy40", "PolicyDocument": { "Statement": [ { @@ -1036,7 +1050,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy40", + "PolicyName": "KitchenSinkFunctionRolePolicy41", "PolicyDocument": { "Statement": [ { @@ -1061,7 +1075,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy41", + "PolicyName": "KitchenSinkFunctionRolePolicy42", "PolicyDocument": { "Statement": [ { @@ -1076,7 +1090,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy42", + "PolicyName": "KitchenSinkFunctionRolePolicy43", "PolicyDocument": { "Statement": [{ "Effect": "Allow", @@ -1093,7 +1107,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy43", + "PolicyName": "KitchenSinkFunctionRolePolicy44", "PolicyDocument": { "Statement": [ { @@ -1107,7 +1121,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy44", + "PolicyName": "KitchenSinkFunctionRolePolicy45", "PolicyDocument": { "Statement": [ { @@ -1128,7 +1142,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy45", + "PolicyName": "KitchenSinkFunctionRolePolicy46", "PolicyDocument": { "Statement": [ { @@ -1154,7 +1168,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy46", + "PolicyName": "KitchenSinkFunctionRolePolicy47", "PolicyDocument": { "Statement": [ { @@ -1173,7 +1187,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy47", + "PolicyName": "KitchenSinkFunctionRolePolicy48", "PolicyDocument": { "Statement": [ { @@ -1194,7 +1208,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy48", + "PolicyName": "KitchenSinkFunctionRolePolicy49", "PolicyDocument": { "Statement": [ { @@ -1224,7 +1238,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy49", + "PolicyName": "KitchenSinkFunctionRolePolicy50", "PolicyDocument": { "Statement": [ { @@ -1245,7 +1259,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy50", + "PolicyName": "KitchenSinkFunctionRolePolicy51", "PolicyDocument": { "Statement": [ { @@ -1327,7 +1341,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy51", + "PolicyName": "KitchenSinkFunctionRolePolicy52", "PolicyDocument": { "Statement": [ { diff --git a/tests/translator/output/aws-us-gov/all_policy_templates.json b/tests/translator/output/aws-us-gov/all_policy_templates.json index fabe0b093..9de8a827b 100644 --- a/tests/translator/output/aws-us-gov/all_policy_templates.json +++ b/tests/translator/output/aws-us-gov/all_policy_templates.json @@ -89,7 +89,7 @@ "Statement": [ { "Action": [ - "cloudwatch:PutMetricData" + "cloudwatch:DescribeAlarmHistory" ], "Resource": "*", "Effect": "Allow" @@ -99,6 +99,20 @@ }, { "PolicyName": "KitchenSinkFunctionRolePolicy3", + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "cloudwatch:PutMetricData" + ], + "Resource": "*", + "Effect": "Allow" + } + ] + } + }, + { + "PolicyName": "KitchenSinkFunctionRolePolicy4", "PolicyDocument": { "Statement": [ { @@ -113,7 +127,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy4", + "PolicyName": "KitchenSinkFunctionRolePolicy5", "PolicyDocument": { "Statement": [ { @@ -153,7 +167,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy5", + "PolicyName": "KitchenSinkFunctionRolePolicy6", "PolicyDocument": { "Statement": [ { @@ -188,7 +202,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy6", + "PolicyName": "KitchenSinkFunctionRolePolicy7", "PolicyDocument": { "Statement": [ { @@ -209,7 +223,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy7", + "PolicyName": "KitchenSinkFunctionRolePolicy8", "PolicyDocument": { "Statement": [ { @@ -231,7 +245,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy8", + "PolicyName": "KitchenSinkFunctionRolePolicy9", "PolicyDocument": { "Statement": [ { @@ -266,7 +280,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy9", + "PolicyName": "KitchenSinkFunctionRolePolicy10", "PolicyDocument": { "Statement": [ { @@ -305,7 +319,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy10", + "PolicyName": "KitchenSinkFunctionRolePolicy11", "PolicyDocument": { "Statement": [ { @@ -321,7 +335,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy11", + "PolicyName": "KitchenSinkFunctionRolePolicy12", "PolicyDocument": { "Statement": [ { @@ -337,7 +351,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy12", + "PolicyName": "KitchenSinkFunctionRolePolicy13", "PolicyDocument": { "Statement": [ { @@ -361,7 +375,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy13", + "PolicyName": "KitchenSinkFunctionRolePolicy14", "PolicyDocument": { "Statement": [ { @@ -385,7 +399,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy14", + "PolicyName": "KitchenSinkFunctionRolePolicy15", "PolicyDocument": { "Statement": [ { @@ -407,7 +421,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy15", + "PolicyName": "KitchenSinkFunctionRolePolicy16", "PolicyDocument": { "Statement": [ { @@ -428,7 +442,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy16", + "PolicyName": "KitchenSinkFunctionRolePolicy17", "PolicyDocument": { "Statement": [ { @@ -449,7 +463,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy17", + "PolicyName": "KitchenSinkFunctionRolePolicy18", "PolicyDocument": { "Statement": [ { @@ -466,7 +480,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy18", + "PolicyName": "KitchenSinkFunctionRolePolicy19", "PolicyDocument": { "Statement": [ { @@ -491,7 +505,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy19", + "PolicyName": "KitchenSinkFunctionRolePolicy20", "PolicyDocument": { "Statement": [ { @@ -524,7 +538,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy20", + "PolicyName": "KitchenSinkFunctionRolePolicy21", "PolicyDocument": { "Statement": [ { @@ -548,7 +562,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy21", + "PolicyName": "KitchenSinkFunctionRolePolicy22", "PolicyDocument": { "Statement": [ { @@ -573,7 +587,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy22", + "PolicyName": "KitchenSinkFunctionRolePolicy23", "PolicyDocument": { "Statement": [ { @@ -606,7 +620,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy23", + "PolicyName": "KitchenSinkFunctionRolePolicy24", "PolicyDocument": { "Statement": [ { @@ -625,7 +639,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy24", + "PolicyName": "KitchenSinkFunctionRolePolicy25", "PolicyDocument": { "Statement": [ { @@ -663,7 +677,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy25", + "PolicyName": "KitchenSinkFunctionRolePolicy26", "PolicyDocument": { "Statement": [ { @@ -716,7 +730,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy26", + "PolicyName": "KitchenSinkFunctionRolePolicy27", "PolicyDocument": { "Statement": [ { @@ -731,7 +745,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy27", + "PolicyName": "KitchenSinkFunctionRolePolicy28", "PolicyDocument": { "Statement": [ { @@ -755,7 +769,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy28", + "PolicyName": "KitchenSinkFunctionRolePolicy29", "PolicyDocument": { "Statement": [ { @@ -776,7 +790,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy29", + "PolicyName": "KitchenSinkFunctionRolePolicy30", "PolicyDocument": { "Statement": [ { @@ -797,7 +811,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy30", + "PolicyName": "KitchenSinkFunctionRolePolicy31", "PolicyDocument": { "Statement": [ { @@ -814,7 +828,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy31", + "PolicyName": "KitchenSinkFunctionRolePolicy32", "PolicyDocument": { "Statement": [ { @@ -829,7 +843,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy32", + "PolicyName": "KitchenSinkFunctionRolePolicy33", "PolicyDocument": { "Statement": [ { @@ -844,7 +858,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy33", + "PolicyName": "KitchenSinkFunctionRolePolicy34", "PolicyDocument": { "Statement": [ { @@ -882,7 +896,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy34", + "PolicyName": "KitchenSinkFunctionRolePolicy35", "PolicyDocument": { "Statement": [ { @@ -923,7 +937,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy35", + "PolicyName": "KitchenSinkFunctionRolePolicy36", "PolicyDocument": { "Statement": [ { @@ -944,7 +958,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy36", + "PolicyName": "KitchenSinkFunctionRolePolicy37", "PolicyDocument": { "Statement": [ { @@ -982,7 +996,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy37", + "PolicyName": "KitchenSinkFunctionRolePolicy38", "PolicyDocument": { "Statement": [ { @@ -996,7 +1010,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy38", + "PolicyName": "KitchenSinkFunctionRolePolicy39", "PolicyDocument": { "Statement": [ { @@ -1020,7 +1034,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy39", + "PolicyName": "KitchenSinkFunctionRolePolicy40", "PolicyDocument": { "Statement": [ { @@ -1037,7 +1051,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy40", + "PolicyName": "KitchenSinkFunctionRolePolicy41", "PolicyDocument": { "Statement": [ { @@ -1062,7 +1076,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy41", + "PolicyName": "KitchenSinkFunctionRolePolicy42", "PolicyDocument": { "Statement": [ { @@ -1077,7 +1091,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy42", + "PolicyName": "KitchenSinkFunctionRolePolicy43", "PolicyDocument": { "Statement": [{ "Effect": "Allow", @@ -1094,7 +1108,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy43", + "PolicyName": "KitchenSinkFunctionRolePolicy44", "PolicyDocument": { "Statement": [ { @@ -1108,7 +1122,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy44", + "PolicyName": "KitchenSinkFunctionRolePolicy45", "PolicyDocument": { "Statement": [ { @@ -1129,7 +1143,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy45", + "PolicyName": "KitchenSinkFunctionRolePolicy46", "PolicyDocument": { "Statement": [ { @@ -1155,7 +1169,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy46", + "PolicyName": "KitchenSinkFunctionRolePolicy47", "PolicyDocument": { "Statement": [ { @@ -1174,7 +1188,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy47", + "PolicyName": "KitchenSinkFunctionRolePolicy48", "PolicyDocument": { "Statement": [ { @@ -1195,7 +1209,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy48", + "PolicyName": "KitchenSinkFunctionRolePolicy49", "PolicyDocument": { "Statement": [ { @@ -1225,7 +1239,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy49", + "PolicyName": "KitchenSinkFunctionRolePolicy50", "PolicyDocument": { "Statement": [ { @@ -1246,7 +1260,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy50", + "PolicyName": "KitchenSinkFunctionRolePolicy51", "PolicyDocument": { "Statement": [ { @@ -1328,7 +1342,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy51", + "PolicyName": "KitchenSinkFunctionRolePolicy52", "PolicyDocument": { "Statement": [ { From e1d6483af6f8bdeb68cbe9f5ce572e09a4d4b770 Mon Sep 17 00:00:00 2001 From: Shreya Gangishetty Date: Fri, 6 Dec 2019 12:53:41 -0800 Subject: [PATCH 2/2] fix: update failing tests --- tests/translator/output/all_policy_templates.json | 4 ++-- tests/translator/output/aws-cn/all_policy_templates.json | 2 +- tests/translator/output/aws-us-gov/all_policy_templates.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/translator/output/all_policy_templates.json b/tests/translator/output/all_policy_templates.json index 0a5e71689..ca630045d 100644 --- a/tests/translator/output/all_policy_templates.json +++ b/tests/translator/output/all_policy_templates.json @@ -1395,7 +1395,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy52", + "PolicyName": "KitchenSinkFunctionRolePolicy53", "PolicyDocument": { "Statement": [ { @@ -1433,4 +1433,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/translator/output/aws-cn/all_policy_templates.json b/tests/translator/output/aws-cn/all_policy_templates.json index 1b9e90804..e337c419b 100644 --- a/tests/translator/output/aws-cn/all_policy_templates.json +++ b/tests/translator/output/aws-cn/all_policy_templates.json @@ -1394,7 +1394,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy52", + "PolicyName": "KitchenSinkFunctionRolePolicy53", "PolicyDocument": { "Statement": [ { diff --git a/tests/translator/output/aws-us-gov/all_policy_templates.json b/tests/translator/output/aws-us-gov/all_policy_templates.json index 9de8a827b..d58796e92 100644 --- a/tests/translator/output/aws-us-gov/all_policy_templates.json +++ b/tests/translator/output/aws-us-gov/all_policy_templates.json @@ -1395,7 +1395,7 @@ } }, { - "PolicyName": "KitchenSinkFunctionRolePolicy52", + "PolicyName": "KitchenSinkFunctionRolePolicy53", "PolicyDocument": { "Statement": [ {