covered for the review

aws · mergify · Nov 21, 2023 · Oct 31, 2023 · Oct 31, 2023 · Oct 31, 2023
commit 3bf56da709d942783f9a179c402490bdbb69c970
diff --git a/packages/@aws-cdk/aws-scheduler-targets-alpha/lib/sqs-send-message.ts b/packages/@aws-cdk/aws-scheduler-targets-alpha/lib/sqs-send-message.ts
@@ -1,5 +1,5 @@
 import { ISchedule, IScheduleTarget, ScheduleTargetConfig } from '@aws-cdk/aws-scheduler-alpha';
-import { Names } from 'aws-cdk-lib';
+import { Names, Token } from 'aws-cdk-lib';
 import { IRole } from 'aws-cdk-lib/aws-iam';
 import * as sqs from 'aws-cdk-lib/aws-sqs';
 import { ScheduleTargetBase, ScheduleTargetBaseProps } from './target';
@@ -35,7 +35,7 @@ export class SqsSendMessage extends ScheduleTargetBase implements IScheduleTarge
     super(props, queue.queueArn);
 
     if (props.messageGroupId !== undefined) {
-      if (props.messageGroupId.length < 1 || props.messageGroupId.length > 128 ) {
+      if (!Token.isUnresolved(props.messageGroupId) && (props.messageGroupId.length < 1 || props.messageGroupId.length > 128)) {
         throw new Error(`messageGroupId length must be between 1 and 128, got ${props.messageGroupId.length}`);
       }
       if (!queue.fifo) {
@@ -62,7 +62,7 @@ export class SqsSendMessage extends ScheduleTargetBase implements IScheduleTarge
       throw new Error(`Cannot grant permission to execution role in account ${this.props.role.env.account} to invoke target ${Names.nodeUniqueId(this.queue.node)} in account ${this.queue.env.account}. Both the target and the execution role must be in the same account.`);
     }
 
-    this.queue.grant(role, 'sqs:SendMessage');
+    this.queue.grantSendMessages(role);
   }
 
   protected bindBaseTargetConfig(_schedule: ISchedule): ScheduleTargetConfig {

diff --git a/...eduler-targets-alpha/test/integ.sqs-send-message.js.snapshot/aws-cdk-schedule.assets.json b/...eduler-targets-alpha/test/integ.sqs-send-message.js.snapshot/aws-cdk-schedule.assets.json
diff --git a/...uler-targets-alpha/test/integ.sqs-send-message.js.snapshot/aws-cdk-schedule.template.json b/...uler-targets-alpha/test/integ.sqs-send-message.js.snapshot/aws-cdk-schedule.template.json
@@ -72,7 +72,11 @@
     "PolicyDocument": {
      "Statement": [
       {
-       "Action": "sqs:SendMessage",
+       "Action": [
+        "sqs:GetQueueAttributes",
+        "sqs:GetQueueUrl",
+        "sqs:SendMessage"
+       ],
        "Effect": "Allow",
        "Resource": {
         "Fn::GetAtt": [

diff --git a/...s-send-message.js.snapshot/integsqssendmessageDefaultTestDeployAssert883D0D33.assets.json b/...s-send-message.js.snapshot/integsqssendmessageDefaultTestDeployAssert883D0D33.assets.json
diff --git a/...send-message.js.snapshot/integsqssendmessageDefaultTestDeployAssert883D0D33.template.json b/...send-message.js.snapshot/integsqssendmessageDefaultTestDeployAssert883D0D33.template.json
diff --git a/...aws-cdk/aws-scheduler-targets-alpha/test/integ.sqs-send-message.js.snapshot/manifest.json b/...aws-cdk/aws-scheduler-targets-alpha/test/integ.sqs-send-message.js.snapshot/manifest.json
diff --git a/...es/@aws-cdk/aws-scheduler-targets-alpha/test/integ.sqs-send-message.js.snapshot/tree.json b/...es/@aws-cdk/aws-scheduler-targets-alpha/test/integ.sqs-send-message.js.snapshot/tree.json
diff --git a/packages/@aws-cdk/aws-scheduler-targets-alpha/test/sqs-send-message.test.ts b/packages/@aws-cdk/aws-scheduler-targets-alpha/test/sqs-send-message.test.ts
@@ -41,7 +41,7 @@ describe('schedule target', () => {
       PolicyDocument: {
         Statement: [
           {
-            Action: 'sqs:SendMessage',
+            Action: ['sqs:SendMessage', 'sqs:GetQueueAttributes', 'sqs:GetQueueUrl'],
             Effect: 'Allow',
             Resource: {
               'Fn::GetAtt': ['MyQueueE6CA6235', 'Arn'],
@@ -99,7 +99,7 @@ describe('schedule target', () => {
       PolicyDocument: {
         Statement: [
           {
-            Action: 'sqs:SendMessage',
+            Action: ['sqs:SendMessage', 'sqs:GetQueueAttributes', 'sqs:GetQueueUrl'],
             Effect: 'Allow',
             Resource: {
               'Fn::GetAtt': ['MyQueueE6CA6235', 'Arn'],
@@ -144,7 +144,7 @@ describe('schedule target', () => {
       PolicyDocument: {
         Statement: [
           {
-            Action: 'sqs:SendMessage',
+            Action: ['sqs:SendMessage', 'sqs:GetQueueAttributes', 'sqs:GetQueueUrl'],
             Effect: 'Allow',
             Resource: {
               'Fn::GetAtt': ['MyQueueE6CA6235', 'Arn'],
@@ -180,7 +180,7 @@ describe('schedule target', () => {
       PolicyDocument: {
         Statement: [
           {
-            Action: 'sqs:SendMessage',
+            Action: ['sqs:SendMessage', 'sqs:GetQueueAttributes', 'sqs:GetQueueUrl'],
             Effect: 'Allow',
             Resource: 'arn:aws:sqs:us-east-1:123456789012:somequeue',
           },
@@ -218,7 +218,7 @@ describe('schedule target', () => {
       PolicyDocument: {
         Statement: [
           {
-            Action: 'sqs:SendMessage',
+            Action: ['sqs:SendMessage', 'sqs:GetQueueAttributes', 'sqs:GetQueueUrl'],
             Effect: 'Allow',
             Resource: {
               'Fn::GetAtt': ['MyQueueE6CA6235', 'Arn'],
@@ -257,7 +257,7 @@ describe('schedule target', () => {
       PolicyDocument: {
         Statement: [
           {
-            Action: 'sqs:SendMessage',
+            Action: ['sqs:SendMessage', 'sqs:GetQueueAttributes', 'sqs:GetQueueUrl'],
             Effect: 'Allow',
             Resource: 'arn:aws:sqs:us-east-1:123456789012:somequeue',
           },