From dc05370d3f508545e7d40dd93aff94a699614487 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Fri, 8 Dec 2023 16:02:40 +0100 Subject: [PATCH 1/4] fix(secretsmanager): cannot set hourly rotation --- ...integ-secret-lambda-rotation.template.json | 2 +- .../test/integ.lambda-rotation.ts | 1 + .../lib/rotation-schedule.ts | 31 +++++++++--- .../test/rotation-schedule.test.ts | 49 +++++++++++++++++++ 4 files changed, 74 insertions(+), 9 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/cdk-integ-secret-lambda-rotation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/cdk-integ-secret-lambda-rotation.template.json index 58263e2820f90..658bd5c501b9f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/cdk-integ-secret-lambda-rotation.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/cdk-integ-secret-lambda-rotation.template.json @@ -139,7 +139,7 @@ ] }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(4 hours)" }, "SecretId": { "Ref": "SecretA720EF05" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.ts index 4382ab413362b..568debb390304 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.ts @@ -21,6 +21,7 @@ class TestStack extends cdk.Stack { handler: 'index.handler', code: lambda.Code.fromInline('NOOP'), }), + automaticallyAfter: cdk.Duration.hours(4), }); } } diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts index a9f1ecdd0545d..176aef993f552 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts @@ -2,6 +2,7 @@ import { Construct } from 'constructs'; import { ISecret, Secret } from './secret'; import { CfnRotationSchedule } from './secretsmanager.generated'; import * as ec2 from '../../aws-ec2'; +import { Schedule } from '../../aws-events'; import * as iam from '../../aws-iam'; import * as kms from '../../aws-kms'; import * as lambda from '../../aws-lambda'; @@ -37,6 +38,7 @@ export interface RotationScheduleOptions { * Specifies the number of days after the previous rotation before * Secrets Manager triggers the next automatic rotation. * + * The minimum value is 4 hours. * The maximum value is 1000 days. * * A value of zero (`Duration.days(0)`) will not create RotationRules. @@ -126,18 +128,31 @@ export class RotationSchedule extends Resource { ); } - let automaticallyAfterDays: number | undefined = undefined; - if (props.automaticallyAfter && props.automaticallyAfter.toDays() > 1000) { - throw new Error(`automaticallyAfter must not be greater than 1000 days, got ${props.automaticallyAfter.toDays()} days`); - } - if (props.automaticallyAfter?.toMilliseconds() !== 0) { - automaticallyAfterDays = props.automaticallyAfter?.toDays() || 30; + let automaticallyAfterDays: number | undefined; + let scheduleExpression: string | undefined; + if (props.automaticallyAfter) { + if (props.automaticallyAfter.toMilliseconds() > 0) { + if (props.automaticallyAfter.toMilliseconds() < Duration.hours(4).toMilliseconds()) { + throw new Error(`automaticallyAfter must not be smaller than 4 hours, got ${props.automaticallyAfter.toHours()} hours`); + } + if (props.automaticallyAfter.toMilliseconds() > Duration.days(1000).toMilliseconds()) { + throw new Error(`automaticallyAfter must not be greater than 1000 days, got ${props.automaticallyAfter.toDays()} days`); + } + if (props.automaticallyAfter.toHours() > 23) { + automaticallyAfterDays = props.automaticallyAfter.toDays(); + } else { + scheduleExpression = Schedule.rate(props.automaticallyAfter).expressionString; + } + } + } else { + automaticallyAfterDays = 30; } - let rotationRules: CfnRotationSchedule.RotationRulesProperty | undefined = undefined; - if (automaticallyAfterDays !== undefined) { + let rotationRules: CfnRotationSchedule.RotationRulesProperty | undefined; + if (automaticallyAfterDays !== undefined || scheduleExpression !== undefined) { rotationRules = { automaticallyAfterDays, + scheduleExpression, }; } diff --git a/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts b/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts index 81d14021be962..258bb76f5c106 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts @@ -652,6 +652,55 @@ test('rotation schedule should have a dependency on lambda permissions', () => { }); }); +test('automaticallyAfter set scheduleExpression with hours duration', () => { + // GIVEN + const secret = new secretsmanager.Secret(stack, 'Secret'); + const rotationLambda = new lambda.Function(stack, 'Lambda', { + runtime: lambda.Runtime.NODEJS_LATEST, + code: lambda.Code.fromInline('export.handler = event => event;'), + handler: 'index.handler', + }); + + // WHEN + new secretsmanager.RotationSchedule(stack, 'RotationSchedule', { + secret, + rotationLambda, + automaticallyAfter: Duration.hours(6), + }); + + // THEN + Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', Match.objectEquals({ + SecretId: { Ref: 'SecretA720EF05' }, + RotationLambdaARN: { + 'Fn::GetAtt': [ + 'LambdaD247545B', + 'Arn', + ], + }, + RotationRules: { + ScheduleExpression: 'rate(6 hours)', + }, + })); +}); + +test('automaticallyAfter must not be smaller than 4 hours', () => { + // GIVEN + const secret = new secretsmanager.Secret(stack, 'Secret'); + const rotationLambda = new lambda.Function(stack, 'Lambda', { + runtime: lambda.Runtime.NODEJS_LATEST, + code: lambda.Code.fromInline('export.handler = event => event;'), + handler: 'index.handler', + }); + + // WHEN + // THEN + expect(() => new secretsmanager.RotationSchedule(stack, 'RotationSchedule', { + secret, + rotationLambda, + automaticallyAfter: Duration.hours(2), + })).toThrow(/automaticallyAfter must not be smaller than 4 hours, got 2 hours/); +}); + test('automaticallyAfter must not be greater than 1000 days', () => { // GIVEN const secret = new secretsmanager.Secret(stack, 'Secret'); From ada07d741ae0b06b08ef45d0d1a225992c2a4356 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Sat, 9 Dec 2023 12:17:44 +0100 Subject: [PATCH 2/4] minor nits and template update --- .../test/integ.lambda-rotation.js.snapshot/tree.json | 2 +- .../aws-secretsmanager/lib/rotation-schedule.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/tree.json index 207294c8edffe..d20587d644344 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.lambda-rotation.js.snapshot/tree.json @@ -180,7 +180,7 @@ ] }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(4 hours)" }, "secretId": { "Ref": "SecretA720EF05" diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts index 176aef993f552..ea2c432a2728a 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts @@ -131,14 +131,15 @@ export class RotationSchedule extends Resource { let automaticallyAfterDays: number | undefined; let scheduleExpression: string | undefined; if (props.automaticallyAfter) { - if (props.automaticallyAfter.toMilliseconds() > 0) { - if (props.automaticallyAfter.toMilliseconds() < Duration.hours(4).toMilliseconds()) { + const automaticallyAfterMillis = props.automaticallyAfter.toMilliseconds(); + if (automaticallyAfterMillis > 0) { + if (automaticallyAfterMillis < Duration.hours(4).toMilliseconds()) { throw new Error(`automaticallyAfter must not be smaller than 4 hours, got ${props.automaticallyAfter.toHours()} hours`); } - if (props.automaticallyAfter.toMilliseconds() > Duration.days(1000).toMilliseconds()) { + if (automaticallyAfterMillis > Duration.days(1000).toMilliseconds()) { throw new Error(`automaticallyAfter must not be greater than 1000 days, got ${props.automaticallyAfter.toDays()} days`); } - if (props.automaticallyAfter.toHours() > 23) { + if (props.automaticallyAfter.toHours() >= 24) { automaticallyAfterDays = props.automaticallyAfter.toDays(); } else { scheduleExpression = Schedule.rate(props.automaticallyAfter).expressionString; From 524ea38554568e6c3d0fbb442fea11678d9f76cf Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Thu, 14 Dec 2023 10:20:02 +0100 Subject: [PATCH 3/4] handle rotation in days with scheduleExpression --- ...s-cdk-docdb-cluster-rotation.template.json | 2 +- ...aws-cdk-rds-cluster-rotation.template.json | 4 +- .../tree.json | 4 +- .../cdk-integ-cluster-snapshot.template.json | 2 +- .../tree.json | 2 +- .../aws-cdk-rds-instance.template.json | 2 +- .../integ.instance.lit.js.snapshot/tree.json | 2 +- ...dk-rds-integ-secret-rotation.template.json | 2 +- .../tree.json | 2 +- ...dk-rds-integ-secret-rotation.template.json | 2 +- .../tree.json | 2 +- ...integ-secret-hosted-rotation.template.json | 4 +- .../tree.json | 4 +- .../aws-docdb/test/cluster.test.ts | 4 +- .../aws-cdk-lib/aws-rds/test/cluster.test.ts | 16 +++---- .../aws-cdk-lib/aws-rds/test/instance.test.ts | 8 ++-- .../lib/rotation-schedule.ts | 12 ++---- .../test/rotation-schedule.test.ts | 43 ++++++++++++++++--- .../test/secret-rotation.test.ts | 2 +- 19 files changed, 72 insertions(+), 47 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-docdb-cluster-rotation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-docdb-cluster-rotation.template.json index 9206ab9a17ce8..1271bf7c1dca2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-docdb-cluster-rotation.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-docdb-cluster-rotation.template.json @@ -501,7 +501,7 @@ ] }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" }, "SecretId": { "Ref": "DatabaseSecretAttachmentE5D1B020" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-rds-cluster-rotation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-rds-cluster-rotation.template.json index 794425c15d58a..ce8f516772028 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-rds-cluster-rotation.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-rds-cluster-rotation.template.json @@ -599,7 +599,7 @@ ] }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" }, "SecretId": { "Ref": "DatabaseSecretAttachmentE5D1B020" @@ -920,7 +920,7 @@ ] }, "RotationRules": { - "AutomaticallyAfterDays": 7 + "ScheduleExpression": "rate(7 days)" }, "SecretId": { "Ref": "CustomRotationOptionsSecretAttachment697A23BF" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/tree.json index 5c1665d932a55..301426d3607e9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-rotation.lit.js.snapshot/tree.json @@ -995,7 +995,7 @@ ] }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" }, "secretId": { "Ref": "DatabaseSecretAttachmentE5D1B020" @@ -1520,7 +1520,7 @@ ] }, "rotationRules": { - "automaticallyAfterDays": 7 + "scheduleExpression": "rate(7 days)" }, "secretId": { "Ref": "CustomRotationOptionsSecretAttachment697A23BF" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json index ebe5672ba9069..9a5f1622df555 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json @@ -1403,7 +1403,7 @@ ] }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" }, "SecretId": { "Ref": "FromSnapshotSnapshotSecretAttachmentA3F619B8" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/tree.json index 09ea615fb01f4..3b559b1a4d8bd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/tree.json @@ -2285,7 +2285,7 @@ ] }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" }, "secretId": { "Ref": "FromSnapshotSnapshotSecretAttachmentA3F619B8" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json index 0d3ab4158f690..a2f3e86d3ac10 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json @@ -616,7 +616,7 @@ ] }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" }, "SecretId": { "Ref": "InstanceSecretAttachment83BEE581" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/tree.json index 5633e4c3d92f9..7f75600ca577a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/tree.json @@ -1040,7 +1040,7 @@ ] }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" }, "secretId": { "Ref": "InstanceSecretAttachment83BEE581" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json index 9670594fcd147..0a12dc325c73e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json @@ -84,7 +84,7 @@ "RotationType": "MySQLSingleUser" }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/tree.json index 8b0ca324ebc1d..b9adb54e8c634 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation-custom-names.js.snapshot/tree.json @@ -142,7 +142,7 @@ "excludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\" }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json index 84e9db49cabdc..c9972ef2c6403 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/aws-cdk-rds-integ-secret-rotation.template.json @@ -83,7 +83,7 @@ "RotationType": "MySQLSingleUser" }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/tree.json index 324bde72c38a6..4a400c436d2ea 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.serverless-cluster-secret-rotation.js.snapshot/tree.json @@ -141,7 +141,7 @@ "excludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\" }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/cdk-integ-secret-hosted-rotation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/cdk-integ-secret-hosted-rotation.template.json index 100dd501b3c01..b435c2b732113 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/cdk-integ-secret-hosted-rotation.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/cdk-integ-secret-hosted-rotation.template.json @@ -22,7 +22,7 @@ "RotationType": "MySQLSingleUser" }, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" } } }, @@ -84,7 +84,7 @@ }, "RotateImmediatelyOnUpdate": false, "RotationRules": { - "AutomaticallyAfterDays": 30 + "ScheduleExpression": "rate(30 days)" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/tree.json index 8376f334fd4f0..c18789e6a490b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-secretsmanager/test/integ.hosted-rotation.js.snapshot/tree.json @@ -44,7 +44,7 @@ "excludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\" }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" } } }, @@ -158,7 +158,7 @@ }, "rotateImmediatelyOnUpdate": false, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" } } }, diff --git a/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts b/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts index 50b23408db59a..7b1ff72a62984 100644 --- a/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts @@ -785,7 +785,7 @@ describe('DatabaseCluster', () => { 'Fn::GetAtt': ['DatabaseRotationSingleUser65F55654', 'Outputs.RotationLambdaARN'], }, RotationRules: { - AutomaticallyAfterDays: 5, + ScheduleExpression: 'rate(5 days)', }, }); }); @@ -899,7 +899,7 @@ describe('DatabaseCluster', () => { 'Fn::GetAtt': ['DatabaseRotation6B6E1D86', 'Outputs.RotationLambdaARN'], }, RotationRules: { - AutomaticallyAfterDays: 5, + ScheduleExpression: 'rate(5 days)', }, }); }); diff --git a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts index 0b3644fc7e1a7..c900952d76f79 100644 --- a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts @@ -1975,7 +1975,7 @@ describe('cluster', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); }); @@ -2006,7 +2006,7 @@ describe('cluster', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); @@ -2058,7 +2058,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', { RotationRules: { - AutomaticallyAfterDays: 15, + ScheduleExpression: 'rate(15 days)', }, }); @@ -2125,7 +2125,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', { RotationRules: { - AutomaticallyAfterDays: 15, + ScheduleExpression: 'rate(15 days)', }, }); @@ -2231,7 +2231,7 @@ describe('cluster', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, RotateImmediatelyOnUpdate: false, }); @@ -2266,7 +2266,7 @@ describe('cluster', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, RotateImmediatelyOnUpdate: false, }); @@ -3439,7 +3439,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', { RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); }); @@ -3493,7 +3493,7 @@ describe('cluster', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); diff --git a/packages/aws-cdk-lib/aws-rds/test/instance.test.ts b/packages/aws-cdk-lib/aws-rds/test/instance.test.ts index 3e791f2a0ab81..92f9d41cccc1e 100644 --- a/packages/aws-cdk-lib/aws-rds/test/instance.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/instance.test.ts @@ -782,7 +782,7 @@ describe('instance', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); }); @@ -810,7 +810,7 @@ describe('instance', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); @@ -858,7 +858,7 @@ describe('instance', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', { RotationRules: { - AutomaticallyAfterDays: 15, + ScheduleExpression: 'rate(15 days)', }, }); @@ -921,7 +921,7 @@ describe('instance', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', { RotationRules: { - AutomaticallyAfterDays: 15, + ScheduleExpression: 'rate(15 days)', }, }); diff --git a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts index ea2c432a2728a..32f89b50f8d9e 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/lib/rotation-schedule.ts @@ -128,7 +128,6 @@ export class RotationSchedule extends Resource { ); } - let automaticallyAfterDays: number | undefined; let scheduleExpression: string | undefined; if (props.automaticallyAfter) { const automaticallyAfterMillis = props.automaticallyAfter.toMilliseconds(); @@ -139,20 +138,15 @@ export class RotationSchedule extends Resource { if (automaticallyAfterMillis > Duration.days(1000).toMilliseconds()) { throw new Error(`automaticallyAfter must not be greater than 1000 days, got ${props.automaticallyAfter.toDays()} days`); } - if (props.automaticallyAfter.toHours() >= 24) { - automaticallyAfterDays = props.automaticallyAfter.toDays(); - } else { - scheduleExpression = Schedule.rate(props.automaticallyAfter).expressionString; - } + scheduleExpression = Schedule.rate(props.automaticallyAfter).expressionString; } } else { - automaticallyAfterDays = 30; + scheduleExpression = Schedule.rate(Duration.days(30)).expressionString; } let rotationRules: CfnRotationSchedule.RotationRulesProperty | undefined; - if (automaticallyAfterDays !== undefined || scheduleExpression !== undefined) { + if (scheduleExpression) { rotationRules = { - automaticallyAfterDays, scheduleExpression, }; } diff --git a/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts b/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts index 258bb76f5c106..dacfe106e0f8d 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/test/rotation-schedule.test.ts @@ -38,7 +38,7 @@ test('create a rotation schedule with a rotation Lambda', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); }); @@ -65,7 +65,7 @@ test('create a rotation schedule without immediate rotation', () => { Ref: 'SecretA720EF05', }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, RotateImmediatelyOnUpdate: false, }); @@ -261,7 +261,7 @@ describe('hosted rotation', () => { ExcludeCharacters: " %+~`#$&*()|[]{}:;<>?!'/@\"\\", }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); @@ -328,7 +328,7 @@ describe('hosted rotation', () => { RotationType: 'PostgreSQLMultiUser', }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); @@ -411,7 +411,7 @@ describe('hosted rotation', () => { }, }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); @@ -497,7 +497,7 @@ describe('hosted rotation', () => { }, }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); @@ -652,6 +652,37 @@ test('rotation schedule should have a dependency on lambda permissions', () => { }); }); +test('automaticallyAfter set scheduleExpression with days duration', () => { + // GIVEN + const secret = new secretsmanager.Secret(stack, 'Secret'); + const rotationLambda = new lambda.Function(stack, 'Lambda', { + runtime: lambda.Runtime.NODEJS_LATEST, + code: lambda.Code.fromInline('export.handler = event => event;'), + handler: 'index.handler', + }); + + // WHEN + new secretsmanager.RotationSchedule(stack, 'RotationSchedule', { + secret, + rotationLambda, + automaticallyAfter: Duration.days(90), + }); + + // THEN + Template.fromStack(stack).hasResourceProperties('AWS::SecretsManager::RotationSchedule', Match.objectEquals({ + SecretId: { Ref: 'SecretA720EF05' }, + RotationLambdaARN: { + 'Fn::GetAtt': [ + 'LambdaD247545B', + 'Arn', + ], + }, + RotationRules: { + ScheduleExpression: 'rate(90 days)', + }, + })); +}); + test('automaticallyAfter set scheduleExpression with hours duration', () => { // GIVEN const secret = new secretsmanager.Secret(stack, 'Secret'); diff --git a/packages/aws-cdk-lib/aws-secretsmanager/test/secret-rotation.test.ts b/packages/aws-cdk-lib/aws-secretsmanager/test/secret-rotation.test.ts index 0d24a57fed8ab..72f559bf7a265 100644 --- a/packages/aws-cdk-lib/aws-secretsmanager/test/secret-rotation.test.ts +++ b/packages/aws-cdk-lib/aws-secretsmanager/test/secret-rotation.test.ts @@ -63,7 +63,7 @@ test('secret rotation single user', () => { ], }, RotationRules: { - AutomaticallyAfterDays: 30, + ScheduleExpression: 'rate(30 days)', }, }); From 66413dcaba27c8f88ac15de66d2e9a14b1406277 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Thu, 14 Dec 2023 10:44:05 +0100 Subject: [PATCH 4/4] fixed integration test --- .../test/integ.cluster-rotation.lit.js.snapshot/tree.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/tree.json index 3bb92efa6d3ca..951bdfa30bb22 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/tree.json @@ -825,7 +825,7 @@ ] }, "rotationRules": { - "automaticallyAfterDays": 30 + "scheduleExpression": "rate(30 days)" }, "secretId": { "Ref": "DatabaseSecretAttachmentE5D1B020"