Merge branch 'main' into merge-back/2.162.0

mergify[bot] · web-flow · commit 73add869efe6 · 2024-10-10T21:38:15.000Z
diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/connection.ts b/packages/@aws-cdk/aws-glue-alpha/lib/connection.ts
@@ -8,6 +8,8 @@ import { CfnConnection } from 'aws-cdk-lib/aws-glue';
  *
  * If you need to use a connection type that doesn't exist as a static member, you
  * can instantiate a `ConnectionType` object, e.g: `new ConnectionType('NEW_TYPE')`.
+ *
+ * @see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-connectiontype
  */
 export class ConnectionType {
 
@@ -31,6 +33,18 @@ export class ConnectionType {
    */
   public static readonly NETWORK = new ConnectionType('NETWORK');
 
+  /**
+   * Uses configuration settings contained in a connector purchased from AWS Marketplace
+   * to read from and write to data stores that are not natively supported by AWS Glue.
+   */
+  public static readonly MARKETPLACE = new ConnectionType('MARKETPLACE');
+
+  /**
+   * Uses configuration settings contained in a custom connector to read from and write to data stores
+   * that are not natively supported by AWS Glue.
+   */
+  public static readonly CUSTOM = new ConnectionType('CUSTOM');
+
   /**
    * The name of this ConnectionType, as expected by Connection resource.
    */
diff --git a/packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-build-image.ts b/packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-build-image.ts
@@ -42,7 +42,7 @@ export class LinuxArmBuildImage implements IBuildImage {
   public static readonly AMAZON_LINUX_2_STANDARD_3_0 = LinuxArmBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux2-aarch64-standard:3.0');
 
   /**
-   * @returns a x86-64 Linux build image from a Docker Hub image.
+   * @returns a aarch-64 Linux build image from a Docker Hub image.
    */
   public static fromDockerRegistry(name: string, options: DockerImageOptions = {}): IBuildImage {
     return new LinuxArmBuildImage({
