Merge branch 'master' into feature/enable-control-plane-logs

allowed-breaking-changes.txt

@@ -7,3 +7,15 @@ removed:@aws-cdk/core.BootstraplessSynthesizer.DEFAULT_ASSET_PUBLISHING_ROLE_ARN
 removed:@aws-cdk/core.DefaultStackSynthesizer.DEFAULT_ASSET_PUBLISHING_ROLE_ARN
 removed:@aws-cdk/core.DefaultStackSynthesizerProps.assetPublishingExternalId
 removed:@aws-cdk/core.DefaultStackSynthesizerProps.assetPublishingRoleArn
+
+# merge asset manifest schema into cloud assembly schema
+removed:@aws-cdk/cdk-assets-schema.AssetManifestSchema
+removed:@aws-cdk/cdk-assets-schema.AwsDestination
+removed:@aws-cdk/cdk-assets-schema.DockerImageAsset
+removed:@aws-cdk/cdk-assets-schema.DockerImageDestination
+removed:@aws-cdk/cdk-assets-schema.DockerImageSource
+removed:@aws-cdk/cdk-assets-schema.FileAsset
+removed:@aws-cdk/cdk-assets-schema.FileDestination
+removed:@aws-cdk/cdk-assets-schema.FileSource
+removed:@aws-cdk/cdk-assets-schema.ManifestFile
+removed:@aws-cdk/cdk-assets-schema.FileAssetPackaging

package.json

@@ -54,8 +54,6 @@
       "@aws-cdk/aws-ecr-assets/minimatch/**",
       "@aws-cdk/aws-lambda-nodejs/parcel-bundler",
       "@aws-cdk/aws-lambda-nodejs/parcel-bundler/**",
-      "@aws-cdk/cdk-assets-schema/semver",
-      "@aws-cdk/cdk-assets-schema/semver/**",
       "@aws-cdk/cloud-assembly-schema/jsonschema",
       "@aws-cdk/cloud-assembly-schema/jsonschema/**",
       "@aws-cdk/cloud-assembly-schema/semver",

packages/@aws-cdk/cdk-assets-schema/README.md

@@ -2,14 +2,11 @@
 <!--BEGIN STABILITY BANNER-->
 ---
 
-![cdk-constructs: Stable](https://img.shields.io/badge/cdk--constructs-stable-success.svg?style=for-the-badge)
+![Deprecated](https://img.shields.io/badge/deprecated-critical.svg?style=for-the-badge)
+
+> This API may emit warnings. Backward compatibility is not guaranteed.
 
 ---
 <!--END STABILITY BANNER-->
 
-This module contains the schema definitions for the Asset Manifest.
-
-We expose them via JSII so that they are checked for backwards compatibility
-by the `jsii-diff` tool; routines exist in `validate.ts` which will return
-them, so that the structs can only be strengthened (i.e., existing fields
-may not be removed or made optional).
+This schema is now part of @aws-cdk/cloud-assembly-schema.

packages/@aws-cdk/cdk-assets-schema/lib/index.ts

@@ -1,5 +1,2 @@
-export * from './manifest-schema';
-export * from './docker-image-asset';
-export * from './file-asset';
-export * from './aws-destination';
-export * from './validate';
+// tslint:disable-next-line: no-console
+console.error('error: @aws-cdk/cdk-assets-schema has been merged into @aws-cdk/cloud-assembly-schema');

packages/@aws-cdk/cdk-assets-schema/package.json

@@ -44,9 +44,6 @@
     "url": "https://aws.amazon.com",
     "organization": true
   },
-  "dependencies": {
-    "semver": "^7.2.2"
-  },
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/jest": "^26.0.0",
@@ -64,17 +61,15 @@
     "cdk"
   ],
   "homepage": "https://github.com/aws/aws-cdk",
-  "bundledDependencies": [
-    "semver"
-  ],
   "engines": {
     "node": ">= 10.13.0 <13 || >=13.7.0"
   },
-  "stability": "stable",
+  "stability": "deprecated",
   "awscdkio": {
     "announce": false
   },
-  "maturity": "stable",
+  "deprecated": "merged into @aws-cdk/cloud-assembly-schema",
+  "maturity": "deprecated",
   "cdk-build": {
     "jest": true
   }

packages/@aws-cdk/cdk-assets-schema/test/dummy.test.ts

@@ -0,0 +1,3 @@
+test('dummy', () => {
+  expect(true).toBeTruthy();
+});

packages/@aws-cdk/cloud-assembly-schema/.gitignore

@@ -1,5 +1,5 @@
-lib/*.js
-test/*.js
+lib/**/*.js
+test/**/*.js
 scripts/*.js
 *.js.map
 *.d.ts

packages/@aws-cdk/cdk-assets-schema/lib/docker-image-asset.ts → packages/@aws-cdk/cloud-assembly-schema/lib/assets/docker-image-asset.ts

@@ -12,7 +12,7 @@ export interface DockerImageAsset {
   /**
    * Destinations for this file asset
    */
-  readonly destinations: Record<string, DockerImageDestination>;
+  readonly destinations: { [id: string]: DockerImageDestination };
 }
 
 /**
@@ -45,7 +45,7 @@ export interface DockerImageSource {
    *
    * @default - No additional build arguments
    */
-  readonly dockerBuildArgs?: Record<string, string>;
+  readonly dockerBuildArgs?: { [name: string]: string };
 }
 
 /**

packages/@aws-cdk/cdk-assets-schema/lib/file-asset.ts → packages/@aws-cdk/cloud-assembly-schema/lib/assets/file-asset.ts

@@ -12,7 +12,7 @@ export interface FileAsset {
   /**
    * Destinations for this file asset
    */
-  readonly destinations: Record<string, FileDestination>;
+  readonly destinations: { [id: string]: FileDestination };
 }
 
 /**

packages/@aws-cdk/cloud-assembly-schema/lib/assets/index.ts

@@ -0,0 +1,4 @@
+export * from './schema';
+export * from './docker-image-asset';
+export * from './file-asset';
+export * from './aws-destination';

packages/@aws-cdk/cdk-assets-schema/lib/manifest-schema.ts → packages/@aws-cdk/cloud-assembly-schema/lib/assets/schema.ts

@@ -4,7 +4,7 @@ import { FileAsset } from './file-asset';
 /**
  * Definitions for the asset manifest
  */
-export interface ManifestFile {
+export interface AssetManifest {
   /**
    * Version of the manifest
    */
@@ -15,12 +15,12 @@ export interface ManifestFile {
    *
    * @default - No files
    */
-  readonly files?: Record<string, FileAsset>;
+  readonly files?: { [id: string]: FileAsset };
 
   /**
    * The Docker image assets in this manifest
    *
    * @default - No Docker images
    */
-  readonly dockerImages?: Record<string, DockerImageAsset>;
-}
+  readonly dockerImages?: { [id: string]: DockerImageAsset };
+}

packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/index.ts

@@ -0,0 +1,4 @@
+export * from './schema';
+export * from './metadata-schema';
+export * from './artifact-schema';
+export * from './context-queries';

packages/@aws-cdk/cloud-assembly-schema/lib/index.ts

@@ -1,5 +1,3 @@
+export * from './cloud-assembly';
+export * from './assets';
 export * from './manifest';
-export * from './schema';
-export * from './metadata-schema';
-export * from './artifact-schema';
-export * from './context-queries';