rename

CHANGELOG.md

@@ -742,7 +742,7 @@ on all objects, `subnetsToUse` has been renamed to `subnetType`.
 
 ### Bug Fixes
 
-* **awslint:** Don't fail if the `@aws-cdk/cdk` module is not present ([#1953](https:/awslabs/aws-cdk/issues/1953)) ([929e854](https:/awslabs/aws-cdk/commit/929e854))
+* **awslint:** Don't fail if the `@aws-cdk/core` module is not present ([#1953](https:/awslabs/aws-cdk/issues/1953)) ([929e854](https:/awslabs/aws-cdk/commit/929e854))
 * **cdk-integ:** Update cdk-integ to use new context file ([#1962](https:/awslabs/aws-cdk/issues/1962)) ([dbd2401](https:/awslabs/aws-cdk/commit/dbd2401))
 * **cloudfront:** allow IBucket as CloudFront source ([855f1f5](https:/awslabs/aws-cdk/commit/855f1f5)), closes [#1946](https:/awslabs/aws-cdk/issues/1946)
 * **cloudfront:** pass `viewerProtocolPolicy` to the distribution's behaviors ([#1932](https:/awslabs/aws-cdk/issues/1932)) ([615ecd4](https:/awslabs/aws-cdk/commit/615ecd4))
@@ -1509,7 +1509,7 @@ Java (maven) | [`mvn versions:use-latest-versions`](https://www.m
  ```
 
 - **framework:** The CDK is no longer shipped with built-in support for JSX. You can still use JSX but you will have to manually configure it.
-- **aws-iam:** `PolicyDocument`, `PolicyStatement` and all `PolicyPrincipal` classes moved from the @aws-cdk/cdk module and into the @aws-cdk/aws-iam module.
+- **aws-iam:** `PolicyDocument`, `PolicyStatement` and all `PolicyPrincipal` classes moved from the @aws-cdk/core module and into the @aws-cdk/aws-iam module.
 - **aws-codepipeline-api**: `Artifact.subartifact` method of the CodePipeline API was renamed to `Artifact.atPath`.
 - constructor signature of `TagManager` has changed. `initialTags` is now passed inside a props object.
 - **util:** @aws-cdk/util is no longer available
@@ -1955,9 +1955,9 @@ The headliners of this release are **.NET support**, and a wealth of commits by
 
 ## Features
 
-- **@aws-cdk/cdk**: Tokens can now be transparently embedded into strings and encoded into JSON without losing their semantics. This makes it possible to treat late-bound (deploy-time) values as if they were regular strings ([@rix0rrr] in [#518](https:/awslabs/aws-cdk/pull/518)).
+- **@aws-cdk/core**: Tokens can now be transparently embedded into strings and encoded into JSON without losing their semantics. This makes it possible to treat late-bound (deploy-time) values as if they were regular strings ([@rix0rrr] in [#518](https:/awslabs/aws-cdk/pull/518)).
 - **@aws-cdk/aws-s3**: add support for bucket notifications to Lambda, SNS, and SQS targets ([@eladb] in [#201](https:/awslabs/aws-cdk/pull/201), [#560](https:/awslabs/aws-cdk/pull/560), [#561](https:/awslabs/aws-cdk/pull/561), [#564](https:/awslabs/aws-cdk/pull/564))
-- **@aws-cdk/cdk**: non-alphanumeric characters can now be used as construct identifiers ([@eladb] in [#556](https:/awslabs/aws-cdk/pull/556))
+- **@aws-cdk/core**: non-alphanumeric characters can now be used as construct identifiers ([@eladb] in [#556](https:/awslabs/aws-cdk/pull/556))
 - **@aws-cdk/aws-iam**: add support for `maxSessionDuration` for Roles ([@eladb] in [#545](https:/awslabs/aws-cdk/pull/545)).
 
 ## Changes
@@ -1983,7 +1983,7 @@ The headliners of this release are **.NET support**, and a wealth of commits by
 ## Features
 
 - **aws-cdk**: Support `--profile` in command-line toolkit ([@rix0rrr] in [#517](https:/awslabs/aws-cdk/issues/517))
-- **@aws-cdk/cdk**: Introduce `Default` construct id ([@rix0rrr] in [#496](https:/awslabs/aws-cdk/issues/496))
+- **@aws-cdk/core**: Introduce `Default` construct id ([@rix0rrr] in [#496](https:/awslabs/aws-cdk/issues/496))
 - **@aws-cdk/aws-lambda**: Add `LambdaRuntime.DotNetCore21` ([@Mortifera] in [#507](https:/awslabs/aws-cdk/issues/507))
 - **@aws-cdk/runtime-values** (_**BREAKING**_): rename 'rtv' to 'runtime-values' ([@rix0rrr] in [#494](https:/awslabs/aws-cdk/issues/494))
 - **@aws-cdk/aws-ec2**: Combine `Connections` and `DefaultConnections` classes ([@rix0rrr] in [#453](https:/awslabs/aws-cdk/issues/453))
@@ -1996,7 +1996,7 @@ The headliners of this release are **.NET support**, and a wealth of commits by
 ## Bug fixes
 
 - **aws-cdk** (toolkit): Fix java `cdk init` template ([@RomainMuller] in [#490](https:/awslabs/aws-cdk/issues/490))
-- **@aws-cdk/cdk** (_**BREAKING**_): Align `FnJoin` signature to CloudFormation ([@RomainMuller] in [#516](https:/awslabs/aws-cdk/issues/516))
+- **@aws-cdk/core** (_**BREAKING**_): Align `FnJoin` signature to CloudFormation ([@RomainMuller] in [#516](https:/awslabs/aws-cdk/issues/516))
 - **@aws-cdk/aws-cloudfront**: Fix origin error ([@mindstorms6] in [#514](https:/awslabs/aws-cdk/issues/514))
 - **@aws-cdk/aws-lambda**: Invalid cast for inline LambdaRuntime members in Java ([@eladb] in [#505](https:/awslabs/aws-cdk/issues/505))
 - **examples**: Fixed java examples ([@RomainMuller] in [#498](https:/awslabs/aws-cdk/issues/498))

packages/@aws-cdk/alexa-ask/package.json

@@ -70,10 +70,10 @@
  "pkglint": "^0.35.0"
  },
  "dependencies": {
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "peerDependencies": {
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "engines": {
  "node": ">= 8.10.0"

packages/@aws-cdk/app-delivery/README.md

@@ -50,7 +50,7 @@ The example below defines a *CDK App* that contains 3 stacks:
 import codebuild = require('@aws-cdk/aws-codebuild');
 import codepipeline = require('@aws-cdk/aws-codepipeline');
 import codepipeline_actions = require('@aws-cdk/aws-codepipeline-actions');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import cicd = require('@aws-cdk/cicd');
 
 const app = new cdk.App();

packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts

@@ -2,7 +2,7 @@ import cfn = require('@aws-cdk/aws-cloudformation');
 import codepipeline = require('@aws-cdk/aws-codepipeline');
 import cpactions = require('@aws-cdk/aws-codepipeline-actions');
 import iam = require('@aws-cdk/aws-iam');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import cxapi = require('@aws-cdk/cx-api');
 
 export interface PipelineDeployStackActionProps {

packages/@aws-cdk/app-delivery/package.json

@@ -43,7 +43,7 @@
  "@aws-cdk/aws-codepipeline": "^0.35.0",
  "@aws-cdk/aws-codepipeline-actions": "^0.35.0",
  "@aws-cdk/aws-iam": "^0.35.0",
- "@aws-cdk/cdk": "^0.35.0",
+ "@aws-cdk/core": "^0.35.0",
  "@aws-cdk/cx-api": "^0.35.0"
  },
  "devDependencies": {
@@ -76,7 +76,7 @@
  "@aws-cdk/aws-codepipeline": "^0.35.0",
  "@aws-cdk/aws-codepipeline-actions": "^0.35.0",
  "@aws-cdk/aws-iam": "^0.35.0",
- "@aws-cdk/cdk": "^0.35.0",
+ "@aws-cdk/core": "^0.35.0",
  "@aws-cdk/cx-api": "^0.35.0"
  },
  "engines": {

packages/@aws-cdk/app-delivery/test/integ.cicd.ts

@@ -2,7 +2,7 @@ import cfn = require('@aws-cdk/aws-cloudformation');
 import codepipeline = require('@aws-cdk/aws-codepipeline');
 import cpactions = require('@aws-cdk/aws-codepipeline-actions');
 import s3 = require('@aws-cdk/aws-s3');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import cicd = require('../lib');
 
 const app = new cdk.App();

packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts

@@ -5,8 +5,8 @@ import codepipeline = require('@aws-cdk/aws-codepipeline');
 import cpactions = require('@aws-cdk/aws-codepipeline-actions');
 import iam = require('@aws-cdk/aws-iam');
 import s3 = require('@aws-cdk/aws-s3');
-import cdk = require('@aws-cdk/cdk');
-import { ConstructNode } from '@aws-cdk/cdk';
+import cdk = require('@aws-cdk/core');
+import { ConstructNode } from '@aws-cdk/core';
 import cxapi = require('@aws-cdk/cx-api');
 import fc = require('fast-check');
 import nodeunit = require('nodeunit');

packages/@aws-cdk/assert/jest.ts

@@ -1,4 +1,4 @@
-import { Stack } from "@aws-cdk/cdk";
+import { Stack } from "@aws-cdk/core";
 import cxapi = require("@aws-cdk/cx-api");
 import { HaveResourceAssertion, ResourcePart } from "./lib/assertions/have-resource";
 import { MatchStyle, matchTemplate } from "./lib/assertions/match-template";

packages/@aws-cdk/assert/lib/expect.ts

@@ -1,4 +1,4 @@
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import api = require('@aws-cdk/cx-api');
 import { StackInspector } from './inspector';
 import { SynthUtils } from './synth-utils';

packages/@aws-cdk/assert/lib/synth-utils.ts

@@ -1,4 +1,4 @@
-import { ConstructNode, Stack, SynthesisOptions } from '@aws-cdk/cdk';
+import { ConstructNode, Stack, SynthesisOptions } from '@aws-cdk/core';
 import cxapi = require('@aws-cdk/cx-api');
 
 export class SynthUtils {

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

@@ -31,7 +31,7 @@
  "pkglint": "^0.35.0"
  },
  "dependencies": {
- "@aws-cdk/cdk": "^0.35.0",
+ "@aws-cdk/core": "^0.35.0",
  "@aws-cdk/cloudformation-diff": "^0.35.0",
  "@aws-cdk/cx-api": "^0.35.0",
  "jest": "^24.8.0",

packages/@aws-cdk/assert/test/test.assertions.ts

@@ -1,10 +1,10 @@
 import 'source-map-support/register';
 
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import cx = require('@aws-cdk/cx-api');
 import { Test } from 'nodeunit';
 
-import { Stack } from '@aws-cdk/cdk';
+import { Stack } from '@aws-cdk/core';
 import { countResources, exist, expect, haveType, MatchStyle, matchTemplate } from '../lib/index';
 
 passingExample('expect <synthStack> at <some path> to have <some type>', () => {

packages/@aws-cdk/assert/test/test.synth-utils.ts

@@ -1,4 +1,4 @@
-import { App, Stack } from '@aws-cdk/cdk';
+import { App, Stack } from '@aws-cdk/core';
 import { Test } from 'nodeunit';
 import { SynthUtils } from '../lib';
 

packages/@aws-cdk/assert/tsconfig.json

@@ -22,7 +22,7 @@
  "include": ["**/*.ts" ],
  "exclude": ["node_modules"],
  "references": [
- { "path": "../cdk" },
+ { "path": "../core" },
  { "path": "../cx-api" },
  { "path": "../cfnspec" },
  { "path": "../cloudformation-diff" }

packages/@aws-cdk/assets/lib/staging.ts

@@ -1,4 +1,4 @@
-import { Construct, ISynthesisSession } from '@aws-cdk/cdk';
+import { Construct, ISynthesisSession } from '@aws-cdk/core';
 import cxapi = require('@aws-cdk/cx-api');
 import fs = require('fs');
 import path = require('path');

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

@@ -72,13 +72,13 @@
  "ts-mock-imports": "^1.2.3"
  },
  "dependencies": {
- "@aws-cdk/cdk": "^0.35.0",
+ "@aws-cdk/core": "^0.35.0",
  "@aws-cdk/cx-api": "^0.35.0",
  "minimatch": "^3.0.4"
  },
  "homepage": "https:/awslabs/aws-cdk",
  "peerDependencies": {
- "@aws-cdk/cdk": "^0.35.0",
+ "@aws-cdk/core": "^0.35.0",
  "@aws-cdk/cx-api": "^0.35.0"
  },
  "engines": {

packages/@aws-cdk/assets/test/test.staging.ts

@@ -1,4 +1,4 @@
-import { App, Stack } from '@aws-cdk/cdk';
+import { App, Stack } from '@aws-cdk/core';
 import cxapi = require('@aws-cdk/cx-api');
 import fs = require('fs');
 import { Test } from 'nodeunit';

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

@@ -70,10 +70,10 @@
  "pkglint": "^0.35.0"
  },
  "dependencies": {
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "peerDependencies": {
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "engines": {
  "node": ">= 8.10.0"

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

@@ -71,10 +71,10 @@
  "pkglint": "^0.35.0"
  },
  "dependencies": {
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "peerDependencies": {
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "engines": {
  "node": ">= 8.10.0"

packages/@aws-cdk/aws-apigateway/lib/api-key.ts

@@ -1,4 +1,4 @@
-import { Construct, IResource as IResourceBase, Resource } from '@aws-cdk/cdk';
+import { Construct, IResource as IResourceBase, Resource } from '@aws-cdk/core';
 import { CfnApiKey } from './apigateway.generated';
 import { ResourceOptions } from "./resource";
 import { RestApi } from './restapi';

packages/@aws-cdk/aws-apigateway/lib/deployment.ts

@@ -1,4 +1,4 @@
-import { CfnDeletionPolicy, Construct, Lazy, Resource, Stack } from '@aws-cdk/cdk';
+import { CfnDeletionPolicy, Construct, Lazy, Resource, Stack } from '@aws-cdk/core';
 import crypto = require('crypto');
 import { CfnDeployment, CfnDeploymentProps } from './apigateway.generated';
 import { IRestApi } from './restapi';

packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts

@@ -1,5 +1,5 @@
-import cdk = require('@aws-cdk/cdk');
-import { Stack } from '@aws-cdk/cdk';
+import cdk = require('@aws-cdk/core');
+import { Stack } from '@aws-cdk/core';
 import { Integration, IntegrationOptions, IntegrationType } from '../integration';
 import { Method } from '../method';
 import { parseAwsApiCall } from '../util';

packages/@aws-cdk/aws-apigateway/lib/lambda-api.ts

@@ -1,5 +1,5 @@
 import lambda = require('@aws-cdk/aws-lambda');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import { LambdaIntegration } from './integrations';
 import { Method } from './method';
 import { ProxyResource, Resource } from './resource';

packages/@aws-cdk/aws-apigateway/lib/method.ts

@@ -1,4 +1,4 @@
-import { Construct, Resource, Stack } from '@aws-cdk/cdk';
+import { Construct, Resource, Stack } from '@aws-cdk/core';
 import { CfnMethod, CfnMethodProps } from './apigateway.generated';
 import { IAuthorizer } from './authorizer';
 import { ConnectionType, Integration } from './integration';

packages/@aws-cdk/aws-apigateway/lib/resource.ts

@@ -1,4 +1,4 @@
-import { Construct, IResource as IResourceBase, Resource as ResourceConstruct } from '@aws-cdk/cdk';
+import { Construct, IResource as IResourceBase, Resource as ResourceConstruct } from '@aws-cdk/core';
 import { CfnResource, CfnResourceProps } from './apigateway.generated';
 import { Integration } from './integration';
 import { Method, MethodOptions } from './method';

packages/@aws-cdk/aws-apigateway/lib/restapi.ts

@@ -1,5 +1,5 @@
 import iam = require('@aws-cdk/aws-iam');
-import { CfnOutput, Construct, IResource as IResourceBase, Resource, Stack } from '@aws-cdk/cdk';
+import { CfnOutput, Construct, IResource as IResourceBase, Resource, Stack } from '@aws-cdk/core';
 import { ApiKey, IApiKey } from './api-key';
 import { CfnAccount, CfnRestApi } from './apigateway.generated';
 import { Deployment } from './deployment';

packages/@aws-cdk/aws-apigateway/lib/stage.ts

@@ -1,4 +1,4 @@
-import { Construct, Duration, Resource, Stack } from '@aws-cdk/cdk';
+import { Construct, Duration, Resource, Stack } from '@aws-cdk/core';
 import { CfnStage } from './apigateway.generated';
 import { Deployment } from './deployment';
 import { IRestApi } from './restapi';

packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts

@@ -1,5 +1,5 @@
-import { Lazy, Token } from '@aws-cdk/cdk';
-import { Construct, Resource } from '@aws-cdk/cdk';
+import { Lazy, Token } from '@aws-cdk/core';
+import { Construct, Resource } from '@aws-cdk/core';
 import { IApiKey } from './api-key';
 import { CfnUsagePlan, CfnUsagePlanKey } from './apigateway.generated';
 import { Method } from './method';

packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts

@@ -1,5 +1,5 @@
 import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2');
-import { Construct, Lazy, Resource } from '@aws-cdk/cdk';
+import { Construct, Lazy, Resource } from '@aws-cdk/core';
 import { CfnVpcLink } from './apigateway.generated';
 
 /**

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

@@ -77,14 +77,14 @@
  "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0",
  "@aws-cdk/aws-iam": "^0.35.0",
  "@aws-cdk/aws-lambda": "^0.35.0",
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "homepage": "https:/awslabs/aws-cdk",
  "peerDependencies": {
  "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0",
  "@aws-cdk/aws-iam": "^0.35.0",
  "@aws-cdk/aws-lambda": "^0.35.0",
- "@aws-cdk/cdk": "^0.35.0"
+ "@aws-cdk/core": "^0.35.0"
  },
  "engines": {
  "node": ">= 8.10.0"

packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts

@@ -1,5 +1,5 @@
 import lambda = require('@aws-cdk/aws-lambda');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import apigw = require('../lib');
 
 class BookStack extends cdk.Stack {

packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.ts

@@ -1,4 +1,4 @@
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import apigateway = require('../lib');
 
 const app = new cdk.App();

packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts

@@ -1,5 +1,5 @@
 import lambda = require('@aws-cdk/aws-lambda');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import apigateway = require('../lib');
 
 class Test extends cdk.Stack {

packages/@aws-cdk/aws-apigateway/test/test.api-key.ts

@@ -1,5 +1,5 @@
 import { expect, haveResource, ResourcePart } from '@aws-cdk/assert';
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import { Test } from "nodeunit";
 import apigateway = require('../lib');
 

packages/@aws-cdk/aws-apigateway/test/test.deployment.ts

@@ -1,5 +1,5 @@
 import { expect, haveResource, ResourcePart, SynthUtils } from '@aws-cdk/assert';
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import { Test } from 'nodeunit';
 import apigateway = require('../lib');
 

packages/@aws-cdk/aws-apigateway/test/test.http.ts

@@ -1,5 +1,5 @@
 import { expect, haveResource } from '@aws-cdk/assert';
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import { Test } from 'nodeunit';
 import apigateway = require('../lib');