From ccc2e30bdcc227ef549b0edef99c16282140ae00 Mon Sep 17 00:00:00 2001 From: Ross Date: Thu, 24 Jun 2021 17:15:05 +0100 Subject: [PATCH 1/6] feat(sns): add sns service trust to keys for encrypted queue subscriptions (#14960) Add SNS service trust to KMS key when creating an SNS subscription for an encrypted SQS queue. Closes #2504 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../@aws-cdk/aws-sns-subscriptions/README.md | 3 + .../@aws-cdk/aws-sns-subscriptions/lib/sqs.ts | 13 +- .../aws-sns-subscriptions/package.json | 2 + .../aws-sns-subscriptions/test/subs.test.ts | 153 +++++++++++++++++- 4 files changed, 169 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-sns-subscriptions/README.md b/packages/@aws-cdk/aws-sns-subscriptions/README.md index c2bb95910d125..ca06d08689736 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/README.md +++ b/packages/@aws-cdk/aws-sns-subscriptions/README.md @@ -65,6 +65,9 @@ const myQueue = new sqs.Queue(this, 'MyQueue'); myTopic.addSubscription(new subscriptions.SqsSubscription(queue)); ``` +KMS key permissions will automatically be granted to SNS when a subscription is made to +an encrypted queue. + Note that subscriptions of queues in different accounts need to be manually confirmed by reading the initial message from the queue and visiting the link found in it. diff --git a/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts b/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts index 4a41c5e43feb2..6cf89ebc53c60 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts @@ -38,18 +38,29 @@ export class SqsSubscription implements sns.ITopicSubscription { if (!Construct.isConstruct(this.queue)) { throw new Error('The supplied Queue object must be an instance of Construct'); } + const snsServicePrincipal = new iam.ServicePrincipal('sns.amazonaws.com'); // add a statement to the queue resource policy which allows this topic // to send messages to the queue. this.queue.addToResourcePolicy(new iam.PolicyStatement({ resources: [this.queue.queueArn], actions: ['sqs:SendMessage'], - principals: [new iam.ServicePrincipal('sns.amazonaws.com')], + principals: [snsServicePrincipal], conditions: { ArnEquals: { 'aws:SourceArn': topic.topicArn }, }, })); + // if the queue is encrypted, add a statement to the key resource policy + // which allows this topic to decrypt KMS keys + if (this.queue.encryptionMasterKey) { + this.queue.encryptionMasterKey.addToResourcePolicy(new iam.PolicyStatement({ + resources: ['*'], + actions: ['kms:Decrypt', 'kms:GenerateDataKey'], + principals: [snsServicePrincipal], + })); + } + return { subscriberScope: this.queue, subscriberId: Names.nodeUniqueId(topic.node), diff --git a/packages/@aws-cdk/aws-sns-subscriptions/package.json b/packages/@aws-cdk/aws-sns-subscriptions/package.json index ba0204ebf9ecb..1b5da65d03a19 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/package.json +++ b/packages/@aws-cdk/aws-sns-subscriptions/package.json @@ -74,6 +74,7 @@ }, "dependencies": { "@aws-cdk/aws-iam": "0.0.0", + "@aws-cdk/aws-kms": "0.0.0", "@aws-cdk/aws-lambda": "0.0.0", "@aws-cdk/aws-sns": "0.0.0", "@aws-cdk/aws-sqs": "0.0.0", @@ -83,6 +84,7 @@ "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "0.0.0", + "@aws-cdk/aws-kms": "0.0.0", "@aws-cdk/aws-lambda": "0.0.0", "@aws-cdk/aws-sns": "0.0.0", "@aws-cdk/aws-sqs": "0.0.0", diff --git a/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts b/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts index d0583ea182595..8be564b5a9188 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts @@ -1,8 +1,9 @@ import '@aws-cdk/assert-internal/jest'; +import * as kms from '@aws-cdk/aws-kms'; import * as lambda from '@aws-cdk/aws-lambda'; import * as sns from '@aws-cdk/aws-sns'; import * as sqs from '@aws-cdk/aws-sqs'; -import { CfnParameter, Duration, Stack, Token } from '@aws-cdk/core'; +import { CfnParameter, Duration, RemovalPolicy, Stack, Token } from '@aws-cdk/core'; import * as subs from '../lib'; /* eslint-disable quote-props */ @@ -458,6 +459,156 @@ test('queue subscription (with raw delivery)', () => { }); }); +test('encrypted queue subscription', () => { + const key = new kms.Key(stack, 'MyKey', { + removalPolicy: RemovalPolicy.DESTROY, + }); + + const queue = new sqs.Queue(stack, 'MyQueue', { + encryption: sqs.QueueEncryption.KMS, + encryptionMasterKey: key, + }); + + topic.addSubscription(new subs.SqsSubscription(queue)); + + expect(stack).toMatchTemplate({ + 'Resources': { + 'MyTopic86869434': { + 'Type': 'AWS::SNS::Topic', + 'Properties': { + 'DisplayName': 'displayName', + 'TopicName': 'topicName', + }, + }, + 'MyKey6AB29FA6': { + 'Type': 'AWS::KMS::Key', + 'Properties': { + 'KeyPolicy': { + 'Statement': [ + { + 'Action': [ + 'kms:Create*', + 'kms:Describe*', + 'kms:Enable*', + 'kms:List*', + 'kms:Put*', + 'kms:Update*', + 'kms:Revoke*', + 'kms:Disable*', + 'kms:Get*', + 'kms:Delete*', + 'kms:ScheduleKeyDeletion', + 'kms:CancelKeyDeletion', + 'kms:GenerateDataKey', + 'kms:TagResource', + 'kms:UntagResource', + ], + 'Effect': 'Allow', + 'Principal': { + 'AWS': { + 'Fn::Join': [ + '', + [ + 'arn:', + { + 'Ref': 'AWS::Partition', + }, + ':iam::', + { + 'Ref': 'AWS::AccountId', + }, + ':root', + ], + ], + }, + }, + 'Resource': '*', + }, + { + 'Action': [ + 'kms:Decrypt', + 'kms:GenerateDataKey', + ], + 'Effect': 'Allow', + 'Principal': { + 'Service': 'sns.amazonaws.com', + }, + 'Resource': '*', + }, + ], + 'Version': '2012-10-17', + }, + }, + 'UpdateReplacePolicy': 'Delete', + 'DeletionPolicy': 'Delete', + }, + 'MyQueueE6CA6235': { + 'Type': 'AWS::SQS::Queue', + 'Properties': { + 'KmsMasterKeyId': { + 'Fn::GetAtt': [ + 'MyKey6AB29FA6', + 'Arn', + ], + }, + }, + 'DeletionPolicy': 'Delete', + 'UpdateReplacePolicy': 'Delete', + }, + 'MyQueuePolicy6BBEDDAC': { + 'Type': 'AWS::SQS::QueuePolicy', + 'Properties': { + 'PolicyDocument': { + 'Statement': [ + { + 'Action': 'sqs:SendMessage', + 'Condition': { + 'ArnEquals': { + 'aws:SourceArn': { + 'Ref': 'MyTopic86869434', + }, + }, + }, + 'Effect': 'Allow', + 'Principal': { + 'Service': 'sns.amazonaws.com', + }, + 'Resource': { + 'Fn::GetAtt': [ + 'MyQueueE6CA6235', + 'Arn', + ], + }, + }, + ], + 'Version': '2012-10-17', + }, + 'Queues': [ + { + 'Ref': 'MyQueueE6CA6235', + }, + ], + }, + }, + 'MyQueueMyTopic9B00631B': { + 'Type': 'AWS::SNS::Subscription', + 'Properties': { + 'Protocol': 'sqs', + 'TopicArn': { + 'Ref': 'MyTopic86869434', + }, + 'Endpoint': { + 'Fn::GetAtt': [ + 'MyQueueE6CA6235', + 'Arn', + ], + }, + }, + }, + }, + }); +}); + test('lambda subscription', () => { const fction = new lambda.Function(stack, 'MyFunc', { runtime: lambda.Runtime.NODEJS_10_X, From 2e93fb9a195b6043265562163a3e5c2798a4d122 Mon Sep 17 00:00:00 2001 From: ABevier Date: Thu, 24 Jun 2021 12:52:16 -0400 Subject: [PATCH 2/6] fix(aws-elasticloadbalancingv2): cannot clear access logging bucket prefix (#15149) This PR makes the empty bucket prefix explicit in cloud formation resource instead of omitting the entry all together. Cloud Formation won't let you remove the prefix once it has has been set unless it is explicitly set this way. closes #14044 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../lib/shared/base-load-balancer.ts | 2 +- .../test/alb/load-balancer.test.ts | 4 ++++ .../test/nlb/load-balancer.test.ts | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts index f96b4e7711ccc..bcf51d4d81a78 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts @@ -233,6 +233,7 @@ export abstract class BaseLoadBalancer extends Resource { * environment-agnostic stacks. See https://docs.aws.amazon.com/cdk/latest/guide/environments.html */ public logAccessLogs(bucket: s3.IBucket, prefix?: string) { + prefix = prefix || ''; this.setAttribute('access_logs.s3.enabled', 'true'); this.setAttribute('access_logs.s3.bucket', bucket.bucketName.toString()); this.setAttribute('access_logs.s3.prefix', prefix); @@ -247,7 +248,6 @@ export abstract class BaseLoadBalancer extends Resource { throw new Error(`Cannot enable access logging; don't know ELBv2 account for region ${region}`); } - prefix = prefix || ''; bucket.grantPut(new iam.AccountPrincipal(account), `${(prefix ? prefix + '/' : '')}AWSLogs/${Stack.of(this).account}/*`); // make sure the bucket's policy is created before the ALB (see https://github.com/aws/aws-cdk/issues/1633) diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts index 8c09e3e5f25db..8aa186ffc5edf 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts @@ -149,6 +149,10 @@ describe('tests', () => { Key: 'access_logs.s3.bucket', Value: { Ref: 'AccessLoggingBucketA6D88F29' }, }, + { + Key: 'access_logs.s3.prefix', + Value: '', + }, ), }); diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts index ed678caf2ce83..63cfc2462bddf 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts @@ -96,6 +96,10 @@ describe('tests', () => { Key: 'access_logs.s3.bucket', Value: { Ref: 'AccessLoggingBucketA6D88F29' }, }, + { + Key: 'access_logs.s3.prefix', + Value: '', + }, ), }); @@ -479,4 +483,3 @@ describe('tests', () => { }); }); }); - From 32d63a32b1088567e54168a7bf67d4d9318535f1 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Thu, 24 Jun 2021 19:31:36 +0200 Subject: [PATCH 3/6] docs(s3-deployment): note that asset inputs must come from a trusted source (#15276) In #15244, it was brought to our attention that `zip.extractall()` in Python is not safe against out-of-tree file writing attacks. There is probably a way in which a clever attacker might use that to execute arbitrary code in the Lambda Function, and read the bucket or write file to it in unexpected places. Add a note to the README indicating that this module should only be used with Zips from trusted sources (like asset bundles built by the CLI). Not a full fix but a mitigation for #15244. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-s3-deployment/README.md | 9 +++++++++ packages/@aws-cdk/aws-s3-deployment/lib/source.ts | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/packages/@aws-cdk/aws-s3-deployment/README.md b/packages/@aws-cdk/aws-s3-deployment/README.md index 84af913dcaccd..3818a8e469cf5 100644 --- a/packages/@aws-cdk/aws-s3-deployment/README.md +++ b/packages/@aws-cdk/aws-s3-deployment/README.md @@ -44,6 +44,7 @@ This is what happens under the hood: `websiteBucket`). If there is more than one source, the sources will be downloaded and merged pre-deployment at this step. + ## Supported sources The following source types are supported for bucket deployments: @@ -57,6 +58,14 @@ all but a single file: - Single file: `s3deploy.Source.asset('/path/to/local/directory', { exclude: ['**', '!onlyThisFile.txt'] })` +**IMPORTANT** The `aws-s3-deployment` module is only intended to be used with +zip files from trusted sources. Directories bundled by the CDK CLI (by using +`Source.asset()` on a directory) are safe. If you are using `Source.asset()` or +`Source.bucket()` to reference an existing zip file, make sure you trust the +file you are referencing. Zips from untrusted sources might be able to execute +arbitrary code in the Lambda Function used by this module, and use its permissions +to read or write unexpected files in the S3 bucket. + ## Retain on Delete By default, the contents of the destination bucket will **not** be deleted when the diff --git a/packages/@aws-cdk/aws-s3-deployment/lib/source.ts b/packages/@aws-cdk/aws-s3-deployment/lib/source.ts index 4eaea3fdc0060..8c22f49d791e3 100644 --- a/packages/@aws-cdk/aws-s3-deployment/lib/source.ts +++ b/packages/@aws-cdk/aws-s3-deployment/lib/source.ts @@ -55,6 +55,9 @@ export interface ISource { export class Source { /** * Uses a .zip file stored in an S3 bucket as the source for the destination bucket contents. + * + * Make sure you trust the producer of the archive. + * * @param bucket The S3 Bucket * @param zipObjectKey The S3 object key of the zip file with contents */ @@ -73,6 +76,10 @@ export class Source { /** * Uses a local asset as the deployment source. + * + * If the local asset is a .zip archive, make sure you trust the + * producer of the archive. + * * @param path The path to a local .zip file or a directory */ public static asset(path: string, options?: s3_assets.AssetOptions): ISource { From d0c96021adcead538c302fc9b1d0ec3baf69cb4f Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 24 Jun 2021 19:10:03 +0100 Subject: [PATCH 4/6] feat(sqs): add support for high throughput fifo (#15202) Closes #15063 *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-sqs/README.md | 3 +- packages/@aws-cdk/aws-sqs/lib/queue.ts | 62 +++++++++++++++++++ .../aws-sqs/test/integ.sqs.expected.json | 28 ++++++++- packages/@aws-cdk/aws-sqs/test/integ.sqs.ts | 8 ++- packages/@aws-cdk/aws-sqs/test/test.sqs.ts | 49 +++++++++++++++ 5 files changed, 147 insertions(+), 3 deletions(-) diff --git a/packages/@aws-cdk/aws-sqs/README.md b/packages/@aws-cdk/aws-sqs/README.md index a66e03a07aa20..c824f9410e8ad 100644 --- a/packages/@aws-cdk/aws-sqs/README.md +++ b/packages/@aws-cdk/aws-sqs/README.md @@ -63,4 +63,5 @@ features in order to help guarantee exactly-once processing. For more informatio the SQS manual. Note that FIFO queues are not available in all AWS regions. A queue can be made a FIFO queue by either setting `fifo: true`, giving it a name which ends -in `".fifo"`, or enabling content-based deduplication (which requires FIFO queues). +in `".fifo"`, or by enabling a FIFO specific feature such as: content-based deduplication, +deduplication scope or fifo throughput limit. diff --git a/packages/@aws-cdk/aws-sqs/lib/queue.ts b/packages/@aws-cdk/aws-sqs/lib/queue.ts index 1c3067c7a70d6..414ddaaf8a919 100644 --- a/packages/@aws-cdk/aws-sqs/lib/queue.ts +++ b/packages/@aws-cdk/aws-sqs/lib/queue.ts @@ -138,6 +138,26 @@ export interface QueueProps { */ readonly contentBasedDeduplication?: boolean; + /** + * For high throughput for FIFO queues, specifies whether message deduplication + * occurs at the message group or queue level. + * + * (Only applies to FIFO queues.) + * + * @default DeduplicationScope.QUEUE + */ + readonly deduplicationScope?: DeduplicationScope; + + /** + * For high throughput for FIFO queues, specifies whether the FIFO queue + * throughput quota applies to the entire queue or per message group. + * + * (Only applies to FIFO queues.) + * + * @default FifoThroughputLimit.PER_QUEUE + */ + readonly fifoThroughputLimit?: FifoThroughputLimit; + /** * Policy to apply when the user pool is removed from the stack * @@ -188,6 +208,34 @@ export enum QueueEncryption { KMS = 'KMS', } +/** + * What kind of deduplication scope to apply + */ +export enum DeduplicationScope { + /** + * Deduplication occurs at the message group level + */ + MESSAGE_GROUP = 'messageGroup', + /** + * Deduplication occurs at the message queue level + */ + QUEUE = 'queue', +} + +/** + * Whether the FIFO queue throughput quota applies to the entire queue or per message group + */ +export enum FifoThroughputLimit { + /** + * Throughput quota applies per queue + */ + PER_QUEUE = 'perQueue', + /** + * Throughput quota applies per message group id + */ + PER_MESSAGE_GROUP_ID = 'perMessageGroupId', +} + /** * A new Amazon SQS queue */ @@ -342,6 +390,8 @@ export class Queue extends QueueBase { const queueName = props.queueName; if (typeof fifoQueue === 'undefined' && queueName && !Token.isUnresolved(queueName) && queueName.endsWith('.fifo')) { fifoQueue = true; } if (typeof fifoQueue === 'undefined' && props.contentBasedDeduplication) { fifoQueue = true; } + if (typeof fifoQueue === 'undefined' && props.deduplicationScope) { fifoQueue = true; } + if (typeof fifoQueue === 'undefined' && props.fifoThroughputLimit) { fifoQueue = true; } // If we have a name, see that it agrees with the FIFO setting if (typeof queueName === 'string') { @@ -357,8 +407,18 @@ export class Queue extends QueueBase { throw new Error('Content-based deduplication can only be defined for FIFO queues'); } + if (props.deduplicationScope && !fifoQueue) { + throw new Error('Deduplication scope can only be defined for FIFO queues'); + } + + if (props.fifoThroughputLimit && !fifoQueue) { + throw new Error('FIFO throughput limit can only be defined for FIFO queues'); + } + return { contentBasedDeduplication: props.contentBasedDeduplication, + deduplicationScope: props.deduplicationScope, + fifoThroughputLimit: props.fifoThroughputLimit, fifoQueue, }; } @@ -367,6 +427,8 @@ export class Queue extends QueueBase { interface FifoProps { readonly fifoQueue?: boolean; readonly contentBasedDeduplication?: boolean; + readonly deduplicationScope?: DeduplicationScope; + readonly fifoThroughputLimit?: FifoThroughputLimit; } interface EncryptionProps { diff --git a/packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json b/packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json index c310198cfcae6..6dc7b035309d7 100644 --- a/packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json +++ b/packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json @@ -71,6 +71,16 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, + "HighThroughputFifoQueue40A0EEE4": { + "Type": "AWS::SQS::Queue", + "Properties": { + "DeduplicationScope": "messageGroup", + "FifoQueue": true, + "FifoThroughputLimit": "perMessageGroupId" + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "Role1ABCC5F0": { "Type": "AWS::IAM::Role", "Properties": { @@ -165,6 +175,22 @@ "Arn" ] } + }, + { + "Action": [ + "sqs:ReceiveMessage", + "sqs:ChangeMessageVisibility", + "sqs:GetQueueUrl", + "sqs:DeleteMessage", + "sqs:GetQueueAttributes" + ], + "Effect": "Allow", + "Resource": { + "Fn::GetAtt": [ + "HighThroughputFifoQueue40A0EEE4", + "Arn" + ] + } } ], "Version": "2012-10-17" @@ -185,4 +211,4 @@ } } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts b/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts index 6839d050783b5..76c51a0e99cc6 100644 --- a/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts +++ b/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts @@ -1,7 +1,7 @@ import { AccountRootPrincipal, Role } from '@aws-cdk/aws-iam'; import { Key } from '@aws-cdk/aws-kms'; import { App, CfnOutput, RemovalPolicy, Stack } from '@aws-cdk/core'; -import { Queue, QueueEncryption } from '../lib'; +import { DeduplicationScope, FifoThroughputLimit, Queue, QueueEncryption } from '../lib'; const app = new App(); @@ -16,6 +16,11 @@ const fifo = new Queue(stack, 'FifoQueue', { fifo: true, encryptionMasterKey: new Key(stack, 'EncryptionKey', { removalPolicy: RemovalPolicy.DESTROY }), }); +const highThroughputFifo = new Queue(stack, 'HighThroughputFifoQueue', { + fifo: true, + fifoThroughputLimit: FifoThroughputLimit.PER_MESSAGE_GROUP_ID, + deduplicationScope: DeduplicationScope.MESSAGE_GROUP, +}); const role = new Role(stack, 'Role', { assumedBy: new AccountRootPrincipal(), @@ -24,6 +29,7 @@ const role = new Role(stack, 'Role', { dlq.grantConsumeMessages(role); queue.grantConsumeMessages(role); fifo.grantConsumeMessages(role); +highThroughputFifo.grantConsumeMessages(role); new CfnOutput(stack, 'QueueUrl', { value: queue.queueUrl }); diff --git a/packages/@aws-cdk/aws-sqs/test/test.sqs.ts b/packages/@aws-cdk/aws-sqs/test/test.sqs.ts index f73f8491ae98a..da8637ba5d4f5 100644 --- a/packages/@aws-cdk/aws-sqs/test/test.sqs.ts +++ b/packages/@aws-cdk/aws-sqs/test/test.sqs.ts @@ -427,6 +427,55 @@ export = { test.done(); }, + 'test a fifo queue is observed when high throughput properties are specified'(test: Test) { + const stack = new Stack(); + const queue = new sqs.Queue(stack, 'Queue', { + fifo: true, + fifoThroughputLimit: sqs.FifoThroughputLimit.PER_MESSAGE_GROUP_ID, + deduplicationScope: sqs.DeduplicationScope.MESSAGE_GROUP, + }); + + test.deepEqual(queue.fifo, true); + expect(stack).toMatch({ + 'Resources': { + 'Queue4A7E3555': { + 'Type': 'AWS::SQS::Queue', + 'Properties': { + 'DeduplicationScope': 'messageGroup', + 'FifoQueue': true, + 'FifoThroughputLimit': 'perMessageGroupId', + }, + 'UpdateReplacePolicy': 'Delete', + 'DeletionPolicy': 'Delete', + }, + }, + }); + + test.done(); + }, + + 'test a queue throws when fifoThroughputLimit specified on non fifo queue'(test: Test) { + const stack = new Stack(); + test.throws(() => { + new sqs.Queue(stack, 'Queue', { + fifo: false, + fifoThroughputLimit: sqs.FifoThroughputLimit.PER_MESSAGE_GROUP_ID, + }); + }); + test.done(); + }, + + 'test a queue throws when deduplicationScope specified on non fifo queue'(test: Test) { + const stack = new Stack(); + test.throws(() => { + new sqs.Queue(stack, 'Queue', { + fifo: false, + deduplicationScope: sqs.DeduplicationScope.MESSAGE_GROUP, + }); + }); + test.done(); + }, + 'test metrics'(test: Test) { // GIVEN const stack = new Stack(); From 5f597877c75f9e92d3bf08eedb5007ecc3cb001e Mon Sep 17 00:00:00 2001 From: Cruaier Date: Fri, 25 Jun 2021 01:48:21 +0700 Subject: [PATCH 5/6] fix(stepfunctions-tasks): EcsRunTask containerOverrides throws if container name doesn't match construct ID (#15190) EcsRunTask, container override is now using using method `findContainer` to check for container in TaskDefinition fixes #15171 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../aws-ecs/lib/base/task-definition.ts | 2 +- .../lib/ecs/run-task.ts | 2 +- .../test/ecs/run-tasks.test.ts | 74 +++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts b/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts index fe17ce6cb2317..1861098e1395b 100644 --- a/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts @@ -647,7 +647,7 @@ export class TaskDefinition extends TaskDefinitionBase { /** * Returns the container that match the provided containerName. */ - private findContainer(containerName: string): ContainerDefinition | undefined { + public findContainer(containerName: string): ContainerDefinition | undefined { return this.containers.find(c => c.containerName === containerName); } diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/ecs/run-task.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/ecs/run-task.ts index b53b7cbab9dcf..496decc60c851 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/ecs/run-task.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/ecs/run-task.ts @@ -262,7 +262,7 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable { for (const override of this.props.containerOverrides ?? []) { const name = override.containerDefinition.containerName; if (!cdk.Token.isUnresolved(name)) { - const cont = this.props.taskDefinition.node.tryFindChild(name); + const cont = this.props.taskDefinition.findContainer(name); if (!cont) { throw new Error(`Overrides mention container with name '${name}', but no such container in task definition`); } diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/run-tasks.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/run-tasks.test.ts index 947b5cb0c8986..8e93cdd6d0aab 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/run-tasks.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/run-tasks.test.ts @@ -48,6 +48,80 @@ test('Cannot create a Fargate task without a default container', () => { ).toThrowError(/must have at least one essential container/); }); +test('Cannot override container definitions when container is not in task definition', () => { + const taskDefinitionA = new ecs.TaskDefinition(stack, 'TaskDefinitionA', { + memoryMiB: '512', + cpu: '256', + compatibility: ecs.Compatibility.FARGATE, + }); + taskDefinitionA.addContainer('TheContainerA', { + image: ecs.ContainerImage.fromRegistry('foo/bar'), + memoryLimitMiB: 256, + }); + + const taskDefinitionB = new ecs.TaskDefinition(stack, 'TaskDefinitionB', { + memoryMiB: '512', + cpu: '256', + compatibility: ecs.Compatibility.FARGATE, + }); + const containerDefinitionB = taskDefinitionB.addContainer('TheContainerB', { + image: ecs.ContainerImage.fromRegistry('foo/bar'), + memoryLimitMiB: 256, + }); + + expect(() => + new tasks.EcsRunTask(stack, 'task', { + cluster, + taskDefinition: taskDefinitionA, + containerOverrides: [ + { + containerDefinition: containerDefinitionB, + environment: [{ name: 'SOME_KEY', value: sfn.JsonPath.stringAt('$.SomeKey') }], + }, + ], + launchTarget: new tasks.EcsFargateLaunchTarget(), + }).toStateJson(), + ).toThrowError(/no such container in task definition/); +}); + +test('Running a task with container override and container has explicitly set a container name', () => { + const taskDefinition = new ecs.TaskDefinition(stack, 'TD', { + memoryMiB: '512', + cpu: '256', + compatibility: ecs.Compatibility.FARGATE, + }); + const containerDefinition = taskDefinition.addContainer('TheContainer', { + containerName: 'ExplicitContainerName', + image: ecs.ContainerImage.fromRegistry('foo/bar'), + memoryLimitMiB: 256, + }); + + expect(stack.resolve( + new tasks.EcsRunTask(stack, 'task', { + cluster, + taskDefinition, + containerOverrides: [ + { + containerDefinition, + environment: [{ name: 'SOME_KEY', value: sfn.JsonPath.stringAt('$.SomeKey') }], + }, + ], + launchTarget: new tasks.EcsFargateLaunchTarget(), + }).toStateJson())).toHaveProperty('Parameters.Overrides', { + ContainerOverrides: [ + { + Environment: [ + { + Name: 'SOME_KEY', + 'Value.$': '$.SomeKey', + }, + ], + Name: 'ExplicitContainerName', + }, + ], + }); +}); + test('Running a Fargate Task', () => { const taskDefinition = new ecs.TaskDefinition(stack, 'TD', { memoryMiB: '512', From 94eb3a8a02eed77581d81efc02214dc976ba6bfc Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Fri, 25 Jun 2021 13:19:36 +0300 Subject: [PATCH 6/6] feat(cfnspec): cloudformation spec v39.3.0 (#15311) * feat: cloudformation spec v39.3.0 * Add patch to work around wonky SAM spec update * pkglint fix * Ignore awslint error Co-authored-by: AWS CDK Team Co-authored-by: Rico Huijbers --- packages/@aws-cdk/aws-connect/.eslintrc.js | 3 + packages/@aws-cdk/aws-connect/.gitignore | 19 + packages/@aws-cdk/aws-connect/.npmignore | 30 + packages/@aws-cdk/aws-connect/LICENSE | 201 ++++ packages/@aws-cdk/aws-connect/NOTICE | 2 + packages/@aws-cdk/aws-connect/README.md | 20 + packages/@aws-cdk/aws-connect/jest.config.js | 2 + packages/@aws-cdk/aws-connect/lib/index.ts | 2 + packages/@aws-cdk/aws-connect/package.json | 103 ++ .../@aws-cdk/aws-connect/test/connect.test.ts | 6 + packages/@aws-cdk/aws-redshift/package.json | 3 +- packages/@aws-cdk/cfnspec/CHANGELOG.md | 166 ++++ packages/@aws-cdk/cfnspec/cfn.version | 2 +- ...0_CloudFormationResourceSpecification.json | 938 +++++++++++++++++- .../cfnspec/spec-source/000_sam.spec.json | 754 +++++++++++++- ...ResourcePolicy_CustomStatements_patch.json | 20 + .../cloudformation-include/package.json | 2 + packages/aws-cdk-lib/package.json | 1 + packages/decdk/package.json | 1 + packages/monocdk/package.json | 1 + packages/monocdk/rosetta/canary.ts-fixture | 21 + packages/monocdk/rosetta/default.ts-fixture | 1 + 22 files changed, 2264 insertions(+), 34 deletions(-) create mode 100644 packages/@aws-cdk/aws-connect/.eslintrc.js create mode 100644 packages/@aws-cdk/aws-connect/.gitignore create mode 100644 packages/@aws-cdk/aws-connect/.npmignore create mode 100644 packages/@aws-cdk/aws-connect/LICENSE create mode 100644 packages/@aws-cdk/aws-connect/NOTICE create mode 100644 packages/@aws-cdk/aws-connect/README.md create mode 100644 packages/@aws-cdk/aws-connect/jest.config.js create mode 100644 packages/@aws-cdk/aws-connect/lib/index.ts create mode 100644 packages/@aws-cdk/aws-connect/package.json create mode 100644 packages/@aws-cdk/aws-connect/test/connect.test.ts create mode 100644 packages/@aws-cdk/cfnspec/spec-source/500_AWS_Serverless_AuthResourcePolicy_CustomStatements_patch.json create mode 100644 packages/monocdk/rosetta/canary.ts-fixture diff --git a/packages/@aws-cdk/aws-connect/.eslintrc.js b/packages/@aws-cdk/aws-connect/.eslintrc.js new file mode 100644 index 0000000000000..61dd8dd001f63 --- /dev/null +++ b/packages/@aws-cdk/aws-connect/.eslintrc.js @@ -0,0 +1,3 @@ +const baseConfig = require('cdk-build-tools/config/eslintrc'); +baseConfig.parserOptions.project = __dirname + '/tsconfig.json'; +module.exports = baseConfig; diff --git a/packages/@aws-cdk/aws-connect/.gitignore b/packages/@aws-cdk/aws-connect/.gitignore new file mode 100644 index 0000000000000..62ebc95d75ce6 --- /dev/null +++ b/packages/@aws-cdk/aws-connect/.gitignore @@ -0,0 +1,19 @@ +*.js +*.js.map +*.d.ts +tsconfig.json +node_modules +*.generated.ts +dist +.jsii + +.LAST_BUILD +.nyc_output +coverage +.nycrc +.LAST_PACKAGE +*.snk +nyc.config.js +!.eslintrc.js +!jest.config.js +junit.xml diff --git a/packages/@aws-cdk/aws-connect/.npmignore b/packages/@aws-cdk/aws-connect/.npmignore new file mode 100644 index 0000000000000..4ee1f86e9b1de --- /dev/null +++ b/packages/@aws-cdk/aws-connect/.npmignore @@ -0,0 +1,30 @@ +# Don't include original .ts files when doing `npm pack` +*.ts +!*.d.ts +coverage +.nyc_output +*.tgz + +dist +.LAST_PACKAGE +.LAST_BUILD +!*.js + +# Include .jsii +!.jsii + +*.snk + +*.tsbuildinfo + +tsconfig.json + +.eslintrc.js +jest.config.js + +# exclude cdk artifacts +**/cdk.out +junit.xml +test/ + +!*.lit.ts \ No newline at end of file diff --git a/packages/@aws-cdk/aws-connect/LICENSE b/packages/@aws-cdk/aws-connect/LICENSE new file mode 100644 index 0000000000000..28e4bdcec77ec --- /dev/null +++ b/packages/@aws-cdk/aws-connect/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/@aws-cdk/aws-connect/NOTICE b/packages/@aws-cdk/aws-connect/NOTICE new file mode 100644 index 0000000000000..5fc3826926b5b --- /dev/null +++ b/packages/@aws-cdk/aws-connect/NOTICE @@ -0,0 +1,2 @@ +AWS Cloud Development Kit (AWS CDK) +Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-connect/README.md b/packages/@aws-cdk/aws-connect/README.md new file mode 100644 index 0000000000000..b1ce493585b71 --- /dev/null +++ b/packages/@aws-cdk/aws-connect/README.md @@ -0,0 +1,20 @@ +# AWS::Connect Construct Library + + +--- + +![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge) + +> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use. +> +> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib + +--- + + + +This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. + +```ts +import connect = require('@aws-cdk/aws-connect'); +``` diff --git a/packages/@aws-cdk/aws-connect/jest.config.js b/packages/@aws-cdk/aws-connect/jest.config.js new file mode 100644 index 0000000000000..54e28beb9798b --- /dev/null +++ b/packages/@aws-cdk/aws-connect/jest.config.js @@ -0,0 +1,2 @@ +const baseConfig = require('cdk-build-tools/config/jest.config'); +module.exports = baseConfig; diff --git a/packages/@aws-cdk/aws-connect/lib/index.ts b/packages/@aws-cdk/aws-connect/lib/index.ts new file mode 100644 index 0000000000000..b23864769ccf4 --- /dev/null +++ b/packages/@aws-cdk/aws-connect/lib/index.ts @@ -0,0 +1,2 @@ +// AWS::Connect CloudFormation Resources: +export * from './connect.generated'; diff --git a/packages/@aws-cdk/aws-connect/package.json b/packages/@aws-cdk/aws-connect/package.json new file mode 100644 index 0000000000000..c63ca8004bdee --- /dev/null +++ b/packages/@aws-cdk/aws-connect/package.json @@ -0,0 +1,103 @@ +{ + "name": "@aws-cdk/aws-connect", + "version": "0.0.0", + "description": "The CDK Construct Library for AWS::Connect", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "jsii": { + "outdir": "dist", + "projectReferences": true, + "targets": { + "dotnet": { + "namespace": "Amazon.CDK.AWS.Connect", + "packageId": "Amazon.CDK.AWS.Connect", + "signAssembly": true, + "assemblyOriginatorKeyFile": "../../key.snk", + "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png" + }, + "java": { + "package": "software.amazon.awscdk.services.connect", + "maven": { + "groupId": "software.amazon.awscdk", + "artifactId": "connect" + } + }, + "python": { + "classifiers": [ + "Framework :: AWS CDK", + "Framework :: AWS CDK :: 1" + ], + "distName": "aws-cdk.aws-connect", + "module": "aws_cdk.aws_connect" + } + } + }, + "repository": { + "type": "git", + "url": "https://github.com/aws/aws-cdk.git", + "directory": "packages/@aws-cdk/aws-connect" + }, + "homepage": "https://github.com/aws/aws-cdk", + "scripts": { + "build": "cdk-build", + "watch": "cdk-watch", + "lint": "cdk-lint", + "test": "cdk-test", + "integ": "cdk-integ", + "pkglint": "pkglint -f", + "package": "cdk-package", + "awslint": "cdk-awslint", + "cfn2ts": "cfn2ts", + "build+test": "yarn build && yarn test", + "build+test+package": "yarn build+test && yarn package", + "compat": "cdk-compat", + "gen": "cfn2ts", + "rosetta:extract": "yarn --silent jsii-rosetta extract", + "build+extract": "yarn build && yarn rosetta:extract", + "build+test+extract": "yarn build+test && yarn rosetta:extract" + }, + "cdk-build": { + "cloudformation": "AWS::Connect", + "jest": true, + "env": { + "AWSLINT_BASE_CONSTRUCT": "true" + } + }, + "keywords": [ + "aws", + "cdk", + "constructs", + "AWS::Connect", + "aws-connect" + ], + "author": { + "name": "Amazon Web Services", + "url": "https://aws.amazon.com", + "organization": true + }, + "license": "Apache-2.0", + "devDependencies": { + "@types/jest": "^26.0.22", + "@aws-cdk/assert-internal": "0.0.0", + "cdk-build-tools": "0.0.0", + "cfn2ts": "0.0.0", + "pkglint": "0.0.0" + }, + "dependencies": { + "@aws-cdk/core": "0.0.0" + }, + "peerDependencies": { + "@aws-cdk/core": "0.0.0" + }, + "engines": { + "node": ">= 10.13.0 <13 || >=13.7.0" + }, + "stability": "experimental", + "maturity": "cfn-only", + "awscdkio": { + "announce": false + }, + "publishConfig": { + "tag": "latest" + } +} diff --git a/packages/@aws-cdk/aws-connect/test/connect.test.ts b/packages/@aws-cdk/aws-connect/test/connect.test.ts new file mode 100644 index 0000000000000..c4505ad966984 --- /dev/null +++ b/packages/@aws-cdk/aws-connect/test/connect.test.ts @@ -0,0 +1,6 @@ +import '@aws-cdk/assert-internal/jest'; +import {} from '../lib'; + +test('No tests are specified for this package', () => { + expect(true).toBe(true); +}); diff --git a/packages/@aws-cdk/aws-redshift/package.json b/packages/@aws-cdk/aws-redshift/package.json index 5eb61d2340c16..4663e68c63c86 100644 --- a/packages/@aws-cdk/aws-redshift/package.json +++ b/packages/@aws-cdk/aws-redshift/package.json @@ -110,7 +110,8 @@ "docs-public-apis:@aws-cdk/aws-redshift.ParameterGroupParameters.parameterValue", "props-physical-name:@aws-cdk/aws-redshift.ClusterParameterGroupProps", "props-physical-name:@aws-cdk/aws-redshift.ClusterSubnetGroupProps", - "props-physical-name:@aws-cdk/aws-redshift.DatabaseSecretProps" + "props-physical-name:@aws-cdk/aws-redshift.DatabaseSecretProps", + "resource-attribute:@aws-cdk/aws-redshift.Cluster.clusterId" ] }, "stability": "experimental", diff --git a/packages/@aws-cdk/cfnspec/CHANGELOG.md b/packages/@aws-cdk/cfnspec/CHANGELOG.md index 4f368495066d3..be423cfb280fa 100644 --- a/packages/@aws-cdk/cfnspec/CHANGELOG.md +++ b/packages/@aws-cdk/cfnspec/CHANGELOG.md @@ -1,3 +1,169 @@ +# CloudFormation Resource Specification v39.3.0 + +## New Resource Types + +* AWS::CloudFormation::PublicTypeVersion +* AWS::CloudFormation::Publisher +* AWS::CloudFormation::TypeActivation +* AWS::Connect::QuickConnect +* AWS::KMS::ReplicaKey + +## Attribute Changes + +* AWS::Redshift::Cluster Id (__added__) +* AWS::Timestream::Table Name (__added__) + +## Property Changes + +* AWS::Amplify::App CustomRules.DuplicatesAllowed (__added__) +* AWS::Amplify::App EnvironmentVariables.DuplicatesAllowed (__added__) +* AWS::Amplify::App Tags.DuplicatesAllowed (__added__) +* AWS::Amplify::Branch EnvironmentVariables.DuplicatesAllowed (__added__) +* AWS::Amplify::Branch Tags.DuplicatesAllowed (__added__) +* AWS::AppSync::GraphQLApi LambdaAuthorizerConfig (__added__) +* AWS::AutoScaling::ScheduledAction TimeZone (__added__) +* AWS::CodeGuruReviewer::RepositoryAssociation BucketName (__added__) +* AWS::Cognito::UserPoolClient EnableTokenRevocation (__added__) +* AWS::EKS::Nodegroup UpdateConfig (__added__) +* AWS::ImageBuilder::ContainerRecipe DockerfileTemplateData.UpdateType (__changed__) + * Old: Mutable + * New: Immutable +* AWS::ImageBuilder::ContainerRecipe DockerfileTemplateUri.UpdateType (__changed__) + * Old: Mutable + * New: Immutable +* AWS::ImageBuilder::ContainerRecipe ImageOsVersionOverride.UpdateType (__changed__) + * Old: Mutable + * New: Immutable +* AWS::KMS::Key MultiRegion (__added__) +* AWS::MWAA::Environment Schedulers (__added__) +* AWS::QLDB::Ledger KmsKey (__added__) +* AWS::Redshift::Cluster Endpoint (__added__) +* AWS::Redshift::Cluster HsmClientCertificateIdentifier.Documentation (__changed__) + * Old: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmclientcertidentifier + * New: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmclientcertificateidentifier +* AWS::Redshift::Cluster HsmConfigurationIdentifier.Documentation (__changed__) + * Old: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-HsmConfigurationIdentifier + * New: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmconfigurationidentifier +* AWS::Redshift::Cluster NumberOfNodes.Documentation (__changed__) + * Old: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-nodetype + * New: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-numberofnodes +* AWS::Transfer::Server ProtocolDetails (__added__) + +## Property Type Changes + +* AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch (__added__) +* AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite (__added__) +* AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch (__added__) +* AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch (__added__) +* AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata (__added__) +* AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite (__added__) +* AWS::AppMesh::GatewayRoute.HttpPathMatch (__added__) +* AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch (__added__) +* AWS::AppMesh::GatewayRoute.QueryParameter (__added__) +* AWS::AppMesh::Route.HttpPathMatch (__added__) +* AWS::AppMesh::Route.HttpQueryParameterMatch (__added__) +* AWS::AppMesh::Route.QueryParameter (__added__) +* AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig (__added__) +* AWS::DataBrew::Recipe.ParameterMap (__added__) +* AWS::EKS::Nodegroup.UpdateConfig (__added__) +* AWS::FSx::FileSystem.AuditLogConfiguration (__added__) +* AWS::Redshift::Cluster.Endpoint (__added__) +* AWS::Transfer::Server.ProtocolDetails (__added__) +* AWS::Amplify::App.AutoBranchCreationConfig AutoBranchCreationPatterns.DuplicatesAllowed (__added__) +* AWS::Amplify::App.AutoBranchCreationConfig EnvironmentVariables.DuplicatesAllowed (__added__) +* AWS::ApiGatewayV2::DomainName.DomainNameConfiguration OwnershipVerificationCertificateArn (__added__) +* AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction Rewrite (__added__) +* AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch Hostname (__added__) +* AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch Metadata (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction Rewrite (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch Headers (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch Hostname (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch Method (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch Path (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch QueryParameters (__added__) +* AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch Prefix.Required (__changed__) + * Old: true + * New: false +* AWS::AppMesh::Route.HttpRouteMatch Path (__added__) +* AWS::AppMesh::Route.HttpRouteMatch QueryParameters (__added__) +* AWS::AppMesh::Route.HttpRouteMatch Prefix.Required (__changed__) + * Old: true + * New: false +* AWS::AppMesh::VirtualNode.DnsServiceDiscovery ResponseType (__added__) +* AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider LambdaAuthorizerConfig (__added__) +* AWS::AutoScaling::LaunchConfiguration.BlockDevice Throughput (__added__) +* AWS::DataBrew::Recipe.Action Parameters.Type (__added__) +* AWS::FSx::FileSystem.WindowsConfiguration AuditLogConfiguration (__added__) +* AWS::IoT::TopicRule.TimestreamAction BatchMode (__added__) +* AWS::WAFv2::RuleGroup.SizeConstraintStatement Size.PrimitiveType (__changed__) + * Old: Integer + * New: Double +* AWS::WAFv2::WebACL.SizeConstraintStatement Size.PrimitiveType (__changed__) + * Old: Integer + * New: Double + +# Serverless Application Model (SAM) Resource Specification v2016-10-31 + +## New Resource Types + +* AWS::Serverless::HttpApi + +## Attribute Changes + + +## Property Changes + +* AWS::Serverless::Api CanarySetting (__added__) +* AWS::Serverless::Api Description (__added__) +* AWS::Serverless::Api GatewayResponses (__added__) +* AWS::Serverless::Api MinimumCompressionSize (__added__) +* AWS::Serverless::Api Models (__added__) +* AWS::Serverless::Api Tags (__added__) +* AWS::Serverless::Api EndpointConfiguration.PrimitiveType (__deleted__) +* AWS::Serverless::Api EndpointConfiguration.Type (__added__) +* AWS::Serverless::Function AssumeRolePolicyDocument (__added__) +* AWS::Serverless::Function AutoPublishCodeSha256 (__added__) +* AWS::Serverless::Function CodeSigningConfigArn (__added__) +* AWS::Serverless::Function EventInvokeConfig (__added__) +* AWS::Serverless::Function ImageConfig (__added__) +* AWS::Serverless::Function ImageUri (__added__) +* AWS::Serverless::Function InlineCode (__added__) +* AWS::Serverless::Function PackageType (__added__) +* AWS::Serverless::Function VersionDescription (__added__) +* AWS::Serverless::StateMachine PermissionsBoundaries (__added__) +* AWS::Serverless::StateMachine Tracing (__added__) + +## Property Type Changes + +* AWS::Serverless::Function.OnFailure (__removed__) +* AWS::Serverless::Api.CanarySetting (__added__) +* AWS::Serverless::Api.EndpointConfiguration (__added__) +* AWS::Serverless::Function.Auth (__added__) +* AWS::Serverless::Function.AuthResourcePolicy (__added__) +* AWS::Serverless::Function.Destination (__added__) +* AWS::Serverless::Function.EventInvokeConfig (__added__) +* AWS::Serverless::Function.ImageConfig (__added__) +* AWS::Serverless::StateMachine.TracingConfiguration (__added__) +* AWS::Serverless::Api.S3Location Bucket.Documentation (__changed__) + * Old: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction + * New: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object +* AWS::Serverless::Api.S3Location Key.Documentation (__changed__) + * Old: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction + * New: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object +* AWS::Serverless::Api.S3Location Version.Documentation (__changed__) + * Old: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction + * New: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object +* AWS::Serverless::Function.ApiEvent Auth (__added__) +* AWS::Serverless::Function.DestinationConfig OnSuccess (__added__) +* AWS::Serverless::Function.DestinationConfig OnFailure.Type (__changed__) + * Old: OnFailure + * New: Destination + # CloudFormation Resource Specification v39.1.0 ## New Resource Types diff --git a/packages/@aws-cdk/cfnspec/cfn.version b/packages/@aws-cdk/cfnspec/cfn.version index b0440a7d2a4fb..c4c1d5c055c32 100644 --- a/packages/@aws-cdk/cfnspec/cfn.version +++ b/packages/@aws-cdk/cfnspec/cfn.version @@ -1 +1 @@ -39.1.0 +39.3.0 diff --git a/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json b/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json index c19f34263b04b..0f9c5d607d474 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json +++ b/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json @@ -985,6 +985,7 @@ "Properties": { "AutoBranchCreationPatterns": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-autobranchcreationpatterns", + "DuplicatesAllowed": true, "PrimitiveItemType": "String", "Required": false, "Type": "List", @@ -1028,6 +1029,7 @@ }, "EnvironmentVariables": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-environmentvariables", + "DuplicatesAllowed": true, "ItemType": "EnvironmentVariable", "Required": false, "Type": "List", @@ -2173,6 +2175,12 @@ "Required": false, "UpdateType": "Mutable" }, + "OwnershipVerificationCertificateArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-ownershipverificationcertificatearn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, "SecurityPolicy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-securitypolicy", "PrimitiveType": "String", @@ -4052,6 +4060,86 @@ } } }, + "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html#cfn-appmesh-gatewayroute-gatewayroutehostnamematch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Suffix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html#cfn-appmesh-gatewayroute-gatewayroutehostnamematch-suffix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamerewrite.html", + "Properties": { + "DefaultTargetHostname": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamerewrite.html#cfn-appmesh-gatewayroute-gatewayroutehostnamerewrite-defaulttargethostname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Prefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-prefix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Range": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-range", + "Required": false, + "Type": "GatewayRouteRangeMatch", + "UpdateType": "Mutable" + }, + "Regex": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-regex", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Suffix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-suffix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayrouterangematch.html", + "Properties": { + "End": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayrouterangematch.html#cfn-appmesh-gatewayroute-gatewayrouterangematch-end", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Mutable" + }, + "Start": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayrouterangematch.html#cfn-appmesh-gatewayroute-gatewayrouterangematch-start", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Mutable" + } + } + }, "AWS::AppMesh::GatewayRoute.GatewayRouteSpec": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutespec.html", "Properties": { @@ -4117,6 +4205,12 @@ "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouteaction.html", "Properties": { + "Rewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouteaction.html#cfn-appmesh-gatewayroute-grpcgatewayrouteaction-rewrite", + "Required": false, + "Type": "GrpcGatewayRouteRewrite", + "UpdateType": "Mutable" + }, "Target": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouteaction.html#cfn-appmesh-gatewayroute-grpcgatewayrouteaction-target", "Required": true, @@ -4128,6 +4222,19 @@ "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html", "Properties": { + "Hostname": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html#cfn-appmesh-gatewayroute-grpcgatewayroutematch-hostname", + "Required": false, + "Type": "GatewayRouteHostnameMatch", + "UpdateType": "Mutable" + }, + "Metadata": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html#cfn-appmesh-gatewayroute-grpcgatewayroutematch-metadata", + "ItemType": "GrpcGatewayRouteMetadata", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, "ServiceName": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html#cfn-appmesh-gatewayroute-grpcgatewayroutematch-servicename", "PrimitiveType": "String", @@ -4136,6 +4243,40 @@ } } }, + "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html", + "Properties": { + "Invert": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html#cfn-appmesh-gatewayroute-grpcgatewayroutemetadata-invert", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "Match": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html#cfn-appmesh-gatewayroute-grpcgatewayroutemetadata-match", + "Required": false, + "Type": "GatewayRouteMetadataMatch", + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html#cfn-appmesh-gatewayroute-grpcgatewayroutemetadata-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouterewrite.html", + "Properties": { + "Hostname": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouterewrite.html#cfn-appmesh-gatewayroute-grpcgatewayrouterewrite-hostname", + "Required": false, + "Type": "GatewayRouteHostnameRewrite", + "UpdateType": "Mutable" + } + } + }, "AWS::AppMesh::GatewayRoute.HttpGatewayRoute": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroute.html", "Properties": { @@ -4156,6 +4297,12 @@ "AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteaction.html", "Properties": { + "Rewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteaction.html#cfn-appmesh-gatewayroute-httpgatewayrouteaction-rewrite", + "Required": false, + "Type": "HttpGatewayRouteRewrite", + "UpdateType": "Mutable" + }, "Target": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteaction.html#cfn-appmesh-gatewayroute-httpgatewayrouteaction-target", "Required": true, @@ -4164,12 +4311,198 @@ } } }, + "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html", + "Properties": { + "Invert": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html#cfn-appmesh-gatewayroute-httpgatewayrouteheader-invert", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "Match": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html#cfn-appmesh-gatewayroute-httpgatewayrouteheader-match", + "Required": false, + "Type": "HttpGatewayRouteHeaderMatch", + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html#cfn-appmesh-gatewayroute-httpgatewayrouteheader-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Prefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-prefix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Range": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-range", + "Required": false, + "Type": "GatewayRouteRangeMatch", + "UpdateType": "Mutable" + }, + "Regex": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-regex", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Suffix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-suffix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html", "Properties": { + "Headers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-headers", + "ItemType": "HttpGatewayRouteHeader", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "Hostname": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-hostname", + "Required": false, + "Type": "GatewayRouteHostnameMatch", + "UpdateType": "Mutable" + }, + "Method": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-method", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-path", + "Required": false, + "Type": "HttpPathMatch", + "UpdateType": "Mutable" + }, "Prefix": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-prefix", "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "QueryParameters": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-queryparameters", + "ItemType": "QueryParameter", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutepathrewrite.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutepathrewrite.html#cfn-appmesh-gatewayroute-httpgatewayroutepathrewrite-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteprefixrewrite.html", + "Properties": { + "DefaultPrefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteprefixrewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouteprefixrewrite-defaultprefix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteprefixrewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouteprefixrewrite-value", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html", + "Properties": { + "Hostname": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouterewrite-hostname", + "Required": false, + "Type": "GatewayRouteHostnameRewrite", + "UpdateType": "Mutable" + }, + "Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouterewrite-path", + "Required": false, + "Type": "HttpGatewayRoutePathRewrite", + "UpdateType": "Mutable" + }, + "Prefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouterewrite-prefix", + "Required": false, + "Type": "HttpGatewayRoutePrefixRewrite", + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.HttpPathMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httppathmatch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httppathmatch.html#cfn-appmesh-gatewayroute-httppathmatch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Regex": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httppathmatch.html#cfn-appmesh-gatewayroute-httppathmatch-regex", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpqueryparametermatch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpqueryparametermatch.html#cfn-appmesh-gatewayroute-httpqueryparametermatch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::GatewayRoute.QueryParameter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-queryparameter.html", + "Properties": { + "Match": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-queryparameter.html#cfn-appmesh-gatewayroute-queryparameter-match", + "Required": false, + "Type": "HttpQueryParameterMatch", + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-queryparameter.html#cfn-appmesh-gatewayroute-queryparameter-name", + "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" } @@ -4427,6 +4760,34 @@ } } }, + "AWS::AppMesh::Route.HttpPathMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httppathmatch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httppathmatch.html#cfn-appmesh-route-httppathmatch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Regex": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httppathmatch.html#cfn-appmesh-route-httppathmatch-regex", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::AppMesh::Route.HttpQueryParameterMatch": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpqueryparametermatch.html", + "Properties": { + "Exact": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpqueryparametermatch.html#cfn-appmesh-route-httpqueryparametermatch-exact", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::AppMesh::Route.HttpRetryPolicy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpretrypolicy.html", "Properties": { @@ -4538,10 +4899,23 @@ "Required": false, "UpdateType": "Mutable" }, + "Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-path", + "Required": false, + "Type": "HttpPathMatch", + "UpdateType": "Mutable" + }, "Prefix": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-prefix", "PrimitiveType": "String", - "Required": true, + "Required": false, + "UpdateType": "Mutable" + }, + "QueryParameters": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-queryparameters", + "ItemType": "QueryParameter", + "Required": false, + "Type": "List", "UpdateType": "Mutable" }, "Scheme": { @@ -4586,6 +4960,23 @@ } } }, + "AWS::AppMesh::Route.QueryParameter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-queryparameter.html", + "Properties": { + "Match": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-queryparameter.html#cfn-appmesh-route-queryparameter-match", + "Required": false, + "Type": "HttpQueryParameterMatch", + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-queryparameter.html#cfn-appmesh-route-queryparameter-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, "AWS::AppMesh::Route.RouteSpec": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html", "Properties": { @@ -5315,6 +5706,12 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" + }, + "ResponseType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-dnsservicediscovery.html#cfn-appmesh-virtualnode-dnsservicediscovery-responsetype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" } } }, @@ -6723,6 +7120,12 @@ "Required": true, "UpdateType": "Mutable" }, + "LambdaAuthorizerConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html#cfn-appsync-graphqlapi-additionalauthenticationprovider-lambdaauthorizerconfig", + "Required": false, + "Type": "LambdaAuthorizerConfig", + "UpdateType": "Mutable" + }, "OpenIDConnectConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html#cfn-appsync-graphqlapi-additionalauthenticationprovider-openidconnectconfig", "Required": false, @@ -6767,6 +7170,29 @@ } } }, + "AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html", + "Properties": { + "AuthorizerResultTtlInSeconds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig-authorizerresultttlinseconds", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "AuthorizerUri": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig-authorizeruri", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "IdentityValidationExpression": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig-identityvalidationexpression", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::AppSync::GraphQLApi.LogConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-logconfig.html", "Properties": { @@ -8066,6 +8492,12 @@ "Required": false, "UpdateType": "Mutable" }, + "Throughput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-throughput", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, "VolumeSize": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-volumesize", "PrimitiveType": "Integer", @@ -10121,6 +10553,23 @@ } } }, + "AWS::CloudFormation::TypeActivation.LoggingConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-typeactivation-loggingconfig.html", + "Properties": { + "LogGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-typeactivation-loggingconfig.html#cfn-cloudformation-typeactivation-loggingconfig-loggroupname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "LogRoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-typeactivation-loggingconfig.html#cfn-cloudformation-typeactivation-loggingconfig-logrolearn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::CloudFront::CachePolicy.CachePolicyConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html", "Properties": { @@ -14394,6 +14843,80 @@ } } }, + "AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-phonenumberquickconnectconfig.html", + "Properties": { + "PhoneNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-phonenumberquickconnectconfig.html#cfn-connect-quickconnect-phonenumberquickconnectconfig-phonenumber", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, + "AWS::Connect::QuickConnect.QueueQuickConnectConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-queuequickconnectconfig.html", + "Properties": { + "ContactFlowArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-queuequickconnectconfig.html#cfn-connect-quickconnect-queuequickconnectconfig-contactflowarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "QueueArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-queuequickconnectconfig.html#cfn-connect-quickconnect-queuequickconnectconfig-queuearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, + "AWS::Connect::QuickConnect.QuickConnectConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html", + "Properties": { + "PhoneConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-phoneconfig", + "Required": false, + "Type": "PhoneNumberQuickConnectConfig", + "UpdateType": "Mutable" + }, + "QueueConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-queueconfig", + "Required": false, + "Type": "QueueQuickConnectConfig", + "UpdateType": "Mutable" + }, + "QuickConnectType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-quickconnecttype", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "UserConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-userconfig", + "Required": false, + "Type": "UserQuickConnectConfig", + "UpdateType": "Mutable" + } + } + }, + "AWS::Connect::QuickConnect.UserQuickConnectConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-userquickconnectconfig.html", + "Properties": { + "ContactFlowArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-userquickconnectconfig.html#cfn-connect-quickconnect-userquickconnectconfig-contactflowarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "UserArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-userquickconnectconfig.html#cfn-connect-quickconnect-userquickconnectconfig-userarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, "AWS::CustomerProfiles::Integration.ConnectorOperator": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html", "Properties": { @@ -16136,6 +16659,7 @@ "Parameters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-action.html#cfn-databrew-recipe-action-parameters", "Required": false, + "Type": "ParameterMap", "UpdateType": "Mutable" } } @@ -16192,6 +16716,9 @@ } } }, + "AWS::DataBrew::Recipe.ParameterMap": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-parametermap.html" + }, "AWS::DataBrew::Recipe.RecipeParameters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html", "Properties": { @@ -22586,6 +23113,23 @@ } } }, + "AWS::EKS::Nodegroup.UpdateConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-updateconfig.html", + "Properties": { + "MaxUnavailable": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-updateconfig.html#cfn-eks-nodegroup-updateconfig-maxunavailable", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "MaxUnavailablePercentage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-updateconfig.html#cfn-eks-nodegroup-updateconfig-maxunavailablepercentage", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::EMR::Cluster.Application": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html", "Properties": { @@ -26410,6 +26954,29 @@ } } }, + "AWS::FSx::FileSystem.AuditLogConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html", + "Properties": { + "AuditLogDestination": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration-auditlogdestination", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "FileAccessAuditLogLevel": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration-fileaccessauditloglevel", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "FileShareAccessAuditLogLevel": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration-fileshareaccessauditloglevel", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, "AWS::FSx::FileSystem.LustreConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html", "Properties": { @@ -26545,6 +27112,12 @@ "Type": "List", "UpdateType": "Mutable" }, + "AuditLogConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration", + "Required": false, + "Type": "AuditLogConfiguration", + "UpdateType": "Mutable" + }, "AutomaticBackupRetentionDays": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-automaticbackupretentiondays", "PrimitiveType": "Integer", @@ -32705,6 +33278,12 @@ "AWS::IoT::TopicRule.TimestreamAction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html", "Properties": { + "BatchMode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-batchmode", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, "DatabaseName": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-databasename", "PrimitiveType": "String", @@ -51357,6 +51936,23 @@ } } }, + "AWS::Redshift::Cluster.Endpoint": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html", + "Properties": { + "Address": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html#cfn-redshift-cluster-endpoint-address", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Port": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html#cfn-redshift-cluster-endpoint-port", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::Redshift::Cluster.LoggingProperties": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html", "Properties": { @@ -57746,6 +58342,17 @@ "AWS::Transfer::Server.Protocol": { "PrimitiveType": "String" }, + "AWS::Transfer::Server.ProtocolDetails": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-protocoldetails.html", + "Properties": { + "PassiveIp": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-protocoldetails.html#cfn-transfer-server-protocoldetails-passiveip", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::Transfer::User.HomeDirectoryMapEntry": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-homedirectorymapentry.html", "Properties": { @@ -58741,7 +59348,7 @@ }, "Size": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sizeconstraintstatement.html#cfn-wafv2-rulegroup-sizeconstraintstatement-size", - "PrimitiveType": "Integer", + "PrimitiveType": "Double", "Required": true, "UpdateType": "Mutable" }, @@ -59512,7 +60119,7 @@ }, "Size": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sizeconstraintstatement.html#cfn-wafv2-webacl-sizeconstraintstatement-size", - "PrimitiveType": "Integer", + "PrimitiveType": "Double", "Required": true, "UpdateType": "Mutable" }, @@ -60043,7 +60650,7 @@ } } }, - "ResourceSpecificationVersion": "39.1.0", + "ResourceSpecificationVersion": "39.3.0", "ResourceTypes": { "AWS::ACMPCA::Certificate": { "Attributes": { @@ -60510,6 +61117,7 @@ }, "CustomRules": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-customrules", + "DuplicatesAllowed": true, "ItemType": "CustomRule", "Required": false, "Type": "List", @@ -60529,6 +61137,7 @@ }, "EnvironmentVariables": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-environmentvariables", + "DuplicatesAllowed": true, "ItemType": "EnvironmentVariable", "Required": false, "Type": "List", @@ -60560,6 +61169,7 @@ }, "Tags": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-tags", + "DuplicatesAllowed": true, "ItemType": "Tag", "Required": false, "Type": "List", @@ -60628,6 +61238,7 @@ }, "EnvironmentVariables": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-environmentvariables", + "DuplicatesAllowed": true, "ItemType": "EnvironmentVariable", "Required": false, "Type": "List", @@ -60647,6 +61258,7 @@ }, "Tags": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-tags", + "DuplicatesAllowed": true, "ItemType": "Tag", "Required": false, "Type": "List", @@ -63801,6 +64413,12 @@ "Required": true, "UpdateType": "Mutable" }, + "LambdaAuthorizerConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig", + "Required": false, + "Type": "LambdaAuthorizerConfig", + "UpdateType": "Mutable" + }, "LogConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-logconfig", "Required": false, @@ -64820,6 +65438,12 @@ "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" + }, + "TimeZone": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-timezone", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" } } }, @@ -65790,6 +66414,83 @@ } } }, + "AWS::CloudFormation::PublicTypeVersion": { + "Attributes": { + "PublicTypeArn": { + "PrimitiveType": "String" + }, + "PublisherId": { + "PrimitiveType": "String" + }, + "TypeVersionArn": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html", + "Properties": { + "Arn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-arn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "LogDeliveryBucket": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-logdeliverybucket", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "PublicVersionNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-publicversionnumber", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-type", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "TypeName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-typename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::CloudFormation::Publisher": { + "Attributes": { + "IdentityProvider": { + "PrimitiveType": "String" + }, + "PublisherId": { + "PrimitiveType": "String" + }, + "PublisherProfile": { + "PrimitiveType": "String" + }, + "PublisherStatus": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html", + "Properties": { + "AcceptTermsAndConditions": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html#cfn-cloudformation-publisher-accepttermsandconditions", + "PrimitiveType": "Boolean", + "Required": true, + "UpdateType": "Immutable" + }, + "ConnectionArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html#cfn-cloudformation-publisher-connectionarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::CloudFormation::ResourceDefaultVersion": { "Attributes": { "Arn": { @@ -66010,6 +66711,76 @@ } } }, + "AWS::CloudFormation::TypeActivation": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html", + "Properties": { + "AutoUpdate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-autoupdate", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "ExecutionRoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-executionrolearn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "LoggingConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-loggingconfig", + "Required": false, + "Type": "LoggingConfig", + "UpdateType": "Immutable" + }, + "MajorVersion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-majorversion", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "PublicTypeArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-publictypearn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "PublisherId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-publisherid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-type", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "TypeName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-typename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "TypeNameAlias": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-typenamealias", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "VersionBump": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-versionbump", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::CloudFormation::WaitCondition": { "Attributes": { "Data": { @@ -67294,6 +68065,12 @@ }, "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html", "Properties": { + "BucketName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-bucketname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "ConnectionArn": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-connectionarn", "PrimitiveType": "String", @@ -67970,6 +68747,12 @@ "Required": false, "UpdateType": "Mutable" }, + "EnableTokenRevocation": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-enabletokenrevocation", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, "ExplicitAuthFlows": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-explicitauthflows", "PrimitiveItemType": "String", @@ -68713,6 +69496,48 @@ } } }, + "AWS::Connect::QuickConnect": { + "Attributes": { + "QuickConnectArn": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html", + "Properties": { + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "InstanceArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-instancearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "QuickConnectConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-quickconnectconfig", + "Required": true, + "Type": "QuickConnectConfig", + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-tags", + "DuplicatesAllowed": false, + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, "AWS::CustomerProfiles::Domain": { "Attributes": { "CreatedAt": { @@ -75051,6 +75876,12 @@ "Type": "List", "UpdateType": "Mutable" }, + "UpdateConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-updateconfig", + "Required": false, + "Type": "UpdateConfig", + "UpdateType": "Mutable" + }, "Version": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-version", "PrimitiveType": "String", @@ -80984,19 +81815,19 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-dockerfiletemplatedata", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, "DockerfileTemplateUri": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-dockerfiletemplateuri", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, "ImageOsVersionOverride": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-imageosversionoverride", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, "InstanceConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-instanceconfiguration", @@ -83268,6 +84099,12 @@ "Required": false, "UpdateType": "Mutable" }, + "MultiRegion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-multiregion", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, "PendingWindowInDays": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-pendingwindowindays", "PrimitiveType": "Integer", @@ -83284,6 +84121,57 @@ } } }, + "AWS::KMS::ReplicaKey": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "KeyId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html", + "Properties": { + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Enabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-enabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "KeyPolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-keypolicy", + "PrimitiveType": "Json", + "Required": true, + "UpdateType": "Mutable" + }, + "PendingWindowInDays": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-pendingwindowindays", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "PrimaryKeyArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-primarykeyarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-tags", + "DuplicatesAllowed": false, + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, "AWS::Kendra::DataSource": { "Attributes": { "Arn": { @@ -85176,6 +86064,12 @@ "Required": false, "UpdateType": "Mutable" }, + "Schedulers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-schedulers", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, "SourceBucketArn": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-sourcebucketarn", "PrimitiveType": "String", @@ -89139,6 +90033,12 @@ "Required": false, "UpdateType": "Mutable" }, + "KmsKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-kmskey", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, "Name": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-name", "PrimitiveType": "String", @@ -90789,6 +91689,9 @@ }, "Endpoint.Port": { "PrimitiveType": "String" + }, + "Id": { + "PrimitiveType": "String" } }, "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html", @@ -90867,14 +91770,20 @@ "Required": false, "UpdateType": "Immutable" }, + "Endpoint": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-endpoint", + "Required": false, + "Type": "Endpoint", + "UpdateType": "Mutable" + }, "HsmClientCertificateIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmclientcertidentifier", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmclientcertificateidentifier", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, "HsmConfigurationIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-HsmConfigurationIdentifier", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmconfigurationidentifier", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" @@ -90918,7 +91827,7 @@ "UpdateType": "Mutable" }, "NumberOfNodes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-nodetype", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-numberofnodes", "PrimitiveType": "Integer", "Required": false, "UpdateType": "Mutable" @@ -96271,6 +97180,9 @@ "Attributes": { "Arn": { "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" } }, "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html", @@ -96355,6 +97267,12 @@ "Required": false, "UpdateType": "Mutable" }, + "ProtocolDetails": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-protocoldetails", + "Required": false, + "Type": "ProtocolDetails", + "UpdateType": "Mutable" + }, "Protocols": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-protocols", "ItemType": "Protocol", diff --git a/packages/@aws-cdk/cfnspec/spec-source/000_sam.spec.json b/packages/@aws-cdk/cfnspec/spec-source/000_sam.spec.json index 41065e7109a19..60341f3221e68 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/000_sam.spec.json +++ b/packages/@aws-cdk/cfnspec/spec-source/000_sam.spec.json @@ -1,4 +1,44 @@ { + "Globals": { + "Children": { + "Api": { + "Exclude": [ + "StageName", + "DefinitionBody" + ], + "Reference": "AWS::Serverless::Api" + }, + "Function": { + "Exclude": [ + "Role", + "Policies", + "FunctionName", + "Events", + "FileSystemConfigs", + "ProvisionedConcurrencyConfig" + ], + "Reference": "AWS::Serverless::Function" + }, + "HttpApi": { + "Exclude": [ + "StageName", + "DefinitionBody", + "DefinitionUri" + ], + "Reference": "AWS::Serverless::HttpApi" + }, + "SimpleTable": { + "Exclude": [ + "PrimaryKey", + "ProvisionedThroughput", + "Tags", + "TableName" + ], + "Reference": "AWS::Serverless::SimpleTable" + } + }, + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/docs/globals.rst" + }, "PropertyTypes": { "AWS::Serverless::Api.AccessLogSetting": { "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html", @@ -34,6 +74,36 @@ } } }, + "AWS::Serverless::Api.CanarySetting": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html", + "Properties": { + "DeploymentId": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-deploymentid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "PercentTraffic": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-percenttraffic", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Immutable" + }, + "StageVariableOverrides": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-stagevariableoverrides", + "PrimitiveItemType": "String", + "Required": false, + "Type": "Map", + "UpdateType": "Immutable" + }, + "UseStageCache": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-usestagecache", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::Api.CorsConfiguration": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration", "Properties": { @@ -69,23 +139,41 @@ } } }, + "AWS::Serverless::Api.EndpointConfiguration": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-api-endpointconfiguration.html", + "Properties": { + "Type": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-api-endpointconfiguration.html#sam-api-endpointconfiguration-type", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "VpcEndpointIds": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-api-endpointconfiguration.html#sam-api-endpointconfiguration-vpcendpointids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::Api.S3Location": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", "Properties": { "Bucket": { - "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, "Key": { - "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, "Version": { - "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", "PrimitiveType": "Integer", "Required": true, "UpdateType": "Immutable" @@ -124,6 +212,12 @@ "AWS::Serverless::Function.ApiEvent": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api", "Properties": { + "Auth": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api", + "Required": false, + "Type": "Auth", + "UpdateType": "Immutable" + }, "Method": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api", "PrimitiveType": "String", @@ -144,6 +238,118 @@ } } }, + "AWS::Serverless::Function.Auth": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "Properties": { + "ApiKeyRequired": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "AuthorizationScopes": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "Authorizer": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "ResourcePolicy": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "Required": false, + "Type": "AuthResourcePolicy", + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::Function.AuthResourcePolicy": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "Properties": { + "AwsAccountBlacklist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "AwsAccountWhitelist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "CustomStatements": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "Map", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "IntrinsicVpcBlacklist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "IntrinsicVpcWhitelist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "IntrinsicVpceBlacklist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "IntrinsicVpceWhitelist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "IpRangeBlacklist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "IpRangeWhitelist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "SourceVpcBlacklist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "SourceVpcWhitelist": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#function-auth-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::Function.BucketSAMPT": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst", "Properties": { @@ -260,13 +466,36 @@ } } }, + "AWS::Serverless::Function.Destination": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", + "Properties": { + "Destination": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Type": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::Function.DestinationConfig": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", "Properties": { "OnFailure": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", "Required": true, - "Type": "OnFailure", + "Type": "Destination", + "UpdateType": "Immutable" + }, + "OnSuccess": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", + "Required": true, + "Type": "Destination", "UpdateType": "Immutable" } } @@ -380,6 +609,29 @@ } } }, + "AWS::Serverless::Function.EventInvokeConfig": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#event-invoke-config-object", + "Properties": { + "DestinationConfig": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#event-invoke-config-object", + "Required": false, + "Type": "DestinationConfig", + "UpdateType": "Immutable" + }, + "MaximumEventAgeInSeconds": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#event-invoke-config-object", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Immutable" + }, + "MaximumRetryAttempts": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#event-invoke-config-object", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::Function.EventSource": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object", "Properties": { @@ -472,6 +724,31 @@ } } }, + "AWS::Serverless::Function.ImageConfig": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html", + "Properties": { + "Command": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html#cfn-lambda-function-imageconfig-command", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "EntryPoint": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html#cfn-lambda-function-imageconfig-entrypoint", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "WorkingDirectory": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html#cfn-lambda-function-imageconfig-workingdirectory", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::Function.IoTRuleEvent": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule", "Properties": { @@ -540,23 +817,6 @@ } } }, - "AWS::Serverless::Function.OnFailure": { - "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", - "Properties": { - "Destination": { - "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Type": { - "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - } - } - }, "AWS::Serverless::Function.ProvisionedConcurrencyConfig": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#provisioned-concurrency-config-object", "Properties": { @@ -955,6 +1215,239 @@ } } }, + "AWS::Serverless::HttpApi.AccessLogSetting": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html", + "Properties": { + "DestinationArn": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-destinationarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Format": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-format", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.CorsConfigurationObject": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "Properties": { + "AllowCredentials": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "AllowHeaders": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "AllowMethods": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "AllowOrigin": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "ExposeHeaders": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "MaxAge": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.HttpApiAuth": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-httpapiauth.html", + "Properties": { + "Authorizers": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-httpapiauth.html#sam-httpapi-httpapiauth-defaultauthorizer", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Immutable" + }, + "DefaultAuthorizer": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-httpapiauth.html#sam-httpapi-httpapiauth-authorizers", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.HttpApiDomainConfiguration": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "Properties": { + "BasePath": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "CertificateArn": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DomainName": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "EndpointConfiguration": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "MutualTlsAuthentication": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-httpapidomainconfiguration.html#sam-httpapi-httpapidomainconfiguration-mutualtlsauthentication", + "Required": false, + "Type": "MutualTlsAuthentication", + "UpdateType": "Immutable" + }, + "Route53": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "Required": false, + "Type": "Route53Configuration", + "UpdateType": "Immutable" + }, + "SecurityPolicy": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#domain-configuration-object", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.MutualTlsAuthentication": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-mutualtlsauthentication.html", + "Properties": { + "TruststoreUri": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-mutualtlsauthentication.html#cfn-apigatewayv2-domainname-mutualtlsauthentication-truststoreuri", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "TruststoreVersion": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-mutualtlsauthentication.html#cfn-apigatewayv2-domainname-mutualtlsauthentication-truststoreversion", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.Route53Configuration": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-route53configuration.html", + "Properties": { + "DistributedDomainName": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-route53configuration.html#sam-httpapi-route53configuration-distributiondomainname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "EvaluateTargetHealth": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-route53configuration.html#sam-httpapi-route53configuration-evaluatetargethealth", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "HostedZoneId": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-route53configuration.html#sam-httpapi-route53configuration-hostedzoneid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "HostedZoneName": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-route53configuration.html#sam-httpapi-route53configuration-hostedzonename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "IpV6": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-httpapi-route53configuration.html#sam-httpapi-route53configuration-ipv6", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.RouteSettings": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html", + "Properties": { + "DataTraceEnabled": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-datatraceenabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "DetailedMetricsEnabled": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-detailedmetricsenabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "LoggingLevel": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-logginglevel", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "ThrottlingBurstLimit": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-throttlingburstlimit", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Immutable" + }, + "ThrottlingRateLimit": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-throttlingratelimit", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Immutable" + } + } + }, + "AWS::Serverless::HttpApi.S3Location": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", + "Properties": { + "Bucket": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Key": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Version": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::LayerVersion.S3Location": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object", "Properties": { @@ -1259,6 +1752,17 @@ "UpdateType": "Immutable" } } + }, + "AWS::Serverless::StateMachine.TracingConfiguration": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api", + "Properties": { + "Enabled": { + "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-tracingconfiguration.html", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + } + } } }, "ResourceSpecificationTransform": "AWS::Serverless-2016-10-31", @@ -1298,6 +1802,12 @@ "Required": false, "UpdateType": "Immutable" }, + "CanarySetting": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-api.html#sam-api-canarysetting", + "Required": false, + "Type": "CanarySetting", + "UpdateType": "Immutable" + }, "Cors": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi", "PrimitiveTypes": [ @@ -1326,10 +1836,23 @@ ], "UpdateType": "Immutable" }, + "Description": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-api.html#sam-api-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "EndpointConfiguration": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi", - "PrimitiveType": "String", "Required": false, + "Type": "EndpointConfiguration", + "UpdateType": "Immutable" + }, + "GatewayResponses": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-api.html#sam-api-gatewayresponses", + "PrimitiveItemType": "String", + "Required": false, + "Type": "Map", "UpdateType": "Immutable" }, "MethodSettings": { @@ -1339,6 +1862,19 @@ "Type": "List", "UpdateType": "Immutable" }, + "MinimumCompressionSize": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-api.html#sam-api-minimumcompressionsize", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Immutable" + }, + "Models": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-api.html#sam-api-models", + "PrimitiveItemType": "String", + "Required": false, + "Type": "Map", + "UpdateType": "Immutable" + }, "Name": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi", "PrimitiveType": "String", @@ -1357,6 +1893,13 @@ "Required": true, "UpdateType": "Immutable" }, + "Tags": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveItemType": "String", + "Required": false, + "Type": "Map", + "UpdateType": "Immutable" + }, "TracingEnabled": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi", "PrimitiveType": "Boolean", @@ -1418,12 +1961,30 @@ "AWS::Serverless::Function": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "Properties": { + "AssumeRolePolicyDocument": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-assumerolepolicydocument", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Immutable" + }, "AutoPublishAlias": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, + "AutoPublishCodeSha256": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-autopublishcodesha256", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "CodeSigningConfigArn": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-codesigningconfigarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "CodeUri": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "PrimitiveTypes": [ @@ -1459,6 +2020,12 @@ "Type": "FunctionEnvironment", "UpdateType": "Immutable" }, + "EventInvokeConfig": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", + "Required": false, + "Type": "EventInvokeConfig", + "UpdateType": "Immutable" + }, "Events": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "ItemType": "EventSource", @@ -1485,6 +2052,24 @@ "Required": true, "UpdateType": "Immutable" }, + "ImageConfig": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-imageconfig", + "Required": false, + "Type": "ImageConfig", + "UpdateType": "Immutable" + }, + "ImageUri": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-imageuri", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "InlineCode": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "KmsKeyArn": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "PrimitiveType": "String", @@ -1504,6 +2089,12 @@ "Required": false, "UpdateType": "Immutable" }, + "PackageType": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-packagetype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "PermissionsBoundary": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "PrimitiveType": "String", @@ -1571,6 +2162,12 @@ "Required": false, "UpdateType": "Immutable" }, + "VersionDescription": { + "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "VpcConfig": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction", "Required": false, @@ -1579,6 +2176,107 @@ } } }, + "AWS::Serverless::HttpApi": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "Properties": { + "AccessLogSetting": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "Required": false, + "Type": "AccessLogSetting", + "UpdateType": "Immutable" + }, + "Auth": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "Required": false, + "Type": "HttpApiAuth", + "UpdateType": "Immutable" + }, + "CorsConfiguration": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveTypes": [ + "Boolean" + ], + "Required": false, + "Types": [ + "CorsConfigurationObject" + ], + "UpdateType": "Immutable" + }, + "DefaultRouteSettings": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "Required": false, + "Type": "RouteSettings", + "UpdateType": "Immutable" + }, + "DefinitionBody": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Immutable" + }, + "DefinitionUri": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveTypes": [ + "String" + ], + "Required": false, + "Types": [ + "S3Location" + ], + "UpdateType": "Immutable" + }, + "Description": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "DisableExecuteApiEndpoint": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-httpapi.html#sam-httpapi-disableexecuteapiendpoint", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "Domain": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "Required": false, + "Type": "HttpApiDomainConfiguration", + "UpdateType": "Immutable" + }, + "FailOnWarnings": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "RouteSettings": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "Required": false, + "Type": "RouteSettings", + "UpdateType": "Immutable" + }, + "StageName": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "StageVariables": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveItemType": "String", + "Required": false, + "Type": "Map", + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "https://github.com/aws/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesshttpapi", + "PrimitiveItemType": "String", + "Required": false, + "Type": "Map", + "UpdateType": "Immutable" + } + } + }, "AWS::Serverless::LayerVersion": { "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion", "Properties": { @@ -1708,6 +2406,12 @@ "Required": false, "UpdateType": "Immutable" }, + "PermissionsBoundaries": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html#sam-statemachine-permissionsboundary", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, "Policies": { "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html", "ItemTypes": [ @@ -1739,6 +2443,12 @@ "Type": "Map", "UpdateType": "Immutable" }, + "Tracing": { + "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html#sam-statemachine-tracing", + "Required": false, + "Type": "TracingConfiguration", + "UpdateType": "Immutable" + }, "Type": { "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html", "PrimitiveType": "String", diff --git a/packages/@aws-cdk/cfnspec/spec-source/500_AWS_Serverless_AuthResourcePolicy_CustomStatements_patch.json b/packages/@aws-cdk/cfnspec/spec-source/500_AWS_Serverless_AuthResourcePolicy_CustomStatements_patch.json new file mode 100644 index 0000000000000..1523075c3da5b --- /dev/null +++ b/packages/@aws-cdk/cfnspec/spec-source/500_AWS_Serverless_AuthResourcePolicy_CustomStatements_patch.json @@ -0,0 +1,20 @@ +{ + "PropertyTypes": { + "AWS::Serverless::Function.AuthResourcePolicy": { + "patch": { + "description": "Replace incorrect PrimitiveItemType", + "operations": [ + { + "op": "remove", + "path": "/Properties/CustomStatements/PrimitiveItemType" + }, + { + "op": "add", + "path": "/Properties/CustomStatements/PrimitiveItemType", + "value": "Json" + } + ] + } + } + } +} diff --git a/packages/@aws-cdk/cloudformation-include/package.json b/packages/@aws-cdk/cloudformation-include/package.json index 7bdb186fe6d8d..926dd3d13b5d0 100644 --- a/packages/@aws-cdk/cloudformation-include/package.json +++ b/packages/@aws-cdk/cloudformation-include/package.json @@ -110,6 +110,7 @@ "@aws-cdk/aws-codestarnotifications": "0.0.0", "@aws-cdk/aws-cognito": "0.0.0", "@aws-cdk/aws-config": "0.0.0", + "@aws-cdk/aws-connect": "0.0.0", "@aws-cdk/aws-cur": "0.0.0", "@aws-cdk/aws-customerprofiles": "0.0.0", "@aws-cdk/aws-databrew": "0.0.0", @@ -276,6 +277,7 @@ "@aws-cdk/aws-codestarnotifications": "0.0.0", "@aws-cdk/aws-cognito": "0.0.0", "@aws-cdk/aws-config": "0.0.0", + "@aws-cdk/aws-connect": "0.0.0", "@aws-cdk/aws-cur": "0.0.0", "@aws-cdk/aws-customerprofiles": "0.0.0", "@aws-cdk/aws-databrew": "0.0.0", diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index 05b8b779945bc..8761fbbf8e44e 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -174,6 +174,7 @@ "@aws-cdk/aws-codestarnotifications": "0.0.0", "@aws-cdk/aws-cognito": "0.0.0", "@aws-cdk/aws-config": "0.0.0", + "@aws-cdk/aws-connect": "0.0.0", "@aws-cdk/aws-cur": "0.0.0", "@aws-cdk/aws-customerprofiles": "0.0.0", "@aws-cdk/aws-databrew": "0.0.0", diff --git a/packages/decdk/package.json b/packages/decdk/package.json index 097705ddc1419..d3db39216e69b 100644 --- a/packages/decdk/package.json +++ b/packages/decdk/package.json @@ -82,6 +82,7 @@ "@aws-cdk/aws-codestarnotifications": "0.0.0", "@aws-cdk/aws-cognito": "0.0.0", "@aws-cdk/aws-config": "0.0.0", + "@aws-cdk/aws-connect": "0.0.0", "@aws-cdk/aws-cur": "0.0.0", "@aws-cdk/aws-customerprofiles": "0.0.0", "@aws-cdk/aws-databrew": "0.0.0", diff --git a/packages/monocdk/package.json b/packages/monocdk/package.json index 0e27b2716c1b9..a075a584e92bd 100644 --- a/packages/monocdk/package.json +++ b/packages/monocdk/package.json @@ -175,6 +175,7 @@ "@aws-cdk/aws-codestarnotifications": "0.0.0", "@aws-cdk/aws-cognito": "0.0.0", "@aws-cdk/aws-config": "0.0.0", + "@aws-cdk/aws-connect": "0.0.0", "@aws-cdk/aws-cur": "0.0.0", "@aws-cdk/aws-customerprofiles": "0.0.0", "@aws-cdk/aws-databrew": "0.0.0", diff --git a/packages/monocdk/rosetta/canary.ts-fixture b/packages/monocdk/rosetta/canary.ts-fixture new file mode 100644 index 0000000000000..d1950f9d9bcbe --- /dev/null +++ b/packages/monocdk/rosetta/canary.ts-fixture @@ -0,0 +1,21 @@ +// Fixture with a canary already created, named `canary` +import { Construct, Duration, Stack } from '@aws-cdk/core'; +import * as synthetics from '@aws-cdk/aws-synthetics'; +import * as path from 'path'; + +class Fixture extends Stack { + constructor(scope: Construct, id: string) { + super(scope, id); + + const canary = new synthetics.Canary(this, 'MyCanary', { + schedule: synthetics.Schedule.rate(Duration.minutes(5)), + test: synthetics.Test.custom({ + code: synthetics.Code.fromAsset(path.join(__dirname, 'canary')), + handler: 'index.handler', + }), + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_1, + }); + + /// here + } +} diff --git a/packages/monocdk/rosetta/default.ts-fixture b/packages/monocdk/rosetta/default.ts-fixture index b4fc6518a606e..558cc09b1c049 100644 --- a/packages/monocdk/rosetta/default.ts-fixture +++ b/packages/monocdk/rosetta/default.ts-fixture @@ -23,6 +23,7 @@ import { CustomResource, CustomResourceProvider, CustomResourceProviderRuntime, + DependableTrait, Duration, Fn, IConstruct,