Merge branch 'main' into ce-anomaly

aws · Jan 2, 2024 · 2525154 · 2525154
2 parents b0a1a01 + 5dd8072
commit 2525154
Show file tree

Hide file tree

Showing 128 changed files with 247 additions and 178 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -4,16 +4,16 @@ Shout out to our top contributors!
 - [rix0rrr](https://github.com/rix0rrr)
 - [skinny85](https://github.com/skinny85)
 - [RomainMuller](https://github.com/RomainMuller)
-- [njlynch](https://github.com/njlynch)
 - [kaizencc](https://github.com/kaizencc)
+- [njlynch](https://github.com/njlynch)
 - [jogold](https://github.com/jogold)
 - [iliapolo](https://github.com/iliapolo)
 - [corymhall](https://github.com/corymhall)
 - [shivlaks](https://github.com/shivlaks)
 - [otaviomacedo](https://github.com/otaviomacedo)
 - [madeline-k](https://github.com/madeline-k)
-- [NetaNir](https://github.com/NetaNir)
 - [mrgrain](https://github.com/mrgrain)
+- [NetaNir](https://github.com/NetaNir)
 - [comcalvi](https://github.com/comcalvi)
 - [robertd](https://github.com/robertd)
 - [pahud](https://github.com/pahud)
@@ -22,11 +22,11 @@ Shout out to our top contributors!
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
 - [lpizzinidev](https://github.com/lpizzinidev)
 - [colifran](https://github.com/colifran)
+- [go-to-k](https://github.com/go-to-k)
 - [nija-at](https://github.com/nija-at)
 - [hoegertn](https://github.com/hoegertn)
 - [watany-dev](https://github.com/watany-dev)
 - [jumic](https://github.com/jumic)
-- [SoManyHs](https://github.com/SoManyHs)
 
 
-_Last updated: Fri, 01 Dec 23 00:09:47 +0000_
+_Last updated: Mon, 01 Jan 24 00:09:50 +0000_
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk-testing/cli-integ/LICENSE b/packages/@aws-cdk-testing/cli-integ/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk-testing/cli-integ/NOTICE b/packages/@aws-cdk-testing/cli-integ/NOTICE
@@ -1,5 +1,5 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk-testing/framework-integ/LICENSE b/packages/@aws-cdk-testing/framework-integ/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk-testing/framework-integ/NOTICE b/packages/@aws-cdk-testing/framework-integ/NOTICE
@@ -1,5 +1,5 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/LICENSE b/packages/@aws-cdk/app-staging-synthesizer-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/NOTICE b/packages/@aws-cdk/app-staging-synthesizer-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-amplify-alpha/LICENSE b/packages/@aws-cdk/aws-amplify-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-amplify-alpha/NOTICE b/packages/@aws-cdk/aws-amplify-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-appconfig-alpha/LICENSE b/packages/@aws-cdk/aws-appconfig-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-appconfig-alpha/NOTICE b/packages/@aws-cdk/aws-appconfig-alpha/NOTICE
@@ -1,5 +1,5 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 -------------------------------------------------------------------------------
 

diff --git a/packages/@aws-cdk/aws-apprunner-alpha/LICENSE b/packages/@aws-cdk/aws-apprunner-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-apprunner-alpha/NOTICE b/packages/@aws-cdk/aws-apprunner-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-cloud9-alpha/LICENSE b/packages/@aws-cdk/aws-cloud9-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-cloud9-alpha/NOTICE b/packages/@aws-cdk/aws-cloud9-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-codestar-alpha/LICENSE b/packages/@aws-cdk/aws-codestar-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-codestar-alpha/NOTICE b/packages/@aws-cdk/aws-codestar-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/LICENSE b/packages/@aws-cdk/aws-cognito-identitypool-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/NOTICE b/packages/@aws-cdk/aws-cognito-identitypool-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-gamelift-alpha/LICENSE b/packages/@aws-cdk/aws-gamelift-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-gamelift-alpha/NOTICE b/packages/@aws-cdk/aws-gamelift-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-glue-alpha/LICENSE b/packages/@aws-cdk/aws-glue-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-glue-alpha/NOTICE b/packages/@aws-cdk/aws-glue-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-glue-alpha/README.md b/packages/@aws-cdk/aws-glue-alpha/README.md
@@ -202,7 +202,10 @@ See [documentation](https://docs.aws.amazon.com/glue/latest/dg/encryption-securi
 A `Database` is a logical grouping of `Tables` in the Glue Catalog.
 
 ```ts
-new glue.Database(this, 'MyDatabase');
+new glue.Database(this, 'MyDatabase', {
+  databaseName: 'my_database',
+  description: 'my_database_description',
+});
 ```
 
 ## Table

diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/database.ts b/packages/@aws-cdk/aws-glue-alpha/lib/database.ts
@@ -43,6 +43,13 @@ export interface DatabaseProps {
    * @see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html
    */
   readonly locationUri?: string;
+
+  /**
+   * A description of the database.
+   *
+   * @default - no database description
+   */
+  readonly description?: string;
 }
 
 /**
@@ -96,8 +103,13 @@ export class Database extends Resource implements IDatabase {
         }),
     });
 
+    if (props.description !== undefined) {
+      validateDescription(props.description);
+    }
+
     let databaseInput: CfnDatabase.DatabaseInputProperty = {
       name: this.physicalName,
+      description: props.description,
     };
 
     if (props.locationUri !== undefined) {
@@ -133,6 +145,12 @@ export class Database extends Resource implements IDatabase {
 
 function validateLocationUri(locationUri: string): void {
   if (locationUri.length < 1 || locationUri.length > 1024) {
-    throw new Error(`locationUri length must be (inclusively) between 1 and 1024, but was ${locationUri.length}`);
+    throw new Error(`locationUri length must be (inclusively) between 1 and 1024, got ${locationUri.length}`);
+  }
+}
+
+function validateDescription(description: string): void {
+  if (description.length > 2048) {
+    throw new Error(`description length must be less than or equal to 2048, got ${description.length}`);
   }
 }
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/database.test.ts b/packages/@aws-cdk/aws-glue-alpha/test/database.test.ts
@@ -58,6 +58,29 @@ test('explicit locationURI', () => {
 
 });
 
+test('explicit description', () => {
+  new glue.Database(stack, 'Database', {
+    description: 'database-description',
+  });
+
+  Template.fromStack(stack).templateMatches({
+    Resources: {
+      DatabaseB269D8BB: {
+        Type: 'AWS::Glue::Database',
+        Properties: {
+          CatalogId: {
+            Ref: 'AWS::AccountId',
+          },
+          DatabaseInput: {
+            Description: 'database-description',
+            Name: 'database',
+          },
+        },
+      },
+    },
+  });
+});
+
 test('fromDatabase', () => {
   // WHEN
   const database = glue.Database.fromDatabaseArn(stack, 'import', 'arn:aws:glue:us-east-1:123456789012:database/db1');
@@ -85,7 +108,15 @@ test('locationUri length must be <= 1024', () => {
     new glue.Database(stack, 'Database', {
       locationUri: 'a'.repeat(1025),
     }),
-  ).toThrow();
+  ).toThrow('locationUri length must be (inclusively) between 1 and 1024, got 1025');
+});
+
+test('description length must be <= 2048', () => {
+  expect(() =>
+    new glue.Database(stack, 'Database', {
+      description: 'a'.repeat(2049),
+    }),
+  ).toThrow('description length must be less than or equal to 2048, got 2049');
 });
 
 test('can specify a physical name', () => {

diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.assets.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.assets.json
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.template.json
@@ -12,6 +12,7 @@
      "Ref": "AWS::AccountId"
     },
     "DatabaseInput": {
+     "Description": "my_database_description",
      "Name": "my_database"
     }
    }

diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/manifest.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/tree.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/tree.json
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.ts b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.ts
@@ -16,6 +16,7 @@ const bucket = new s3.Bucket(stack, 'DataBucket', {
 
 const database = new glue.Database(stack, 'MyDatabase', {
   databaseName: 'my_database',
+  description: 'my_database_description',
 });
 
 const columns = [{

diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/LICENSE b/packages/@aws-cdk/aws-iot-actions-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/NOTICE b/packages/@aws-cdk/aws-iot-actions-alpha/NOTICE
@@ -1,5 +1,5 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 -------------------------------------------------------------------------------
 

diff --git a/packages/@aws-cdk/aws-iot-alpha/LICENSE b/packages/@aws-cdk/aws-iot-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-iot-alpha/NOTICE b/packages/@aws-cdk/aws-iot-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/LICENSE b/packages/@aws-cdk/aws-iotevents-actions-alpha/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   Copyright 2018-2024 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.

diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/NOTICE b/packages/@aws-cdk/aws-iotevents-actions-alpha/NOTICE
@@ -1,2 +1,2 @@
 AWS Cloud Development Kit (AWS CDK)
-Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.