Merge branch 'aws:main' into imagebuilder-component

Author: Tarun Belani

packages/@aws-cdk/aws-imagebuilder-alpha/lib/component.ts

@@ -1138,7 +1138,7 @@ export class Component extends ComponentBase {
   public static fromComponentAttributes(scope: Construct, id: string, attrs: ComponentAttributes): IComponent {
     if (attrs.componentArn && (attrs.componentName || attrs.componentVersion)) {
       throw new cdk.ValidationError(
-        'a componentName/componentVersion cannot be provided when a componentArn is provided',
+        'a componentName or componentVersion cannot be provided when a componentArn is provided',
         scope,
       );
     }
@@ -1157,7 +1157,7 @@ export class Component extends ComponentBase {
 
     const [componentName, componentVersion] = (() => {
       if (attrs.componentName) {
-        return [attrs.componentName, attrs.componentVersion ?? 'x.x.x'];
+        return [attrs.componentName, attrs.componentVersion ?? LATEST_VERSION];
       }
 
       const componentNameVersion = cdk.Stack.of(scope).splitArn(

packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts

@@ -1133,11 +1133,20 @@ export class AuroraPostgresEngineVersion {
    * @deprecated Version 13.10 is no longer supported by Amazon RDS.
    */
   public static readonly VER_13_10 = AuroraPostgresEngineVersion.of('13.10', '13', { s3Import: true, s3Export: true });
-  /** Version "13.11". */
+  /**
+   * Version "13.11"
+   * @deprecated Version 13.11 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_13_11 = AuroraPostgresEngineVersion.of('13.11', '13', { s3Import: true, s3Export: true });
-  /** Version "13.12". */
+  /**
+   * Version "13.12"
+   * @deprecated Version 13.12 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_13_12 = AuroraPostgresEngineVersion.of('13.12', '13', { s3Import: true, s3Export: true });
-  /** Version "13.13". */
+  /**
+   * Version "13.13"
+   * @deprecated Version 13.13 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_13_13 = AuroraPostgresEngineVersion.of('13.13', '13', { s3Import: true, s3Export: true });
   /** Version "13.14". */
   public static readonly VER_13_14 = AuroraPostgresEngineVersion.of('13.14', '13', { s3Import: true, s3Export: true });
@@ -1178,11 +1187,20 @@ export class AuroraPostgresEngineVersion {
    * @deprecated Version 14.7 is no longer supported by Amazon RDS.
    */
   public static readonly VER_14_7 = AuroraPostgresEngineVersion.of('14.7', '14', { s3Import: true, s3Export: true });
-  /** Version "14.8". */
+  /**
+   * Version "14.8"
+   * @deprecated Version 14.8 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_14_8 = AuroraPostgresEngineVersion.of('14.8', '14', { s3Import: true, s3Export: true });
-  /** Version "14.9". */
+  /**
+   * Version "14.9"
+   * @deprecated Version 14.9 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_14_9 = AuroraPostgresEngineVersion.of('14.9', '14', { s3Import: true, s3Export: true });
-  /** Version "14.10". */
+  /**
+   * Version "14.10"
+   * @deprecated Version 14.10 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_14_10 = AuroraPostgresEngineVersion.of('14.10', '14', { s3Import: true, s3Export: true });
   /** Version "14.11". */
   public static readonly VER_14_11 = AuroraPostgresEngineVersion.of('14.11', '14', { s3Import: true, s3Export: true });
@@ -1206,11 +1224,20 @@ export class AuroraPostgresEngineVersion {
    * @deprecated Version 15.2 is no longer supported by Amazon RDS.
    */
   public static readonly VER_15_2 = AuroraPostgresEngineVersion.of('15.2', '15', { s3Import: true, s3Export: true });
-  /** Version "15.3". */
+  /**
+   * Version "15.3"
+   * @deprecated Version 15.3 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_15_3 = AuroraPostgresEngineVersion.of('15.3', '15', { s3Import: true, s3Export: true });
-  /** Version "15.4". */
+  /**
+   * Version "15.4"
+   * @deprecated Version 15.4 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_15_4 = AuroraPostgresEngineVersion.of('15.4', '15', { s3Import: true, s3Export: true });
-  /** Version "15.5". */
+  /**
+   * Version "15.5"
+   * @deprecated Version 15.5 is no longer supported by Amazon RDS.
+   */
   public static readonly VER_15_5 = AuroraPostgresEngineVersion.of('15.5', '15', { s3Import: true, s3Export: true });
   /** Version "15.6". */
   public static readonly VER_15_6 = AuroraPostgresEngineVersion.of('15.6', '15', { s3Import: true, s3Export: true });

packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts

@@ -1944,6 +1944,11 @@ export class PostgresEngineVersion {
   /** Version "17.7". */
   public static readonly VER_17_7 = PostgresEngineVersion.of('17.7', '17', { s3Import: true, s3Export: true });
 
+  /** Version "18" (only a major version, without a specific minor version). */
+  public static readonly VER_18 = PostgresEngineVersion.of('18', '18', { s3Import: true, s3Export: true });
+  /** Version "18.1". */
+  public static readonly VER_18_1 = PostgresEngineVersion.of('18.1', '18', { s3Import: true, s3Export: true });
+
   /**
    * Create a new PostgresEngineVersion with an arbitrary version.
    *