Merge branch 'master' into epolon/fix-nested-stack-params-integ-test

Author: mergify[bot]

allowed-breaking-changes.txt

@@ -49,3 +49,6 @@ incompatible-argument:@aws-cdk/aws-iam.PrincipalPolicyFragment.<initializer>
 changed-type:@aws-cdk/aws-iam.FederatedPrincipal.conditions
 changed-type:@aws-cdk/aws-iam.PrincipalPolicyFragment.conditions
 changed-type:@aws-cdk/aws-iam.PrincipalWithConditions.conditions
+# Changing untyped property blob into typed property blob
+change-return-type:@aws-cdk/cloud-assembly-schema.Manifest.load
+incompatible-argument:@aws-cdk/cloud-assembly-schema.Manifest.save

packages/@aws-cdk/aws-cloudformation/test/test.nested-stack.ts

@@ -912,7 +912,7 @@ export = {
     const app = new App();
     const stack = new Stack(app, 'ParentStack', { env: { account: '1234account', region: 'us-east-44' } });
     const nestedStack = new NestedStack(stack, 'nested');
-    const provider = 'dummyProvider';
+    const provider = 'availability-zones';
     const expectedKey = ContextProvider.getKey(nestedStack, {
       provider,
     }).key;

packages/@aws-cdk/aws-ec2/lib/machine-image.ts

@@ -1,4 +1,5 @@
 import * as ssm from '@aws-cdk/aws-ssm';
+import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import { Construct, ContextProvider, Stack, Token } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 import { UserData } from './user-data';
@@ -416,11 +417,11 @@ export class LookupMachineImage implements IMachineImage {
     Object.assign(filters, this.props.filters);
 
     const value = ContextProvider.getValue(scope, {
-      provider: cxapi.AMI_PROVIDER,
+      provider: cxschema.ContextProvider.AMI_PROVIDER,
       props: {
         owners: this.props.owners,
         filters,
-      } as cxapi.AmiContextQuery,
+      } as cxschema.AmiContextQuery,
       dummyValue: 'ami-1234',
     }).value as cxapi.AmiContextResponse;
 

packages/@aws-cdk/aws-ec2/lib/vpc.ts

@@ -1,3 +1,4 @@
+import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import { ConcreteDependable, Construct, ContextProvider, DependableTrait, IConstruct,
   IDependable, IResource, Lazy, Resource, Stack, Tag, Token } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
@@ -1008,12 +1009,12 @@ export class Vpc extends VpcBase {
     }
 
     const attributes: cxapi.VpcContextResponse = ContextProvider.getValue(scope, {
-      provider: cxapi.VPC_PROVIDER,
+      provider: cxschema.ContextProvider.VPC_PROVIDER,
       props: {
         filter,
         returnAsymmetricSubnets: true,
         subnetGroupNameTag: options.subnetGroupNameTag,
-      } as cxapi.VpcContextQuery,
+      } as cxschema.VpcContextQuery,
       dummyValue: undefined,
     }).value;
 

packages/@aws-cdk/aws-ec2/package.json

@@ -79,6 +79,7 @@
     "@aws-cdk/aws-ssm": "0.0.0",
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/region-info": "0.0.0",
     "constructs": "^3.0.2"
   },
@@ -91,6 +92,7 @@
     "@aws-cdk/aws-ssm": "0.0.0",
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/region-info": "0.0.0",
     "constructs": "^3.0.2"
   },

packages/@aws-cdk/aws-ec2/test/test.vpc.from-lookup.ts

@@ -1,3 +1,4 @@
+import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import { Construct, ContextProvider, GetContextValueOptions, GetContextValueResult, Lazy, Stack } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 import { Test } from 'nodeunit';
@@ -218,12 +219,12 @@ interface MockVcpContextResponse {
 
 function mockVpcContextProviderWith(
   test: Test, response: MockVcpContextResponse,
-  paramValidator?: (options: cxapi.VpcContextQuery) => void) {
+  paramValidator?: (options: cxschema.VpcContextQuery) => void) {
   const previous = ContextProvider.getValue;
   ContextProvider.getValue = (_scope: Construct, options: GetContextValueOptions) => {
     // do some basic sanity checks
-    test.equal(options.provider, cxapi.VPC_PROVIDER,
-      `Expected provider to be: '${cxapi.VPC_PROVIDER}', got: '${options.provider}'`);
+    test.equal(options.provider, cxschema.ContextProvider.VPC_PROVIDER,
+      `Expected provider to be: '${cxschema.ContextProvider.VPC_PROVIDER}', got: '${options.provider}'`);
     test.equal((options.props || {}).returnAsymmetricSubnets, true,
       `Expected options.props.returnAsymmetricSubnets to be true, got: '${(options.props || {}).returnAsymmetricSubnets}'`);
 

packages/@aws-cdk/aws-route53/lib/hosted-zone.ts

@@ -1,6 +1,6 @@
 import * as ec2 from '@aws-cdk/aws-ec2';
+import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import { Construct, ContextProvider, Duration, Lazy, Resource, Stack } from '@aws-cdk/core';
-import * as cxapi from '@aws-cdk/cx-api';
 import { HostedZoneProviderProps } from './hosted-zone-provider';
 import { HostedZoneAttributes, IHostedZone } from './hosted-zone-ref';
 import { CaaAmazonRecord, ZoneDelegationRecord } from './record-set';
@@ -107,7 +107,7 @@ export class HostedZone extends Resource implements IHostedZone {
     }
 
     const response: HostedZoneContextResponse = ContextProvider.getValue(scope, {
-      provider: cxapi.HOSTED_ZONE_PROVIDER,
+      provider: cxschema.ContextProvider.HOSTED_ZONE_PROVIDER,
       dummyValue: DEFAULT_HOSTED_ZONE,
       props: query,
     }).value;

packages/@aws-cdk/aws-route53/package.json

@@ -75,15 +75,15 @@
     "@aws-cdk/aws-ec2": "0.0.0",
     "@aws-cdk/aws-logs": "0.0.0",
     "@aws-cdk/core": "0.0.0",
-    "@aws-cdk/cx-api": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "constructs": "^3.0.2"
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
     "@aws-cdk/aws-ec2": "0.0.0",
     "@aws-cdk/aws-logs": "0.0.0",
     "@aws-cdk/core": "0.0.0",
-    "@aws-cdk/cx-api": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "constructs": "^3.0.2"
   },
   "engines": {

packages/@aws-cdk/aws-ssm/lib/parameter.ts

@@ -1,10 +1,10 @@
 import * as iam from '@aws-cdk/aws-iam';
 import * as kms from '@aws-cdk/aws-kms';
+import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import {
   CfnDynamicReference, CfnDynamicReferenceService, CfnParameter,
   Construct, ContextProvider, Fn, IResource, Resource, Stack, Token,
 } from '@aws-cdk/core';
-import * as cxapi from '@aws-cdk/cx-api';
 import * as ssm from './ssm.generated';
 import { arnForParameterName, AUTOGEN_MARKER } from './util';
 
@@ -362,7 +362,7 @@ export class StringParameter extends ParameterBase implements IStringParameter {
    */
   public static valueFromLookup(scope: Construct, parameterName: string): string {
     const value = ContextProvider.getValue(scope, {
-      provider: cxapi.SSM_PARAMETER_PROVIDER,
+      provider: cxschema.ContextProvider.SSM_PARAMETER_PROVIDER,
       props: { parameterName },
       dummyValue: `dummy-value-for-${parameterName}`,
     }).value;

packages/@aws-cdk/aws-ssm/package.json

@@ -74,15 +74,15 @@
     "@aws-cdk/aws-iam": "0.0.0",
     "@aws-cdk/aws-kms": "0.0.0",
     "@aws-cdk/core": "0.0.0",
-    "@aws-cdk/cx-api": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "constructs": "^3.0.2"
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
     "@aws-cdk/aws-iam": "0.0.0",
     "@aws-cdk/aws-kms": "0.0.0",
     "@aws-cdk/core": "0.0.0",
-    "@aws-cdk/cx-api": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "constructs": "^3.0.2"
   },
   "engines": {