Merge branch 'main' into corymhall/multiple-bucket-notifications

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"

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"

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"

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"

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)"
  }
  }
  },

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)"
  }
  }
  },

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)"
  }
  }
  },

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"

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),
  });
  }
 }

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions/test/integ.map-distributed.js.snapshot/cdk-stepfunctions-map-distributed-stack.template.json

@@ -0,0 +1,79 @@
+{
+ "Resources": {
+ "StateMachineRoleB840431D": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "states.amazonaws.com"
+ }
+ }
+ ],
+ "Version": "2012-10-17"
+ }
+ }
+ },
+ "StateMachine2E01A3A5": {
+ "Type": "AWS::StepFunctions::StateMachine",
+ "Properties": {
+ "DefinitionString": "{\"StartAt\":\"My-Map-State\",\"States\":{\"My-Map-State\":{\"Type\":\"Map\",\"End\":true,\"Parameters\":{\"foo\":\"foo\",\"bar.$\":\"$.bar\"},\"ItemsPath\":\"$.inputForMap\",\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass State\",\"States\":{\"Pass State\":{\"Type\":\"Pass\",\"End\":true}}},\"MaxConcurrency\":1}},\"TimeoutSeconds\":30}",
+ "RoleArn": {
+ "Fn::GetAtt": [
+ "StateMachineRoleB840431D",
+ "Arn"
+ ]
+ }
+ },
+ "DependsOn": [
+ "StateMachineRoleB840431D"
+ ],
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ }
+ },
+ "Outputs": {
+ "StateMachineARN": {
+ "Value": {
+ "Ref": "StateMachine2E01A3A5"
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}