Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Park committed Oct 1, 2024
2 parents 9459389 + 707d0ec commit 21f16df
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions packages/serverless-deploy-iam/bin/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ export class ServiceDeployIAM extends cdk.Stack {
"iam:DetachRolePolicy",
"iam:AttachRolePolicy",
"iam:UpdateAssumeRolePolicy",
"iam:TagRole",
"iam:UntagRole",
],
},
{
Expand All @@ -184,6 +186,10 @@ export class ServiceDeployIAM extends cdk.Stack {
"dynamodb:CreateTable",
"dynamodb:UpdateTable",
"dynamodb:DeleteTable",
"dynamodb:ListTagsOfResource",
"dynamodb:TagResource",
"dynamodb:UntagResource",
"dynamodb:*TimeToLive",
],
},
{
Expand Down Expand Up @@ -236,7 +242,6 @@ export class ServiceDeployIAM extends cdk.Stack {
actions: [
"scheduler:GetScheduleGroup",
"scheduler:CreateScheduleGroup",
"scheduler:UpdateScheduleGroup",
"scheduler:DeleteScheduleGroup",
"scheduler:TagResource",
"scheduler:ListTagsForResource",
Expand All @@ -253,6 +258,7 @@ export class ServiceDeployIAM extends cdk.Stack {
qualifiers: [`${serviceName}*`],
actions: [
"sns:GetTopicAttributes",
"sns:SetTopicAttributes",
"sns:CreateTopic",
"sns:DeleteTopic",
"sns:Subscribe",
Expand Down Expand Up @@ -503,20 +509,7 @@ export class ServiceDeployIAM extends cdk.Stack {
// Generated api key names are random so this cannot be limited to the service at this time
{
name: "API_GATEWAY",
resources: [`arn:aws:apigateway:${region}::/apikeys/*`],
actions: ["apigateway:GET", "apigateway:PATCH"],
},
{
name: "API_GATEWAY_RESTAPIS",
prefix: `arn:aws:apigateway:${region}::/restapis`,
qualifiers: [`/*/deployments`],
actions: ["apigateway:GET"],
},
// The serverless-api-gateway-throttling requires PATCH access using the deploy user to update maxRequestsPerSecond and maxConcurrentRequests
{
name: "API_GATEWAY",
prefix: `arn:aws:apigateway:${region}::/restapis/*/stages`,
qualifiers: [`*`],
resources: [`arn:aws:apigateway:${region}::*`],
actions: ["apigateway:GET", "apigateway:PATCH", "apigateway:POST"],
},
{
Expand All @@ -540,7 +533,7 @@ export class ServiceDeployIAM extends cdk.Stack {
new CfnParameter(this, parameterName, {
type: "String",
description: `Custom qualifier values provided for ${policy.name}`,
default: "",
default: PARAMETER_HASH,
}),
);
}
Expand Down

0 comments on commit 21f16df

Please sign in to comment.