diff --git a/packages/@aws-cdk/alexa-ask/package.json b/packages/@aws-cdk/alexa-ask/package.json index c257a66f101d7..e73530de6efba 100644 --- a/packages/@aws-cdk/alexa-ask/package.json +++ b/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" diff --git a/packages/@aws-cdk/app-delivery/README.md b/packages/@aws-cdk/app-delivery/README.md index caf8d12577122..a829aa4cc008e 100644 --- a/packages/@aws-cdk/app-delivery/README.md +++ b/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(); diff --git a/packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts b/packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts index c2cbadccf7281..77afcadb2acd6 100644 --- a/packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts +++ b/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 { diff --git a/packages/@aws-cdk/app-delivery/package.json b/packages/@aws-cdk/app-delivery/package.json index c719d57bd0700..2c0fa38e3be50 100644 --- a/packages/@aws-cdk/app-delivery/package.json +++ b/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": { diff --git a/packages/@aws-cdk/app-delivery/test/integ.cicd.ts b/packages/@aws-cdk/app-delivery/test/integ.cicd.ts index 8012af531a9f2..c1d71ea2d8f6b 100644 --- a/packages/@aws-cdk/app-delivery/test/integ.cicd.ts +++ b/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(); diff --git a/packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts b/packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts index 50103b04a020c..5a78f6b1d6e68 100644 --- a/packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts +++ b/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'); diff --git a/packages/@aws-cdk/assert/jest.ts b/packages/@aws-cdk/assert/jest.ts index a785c0058cb14..36afbc6841659 100644 --- a/packages/@aws-cdk/assert/jest.ts +++ b/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"; diff --git a/packages/@aws-cdk/assert/lib/expect.ts b/packages/@aws-cdk/assert/lib/expect.ts index fea0be7a87995..23b8b128dc4ed 100644 --- a/packages/@aws-cdk/assert/lib/expect.ts +++ b/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'; diff --git a/packages/@aws-cdk/assert/lib/synth-utils.ts b/packages/@aws-cdk/assert/lib/synth-utils.ts index edbdb155a70dc..6fe64e3b25cba 100644 --- a/packages/@aws-cdk/assert/lib/synth-utils.ts +++ b/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 { diff --git a/packages/@aws-cdk/assert/package.json b/packages/@aws-cdk/assert/package.json index 45c70ec72f60f..ebddb38a4ea51 100644 --- a/packages/@aws-cdk/assert/package.json +++ b/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", diff --git a/packages/@aws-cdk/assert/test/test.assertions.ts b/packages/@aws-cdk/assert/test/test.assertions.ts index 0f2ce92cfda5c..c43816dcdcf2d 100644 --- a/packages/@aws-cdk/assert/test/test.assertions.ts +++ b/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 at to have ', () => { diff --git a/packages/@aws-cdk/assert/test/test.synth-utils.ts b/packages/@aws-cdk/assert/test/test.synth-utils.ts index 473ac58c5d32c..c5563e6a102b9 100644 --- a/packages/@aws-cdk/assert/test/test.synth-utils.ts +++ b/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'; diff --git a/packages/@aws-cdk/assert/tsconfig.json b/packages/@aws-cdk/assert/tsconfig.json index 71e1ae080c4bf..6aae954779f33 100644 --- a/packages/@aws-cdk/assert/tsconfig.json +++ b/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" } diff --git a/packages/@aws-cdk/assets/lib/staging.ts b/packages/@aws-cdk/assets/lib/staging.ts index 1ab9a32b3d017..79f7254b42f6b 100644 --- a/packages/@aws-cdk/assets/lib/staging.ts +++ b/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'); diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json index d2cadcc77380b..3568d3cf1c146 100644 --- a/packages/@aws-cdk/assets/package.json +++ b/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://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "engines": { diff --git a/packages/@aws-cdk/assets/test/test.staging.ts b/packages/@aws-cdk/assets/test/test.staging.ts index 5b316e3b1a0cc..4271db025bdcb 100644 --- a/packages/@aws-cdk/assets/test/test.staging.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-amazonmq/package.json b/packages/@aws-cdk/aws-amazonmq/package.json index c04bf00863e54..9935e436a3db1 100644 --- a/packages/@aws-cdk/aws-amazonmq/package.json +++ b/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" diff --git a/packages/@aws-cdk/aws-amplify/package.json b/packages/@aws-cdk/aws-amplify/package.json index 92e96cd98b843..e727f7fc030c5 100644 --- a/packages/@aws-cdk/aws-amplify/package.json +++ b/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" diff --git a/packages/@aws-cdk/aws-apigateway/lib/api-key.ts b/packages/@aws-cdk/aws-apigateway/lib/api-key.ts index 5574d81a52545..da6933dcdaf53 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/api-key.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/deployment.ts b/packages/@aws-cdk/aws-apigateway/lib/deployment.ts index cdaf4b49b2d18..32300635a58b1 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/deployment.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts b/packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts index 98ca346586555..abfe1f43ba44d 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/lambda-api.ts b/packages/@aws-cdk/aws-apigateway/lib/lambda-api.ts index 553a955fbc57d..4878ba0d0b90c 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/lambda-api.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/method.ts b/packages/@aws-cdk/aws-apigateway/lib/method.ts index 2f297dd7f3ac6..7ff89de9905b0 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/method.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/resource.ts b/packages/@aws-cdk/aws-apigateway/lib/resource.ts index c94f8b916caff..f7a30f6b8f2e4 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/resource.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/restapi.ts b/packages/@aws-cdk/aws-apigateway/lib/restapi.ts index c73a1b5da7cdb..17df9032fccc8 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/restapi.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/stage.ts b/packages/@aws-cdk/aws-apigateway/lib/stage.ts index 05e3f454bb98f..60443a4353eda 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/stage.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts b/packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts index e6428b2a912f1..f7bcaca809b0f 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts +++ b/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'; diff --git a/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts b/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts index 8c5d55a9f1f0b..05e38c8c4fdcb 100644 --- a/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts +++ b/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'; /** diff --git a/packages/@aws-cdk/aws-apigateway/package-lock.json b/packages/@aws-cdk/aws-apigateway/package-lock.json index 03cde648777f0..ffe302ef8b6eb 100644 --- a/packages/@aws-cdk/aws-apigateway/package-lock.json +++ b/packages/@aws-cdk/aws-apigateway/package-lock.json @@ -8,7 +8,7 @@ "version": "0.35.0", "dev": true, "requires": { - "@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", @@ -22,7 +22,7 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-ssm": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" } }, @@ -34,13 +34,13 @@ "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" } }, "@aws-cdk/aws-iam": { "version": "0.35.0", "requires": { - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/region-info": "^0.35.0" } }, @@ -55,11 +55,11 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" } }, - "@aws-cdk/cdk": { + "@aws-cdk/core": { "version": "0.35.0", "requires": { "@aws-cdk/cx-api": "^0.35.0" diff --git a/packages/@aws-cdk/aws-apigateway/package.json b/packages/@aws-cdk/aws-apigateway/package.json index 9450953fd1b6e..043736dda6840 100644 --- a/packages/@aws-cdk/aws-apigateway/package.json +++ b/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://github.com/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" diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts index a4a43b3ded811..e5d3e3345bed8 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts +++ b/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 { diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.ts b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.ts index 03ffbe7cd9b8b..96cf1cbe4cad7 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.ts +++ b/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(); diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts index 9babade508096..aa244f1d45021 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts +++ b/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 { diff --git a/packages/@aws-cdk/aws-apigateway/test/test.api-key.ts b/packages/@aws-cdk/aws-apigateway/test/test.api-key.ts index 41806d0f2288a..15102b3d93672 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.api-key.ts +++ b/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'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.deployment.ts b/packages/@aws-cdk/aws-apigateway/test/test.deployment.ts index d3647822b2bf5..ddf2a8525137a 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.deployment.ts +++ b/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'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.http.ts b/packages/@aws-cdk/aws-apigateway/test/test.http.ts index dea6bb2658a58..c312f2b2bc743 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.http.ts +++ b/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'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts b/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts index dfceb4b38c259..9bf1ae57126bb 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import apigw = require('../lib'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts b/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts index 912b4c35ca59e..1fae98e3a2cf3 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts @@ -1,6 +1,6 @@ import { expect, haveResource, haveResourceLike, not } from '@aws-cdk/assert'; import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import apigateway = require('../lib'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.method.ts b/packages/@aws-cdk/aws-apigateway/test/test.method.ts index 839c438398ce3..aa4e4f0e23120 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.method.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.method.ts @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import apigateway = require('../lib'); import { ConnectionType, EmptyModel, ErrorModel } from '../lib'; diff --git a/packages/@aws-cdk/aws-apigateway/test/test.resource.ts b/packages/@aws-cdk/aws-apigateway/test/test.resource.ts index c306bcd281098..b7ed024a6295f 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.resource.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.resource.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; -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 { Test } from 'nodeunit'; import apigw = require('../lib'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts b/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts index 1112cfd585b03..913aab33e8dea 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts @@ -1,6 +1,6 @@ import { expect, haveResource, haveResourceLike, ResourcePart } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); -import { App, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import apigateway = require('../lib'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.stage.ts b/packages/@aws-cdk/aws-apigateway/test/test.stage.ts index fa55e46b0013d..5c0b481644780 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.stage.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.stage.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'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.usage-plan.ts b/packages/@aws-cdk/aws-apigateway/test/test.usage-plan.ts index 883f672fc999f..7ece505a1bb11 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.usage-plan.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.usage-plan.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'); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.vpc-link.ts b/packages/@aws-cdk/aws-apigateway/test/test.vpc-link.ts index e75361d1d4895..f6a2d4b56dd78 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.vpc-link.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.vpc-link.ts @@ -1,7 +1,7 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import apigateway = require('../lib'); diff --git a/packages/@aws-cdk/aws-applicationautoscaling/lib/base-scalable-attribute.ts b/packages/@aws-cdk/aws-applicationautoscaling/lib/base-scalable-attribute.ts index 205503b235e6d..2fb9a03d18f84 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/lib/base-scalable-attribute.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/lib/base-scalable-attribute.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ScalableTarget, ScalingSchedule, ServiceNamespace } from './scalable-target'; import { BasicStepScalingPolicyProps } from './step-scaling-policy'; import { BasicTargetTrackingScalingPolicyProps } from './target-tracking-scaling-policy'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/lib/scalable-target.ts b/packages/@aws-cdk/aws-applicationautoscaling/lib/scalable-target.ts index 23a2c23389fcb..a05f710a13d2b 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/lib/scalable-target.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/lib/scalable-target.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { CfnScalableTarget } from './applicationautoscaling.generated'; import { Schedule } from './schedule'; import { BasicStepScalingPolicyProps, StepScalingPolicy } from './step-scaling-policy'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/lib/schedule.ts b/packages/@aws-cdk/aws-applicationautoscaling/lib/schedule.ts index 96d1a0e8ff390..53258e705be16 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/lib/schedule.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/lib/schedule.ts @@ -1,4 +1,4 @@ -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; /** * Schedule for scheduled scaling actions diff --git a/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-action.ts b/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-action.ts index 6785a6f6d52db..6116156ba0051 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-action.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-action.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnScalingPolicy } from './applicationautoscaling.generated'; import { IScalableTarget } from './scalable-target'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-policy.ts b/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-policy.ts index 85f2921110ebc..8874208174223 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-policy.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-policy.ts @@ -1,6 +1,6 @@ import { findAlarmThresholds, normalizeIntervals } from '@aws-cdk/aws-autoscaling-common'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { IScalableTarget } from './scalable-target'; import { AdjustmentType, MetricAggregationType, StepScalingAction } from './step-scaling-action'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts b/packages/@aws-cdk/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts index 90113ea88c1d2..124563bad5020 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnScalingPolicy } from './applicationautoscaling.generated'; import { IScalableTarget } from './scalable-target'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/package.json b/packages/@aws-cdk/aws-applicationautoscaling/package.json index 968ae55e01516..dc9e699dc43f6 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/package.json +++ b/packages/@aws-cdk/aws-applicationautoscaling/package.json @@ -73,14 +73,14 @@ "@aws-cdk/aws-autoscaling-common": "^0.35.0", "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-autoscaling-common": "^0.35.0", "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-applicationautoscaling/test/test.cron.ts b/packages/@aws-cdk/aws-applicationautoscaling/test/test.cron.ts index 9fcf4bf4ca3fa..f3224c3629f1d 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/test/test.cron.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/test/test.cron.ts @@ -1,4 +1,4 @@ -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import appscaling = require('../lib'); diff --git a/packages/@aws-cdk/aws-applicationautoscaling/test/test.scalable-target.ts b/packages/@aws-cdk/aws-applicationautoscaling/test/test.scalable-target.ts index b1d2c8e750a71..5b4f1c851946b 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/test/test.scalable-target.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/test/test.scalable-target.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); -import { Duration } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Duration } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import appscaling = require('../lib'); import { createScalableTarget } from './util'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/test/test.step-scaling-policy.ts b/packages/@aws-cdk/aws-applicationautoscaling/test/test.step-scaling-policy.ts index 425cf7bb29e2a..a1236a95a4c9e 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/test/test.step-scaling-policy.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/test/test.step-scaling-policy.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import { SynthUtils } from '@aws-cdk/assert'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import fc = require('fast-check'); import { Test } from 'nodeunit'; import appscaling = require('../lib'); diff --git a/packages/@aws-cdk/aws-applicationautoscaling/test/test.target-tracking.ts b/packages/@aws-cdk/aws-applicationautoscaling/test/test.target-tracking.ts index 9b0b55162d68d..7c3eba07b347f 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/test/test.target-tracking.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/test/test.target-tracking.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import appscaling = require('../lib'); import { createScalableTarget } from './util'; diff --git a/packages/@aws-cdk/aws-applicationautoscaling/test/util.ts b/packages/@aws-cdk/aws-applicationautoscaling/test/util.ts index 1292cffccbdb4..cf0b94874e019 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/test/util.ts +++ b/packages/@aws-cdk/aws-applicationautoscaling/test/util.ts @@ -1,5 +1,5 @@ import scalingcommon = require('@aws-cdk/aws-autoscaling-common'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import fc = require('fast-check'); import appscaling = require('../lib'); import { ServiceNamespace } from '../lib'; diff --git a/packages/@aws-cdk/aws-appmesh/package.json b/packages/@aws-cdk/aws-appmesh/package.json index bd654c93b3019..6803998170d24 100644 --- a/packages/@aws-cdk/aws-appmesh/package.json +++ b/packages/@aws-cdk/aws-appmesh/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" diff --git a/packages/@aws-cdk/aws-appstream/package.json b/packages/@aws-cdk/aws-appstream/package.json index 6d380fb73d2c9..f7e263a1320c2 100644 --- a/packages/@aws-cdk/aws-appstream/package.json +++ b/packages/@aws-cdk/aws-appstream/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" diff --git a/packages/@aws-cdk/aws-appsync/package.json b/packages/@aws-cdk/aws-appsync/package.json index e37522ddc553b..83c376ae9b48d 100644 --- a/packages/@aws-cdk/aws-appsync/package.json +++ b/packages/@aws-cdk/aws-appsync/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-athena/package.json b/packages/@aws-cdk/aws-athena/package.json index 4cdbe546066ea..97ff341fb35f0 100644 --- a/packages/@aws-cdk/aws-athena/package.json +++ b/packages/@aws-cdk/aws-athena/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-autoscaling-common/package.json b/packages/@aws-cdk/aws-autoscaling-common/package.json index af517cc0081e1..24db3ffbafdd4 100644 --- a/packages/@aws-cdk/aws-autoscaling-common/package.json +++ b/packages/@aws-cdk/aws-autoscaling-common/package.json @@ -64,12 +64,12 @@ }, "dependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts index 3c7a9bfbb7737..b54edb40c5f38 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts @@ -2,7 +2,7 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); import subs = require('@aws-cdk/aws-sns-subscriptions'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { TopicHook } from './topic-hook'; /** diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/queue-hook.ts b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/queue-hook.ts index de144a7cc5365..697607024981b 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/queue-hook.ts +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/queue-hook.ts @@ -1,6 +1,6 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import sqs = require('@aws-cdk/aws-sqs'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use an SQS queue as a hook target diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/topic-hook.ts b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/topic-hook.ts index 61623da9000e3..489852e36d262 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/topic-hook.ts +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/topic-hook.ts @@ -1,6 +1,6 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import sns = require('@aws-cdk/aws-sns'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use an SNS topic as a hook target diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json b/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json index 723a65aa63db0..b3042edc4d68e 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json @@ -83,7 +83,7 @@ "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sns-subscriptions": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -93,7 +93,7 @@ "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sns-subscriptions": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/test/hooks.test.ts b/packages/@aws-cdk/aws-autoscaling-hooktargets/test/hooks.test.ts index 76507c15fe11c..d816281a14c76 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/test/hooks.test.ts +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/test/hooks.test.ts @@ -4,7 +4,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); import sqs = require('@aws-cdk/aws-sqs'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import hooks = require('../lib'); describe('given an AutoScalingGroup', () => { diff --git a/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts b/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts index 652eab00e4cc3..1891673d5d63e 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts @@ -5,7 +5,7 @@ import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); import iam = require('@aws-cdk/aws-iam'); import sns = require('@aws-cdk/aws-sns'); -import { CfnAutoScalingRollingUpdate, Construct, Duration, Fn, IResource, Lazy, Resource, Stack, Tag } from '@aws-cdk/cdk'; +import { CfnAutoScalingRollingUpdate, Construct, Duration, Fn, IResource, Lazy, Resource, Stack, Tag } from '@aws-cdk/core'; import { CfnAutoScalingGroup, CfnAutoScalingGroupProps, CfnLaunchConfiguration } from './autoscaling.generated'; import { BasicLifecycleHookProps, LifecycleHook } from './lifecycle-hook'; import { BasicScheduledActionProps, ScheduledAction } from './scheduled-action'; diff --git a/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook-target.ts b/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook-target.ts index 4934ce3e7c73e..50fdc77360d9f 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook-target.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook-target.ts @@ -1,4 +1,4 @@ -import { Construct } from '@aws-cdk/cdk/lib/construct'; +import { Construct } from '@aws-cdk/core/lib/construct'; import { ILifecycleHook } from './lifecycle-hook'; /** diff --git a/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook.ts b/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook.ts index 334b5c732a280..dc422b476e88e 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Construct, Duration, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Resource } from '@aws-cdk/core'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnLifecycleHook } from './autoscaling.generated'; import { ILifecycleHookTarget } from './lifecycle-hook-target'; diff --git a/packages/@aws-cdk/aws-autoscaling/lib/scheduled-action.ts b/packages/@aws-cdk/aws-autoscaling/lib/scheduled-action.ts index 5e8443da9b6d5..a38c9d88bac64 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/scheduled-action.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/scheduled-action.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnScheduledAction } from './autoscaling.generated'; import { Schedule } from './schedule'; diff --git a/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-action.ts b/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-action.ts index e68513c37207a..275ec97fcd266 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-action.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-action.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnScalingPolicy } from './autoscaling.generated'; diff --git a/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-policy.ts b/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-policy.ts index fe507ef052254..21a33e469dd18 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-policy.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/step-scaling-policy.ts @@ -1,6 +1,6 @@ import { findAlarmThresholds, normalizeIntervals } from '@aws-cdk/aws-autoscaling-common'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { IAutoScalingGroup } from './auto-scaling-group'; import { AdjustmentType, MetricAggregationType, StepScalingAction } from './step-scaling-action'; diff --git a/packages/@aws-cdk/aws-autoscaling/lib/target-tracking-scaling-policy.ts b/packages/@aws-cdk/aws-autoscaling/lib/target-tracking-scaling-policy.ts index 09688d4478899..f4b622345dfe1 100644 --- a/packages/@aws-cdk/aws-autoscaling/lib/target-tracking-scaling-policy.ts +++ b/packages/@aws-cdk/aws-autoscaling/lib/target-tracking-scaling-policy.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { IAutoScalingGroup } from './auto-scaling-group'; import { CfnScalingPolicy } from './autoscaling.generated'; diff --git a/packages/@aws-cdk/aws-autoscaling/package.json b/packages/@aws-cdk/aws-autoscaling/package.json index 6ce3804c227e3..8388a8c655d89 100644 --- a/packages/@aws-cdk/aws-autoscaling/package.json +++ b/packages/@aws-cdk/aws-autoscaling/package.json @@ -77,7 +77,7 @@ "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -88,7 +88,7 @@ "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.ts index 52306e76e53b6..af691e38ab38a 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import autoscaling = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.ts index 235eb3b0ceb37..4eb92ad7b5d9f 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); import elb = require('@aws-cdk/aws-elasticloadbalancing'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import autoscaling = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.ts index 4bb96d7a63dfe..8c44a0dbd5a32 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import autoscaling = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.custom-scaling.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.custom-scaling.ts index 2bf929d10d267..6105a5fac4505 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/integ.custom-scaling.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/integ.custom-scaling.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import autoscaling = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.external-role.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.external-role.ts index b3c192adf81f3..ba1dcc9c061f3 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/integ.external-role.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/integ.external-role.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import asg = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.spot-instances.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.spot-instances.ts index 7be3961428631..c92a03625b58f 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/integ.spot-instances.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/integ.spot-instances.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import autoscaling = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-autoscaling/test/test.auto-scaling-group.ts b/packages/@aws-cdk/aws-autoscaling/test/test.auto-scaling-group.ts index b1da8df6a1964..89a456e40fe51 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/test.auto-scaling-group.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/test.auto-scaling-group.ts @@ -1,7 +1,7 @@ import { expect, haveResource, haveResourceLike, InspectionFailure, ResourcePart } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import autoscaling = require('../lib'); diff --git a/packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts b/packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts index 8d1bfedcc4ac2..72c5dbcf06efc 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts @@ -1,8 +1,8 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); -import { Construct } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Construct } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import autoscaling = require('../lib'); diff --git a/packages/@aws-cdk/aws-autoscaling/test/test.scaling.ts b/packages/@aws-cdk/aws-autoscaling/test/test.scaling.ts index c2faf188ea1a3..6402ddf6f10f0 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/test.scaling.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/test.scaling.ts @@ -2,7 +2,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import autoscaling = require('../lib'); diff --git a/packages/@aws-cdk/aws-autoscaling/test/test.scheduled-action.ts b/packages/@aws-cdk/aws-autoscaling/test/test.scheduled-action.ts index 27a2b8fef4969..abc7f19135d4d 100644 --- a/packages/@aws-cdk/aws-autoscaling/test/test.scheduled-action.ts +++ b/packages/@aws-cdk/aws-autoscaling/test/test.scheduled-action.ts @@ -1,6 +1,6 @@ import { expect, haveResource, MatchStyle, } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import autoscaling = require('../lib'); diff --git a/packages/@aws-cdk/aws-autoscalingplans/package.json b/packages/@aws-cdk/aws-autoscalingplans/package.json index 197e0b50780c0..dc72bb110e00d 100644 --- a/packages/@aws-cdk/aws-autoscalingplans/package.json +++ b/packages/@aws-cdk/aws-autoscalingplans/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-batch/package.json b/packages/@aws-cdk/aws-batch/package.json index f4d571935c0cf..c0ba9f2462f83 100644 --- a/packages/@aws-cdk/aws-batch/package.json +++ b/packages/@aws-cdk/aws-batch/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-budgets/package.json b/packages/@aws-cdk/aws-budgets/package.json index 776ec0fedb10c..2fa33cc0b530c 100644 --- a/packages/@aws-cdk/aws-budgets/package.json +++ b/packages/@aws-cdk/aws-budgets/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-certificatemanager/lib/certificate.ts b/packages/@aws-cdk/aws-certificatemanager/lib/certificate.ts index 9355b6fa449be..37d5c1525f7e0 100644 --- a/packages/@aws-cdk/aws-certificatemanager/lib/certificate.ts +++ b/packages/@aws-cdk/aws-certificatemanager/lib/certificate.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { CfnCertificate } from './certificatemanager.generated'; import { apexDomain } from './util'; diff --git a/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts b/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts index 876335bbca05d..9860ce600da7a 100644 --- a/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts +++ b/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts @@ -2,7 +2,7 @@ import cfn = require('@aws-cdk/aws-cloudformation'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); import route53 = require('@aws-cdk/aws-route53'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import { CertificateProps, ICertificate } from './certificate'; diff --git a/packages/@aws-cdk/aws-certificatemanager/package.json b/packages/@aws-cdk/aws-certificatemanager/package.json index 02ada6dca27d8..c738c91a0998c 100644 --- a/packages/@aws-cdk/aws-certificatemanager/package.json +++ b/packages/@aws-cdk/aws-certificatemanager/package.json @@ -73,7 +73,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-route53": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -81,7 +81,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-route53": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-certificatemanager/test/test.certificate.ts b/packages/@aws-cdk/aws-certificatemanager/test/test.certificate.ts index eda2e92a825ba..f9ccab2e579ff 100644 --- a/packages/@aws-cdk/aws-certificatemanager/test/test.certificate.ts +++ b/packages/@aws-cdk/aws-certificatemanager/test/test.certificate.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Certificate } from '../lib'; diff --git a/packages/@aws-cdk/aws-certificatemanager/test/test.dns-validated-certificate.ts b/packages/@aws-cdk/aws-certificatemanager/test/test.dns-validated-certificate.ts index 5a07f63069e03..18b8c2667f6bf 100644 --- a/packages/@aws-cdk/aws-certificatemanager/test/test.dns-validated-certificate.ts +++ b/packages/@aws-cdk/aws-certificatemanager/test/test.dns-validated-certificate.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import { HostedZone, PublicHostedZone } from '@aws-cdk/aws-route53'; -import { App, Stack } from '@aws-cdk/cdk'; +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { DnsValidatedCertificate } from '../lib/dns-validated-certificate'; diff --git a/packages/@aws-cdk/aws-cloud9/package.json b/packages/@aws-cdk/aws-cloud9/package.json index f4a92a302f29b..d48eae249b012 100644 --- a/packages/@aws-cdk/aws-cloud9/package.json +++ b/packages/@aws-cdk/aws-cloud9/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-cloudformation/lib/aws-custom-resource.ts b/packages/@aws-cdk/aws-cloudformation/lib/aws-custom-resource.ts index 726b4cc556219..1160e984f0d12 100644 --- a/packages/@aws-cdk/aws-cloudformation/lib/aws-custom-resource.ts +++ b/packages/@aws-cdk/aws-cloudformation/lib/aws-custom-resource.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import metadata = require('aws-sdk/apis/metadata.json'); import path = require('path'); import { CustomResource, CustomResourceProvider } from './custom-resource'; diff --git a/packages/@aws-cdk/aws-cloudformation/lib/custom-resource.ts b/packages/@aws-cdk/aws-cloudformation/lib/custom-resource.ts index a213b16c9887a..a03f7e3c23f65 100644 --- a/packages/@aws-cdk/aws-cloudformation/lib/custom-resource.ts +++ b/packages/@aws-cdk/aws-cloudformation/lib/custom-resource.ts @@ -1,6 +1,6 @@ import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); -import { CfnResource, Construct, RemovalPolicy, Resource } from '@aws-cdk/cdk'; +import { CfnResource, Construct, RemovalPolicy, Resource } from '@aws-cdk/core'; import { CfnCustomResource } from './cloudformation.generated'; /** diff --git a/packages/@aws-cdk/aws-cloudformation/package.json b/packages/@aws-cdk/aws-cloudformation/package.json index 0232a60e9931b..a7abf19d2842d 100644 --- a/packages/@aws-cdk/aws-cloudformation/package.json +++ b/packages/@aws-cdk/aws-cloudformation/package.json @@ -81,7 +81,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "aws-sdk": "^2.409.0" }, "bundledDependencies": [ @@ -92,7 +92,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.aws-custom-resource.ts b/packages/@aws-cdk/aws-cloudformation/test/integ.aws-custom-resource.ts index 8aca2b3bf2cc6..de3ab1f97f7b5 100644 --- a/packages/@aws-cdk/aws-cloudformation/test/integ.aws-custom-resource.ts +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.aws-custom-resource.ts @@ -1,8 +1,8 @@ #!/usr/bin/env node import sns = require('@aws-cdk/aws-sns'); import ssm = require('@aws-cdk/aws-ssm'); -import cdk = require('@aws-cdk/cdk'); -import { Token } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Token } from '@aws-cdk/core'; import { AwsCustomResource } from '../lib'; const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.ts b/packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.ts index f085f70568acf..8b63b1afc79a3 100644 --- a/packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.ts +++ b/packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.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 fs = require('fs'); import { CustomResource, CustomResourceProvider } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudformation/test/test.aws-custom-resource.ts b/packages/@aws-cdk/aws-cloudformation/test/test.aws-custom-resource.ts index 2e3fc7f05ad86..0a9ff7b7636be 100644 --- a/packages/@aws-cdk/aws-cloudformation/test/test.aws-custom-resource.ts +++ b/packages/@aws-cdk/aws-cloudformation/test/test.aws-custom-resource.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { AwsCustomResource } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudformation/test/test.resource.ts b/packages/@aws-cdk/aws-cloudformation/test/test.resource.ts index e2e583f0b4829..980b0eccc1784 100644 --- a/packages/@aws-cdk/aws-cloudformation/test/test.resource.ts +++ b/packages/@aws-cdk/aws-cloudformation/test/test.resource.ts @@ -1,7 +1,7 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test, testCase } from 'nodeunit'; import { CustomResource, CustomResourceProvider } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts b/packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts index 1162cccb2e6d7..efbd49e9aa8d1 100644 --- a/packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts +++ b/packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts @@ -1,6 +1,6 @@ import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnDistribution } from './cloudfront.generated'; import { IDistribution } from './distribution'; diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json index 696eb59c17438..1b1a4e7f88837 100644 --- a/packages/@aws-cdk/aws-cloudfront/package.json +++ b/packages/@aws-cdk/aws-cloudfront/package.json @@ -76,7 +76,7 @@ "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -85,7 +85,7 @@ "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-bucket-logging.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-bucket-logging.ts index 24f1c26d0f0ec..8b5c998f014a0 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-bucket-logging.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-bucket-logging.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-custom.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-custom.ts index 774a26d394f9a..987252424bc63 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-custom.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-custom.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-empty-root.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-empty-root.ts index 5650e26bf402a..f533d7ce5e399 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-empty-root.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-empty-root.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-ipv6-disabled.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-ipv6-disabled.ts index e967fece81253..281820a22501e 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-ipv6-disabled.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-ipv6-disabled.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-lambda-association.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-lambda-association.ts index 81154a8800cc9..73cdca37b0f61 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-lambda-association.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-lambda-association.ts @@ -1,6 +1,6 @@ import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-s3.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-s3.ts index 2659f51263336..9d4cfa45e8275 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-s3.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-s3.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-security-policy.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-security-policy.ts index 36eb03784c4f6..e508ed44e58d3 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-security-policy.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-security-policy.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront.ts b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront.ts index 9fb179e55e6bf..83e32e5ac7f41 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudfront = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudfront/test/test.basic.ts b/packages/@aws-cdk/aws-cloudfront/test/test.basic.ts index 78d3f1c5fa145..1f638903b8d07 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/test.basic.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/test.basic.ts @@ -1,6 +1,6 @@ import { expect } from '@aws-cdk/assert'; import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { CloudFrontWebDistribution, ViewerProtocolPolicy } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudtrail/lib/index.ts b/packages/@aws-cdk/aws-cloudtrail/lib/index.ts index 8aa7f3e72e12f..5c1330949fb65 100644 --- a/packages/@aws-cdk/aws-cloudtrail/lib/index.ts +++ b/packages/@aws-cdk/aws-cloudtrail/lib/index.ts @@ -3,7 +3,7 @@ import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import logs = require('@aws-cdk/aws-logs'); import s3 = require('@aws-cdk/aws-s3'); -import { Construct, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Resource, Stack } from '@aws-cdk/core'; import { CfnTrail } from './cloudtrail.generated'; // AWS::CloudTrail CloudFormation Resources: diff --git a/packages/@aws-cdk/aws-cloudtrail/package.json b/packages/@aws-cdk/aws-cloudtrail/package.json index 1003530de1d4a..91dc51dde7089 100644 --- a/packages/@aws-cdk/aws-cloudtrail/package.json +++ b/packages/@aws-cdk/aws-cloudtrail/package.json @@ -77,7 +77,7 @@ "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -86,7 +86,7 @@ "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-cloudtrail/test/integ.cloudtrail.lit.ts b/packages/@aws-cdk/aws-cloudtrail/test/integ.cloudtrail.lit.ts index 36d047ec1660b..71633a7161308 100644 --- a/packages/@aws-cdk/aws-cloudtrail/test/integ.cloudtrail.lit.ts +++ b/packages/@aws-cdk/aws-cloudtrail/test/integ.cloudtrail.lit.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudtrail = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts b/packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts index ab8e8f2f06f5b..ae34bf2482e68 100644 --- a/packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts +++ b/packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts @@ -1,6 +1,6 @@ import { expect, haveResource, not, SynthUtils } from '@aws-cdk/assert'; import { RetentionDays } from '@aws-cdk/aws-logs'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ReadWriteType, Trail } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/lib/appscaling.ts b/packages/@aws-cdk/aws-cloudwatch-actions/lib/appscaling.ts index 0dfb656b3e23c..aea40ce21b6f5 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/lib/appscaling.ts +++ b/packages/@aws-cdk/aws-cloudwatch-actions/lib/appscaling.ts @@ -1,6 +1,6 @@ import appscaling = require('@aws-cdk/aws-applicationautoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); /** * Use an ApplicationAutoScaling StepScalingAction as an Alarm Action diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/lib/autoscaling.ts b/packages/@aws-cdk/aws-cloudwatch-actions/lib/autoscaling.ts index ba6702eb5fdd9..18d433583be17 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/lib/autoscaling.ts +++ b/packages/@aws-cdk/aws-cloudwatch-actions/lib/autoscaling.ts @@ -1,6 +1,6 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); /** * Use an AutoScaling StepScalingAction as an Alarm Action diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/lib/sns.ts b/packages/@aws-cdk/aws-cloudwatch-actions/lib/sns.ts index fce383bb69a6b..95e611db5e392 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/lib/sns.ts +++ b/packages/@aws-cdk/aws-cloudwatch-actions/lib/sns.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import sns = require('@aws-cdk/aws-sns'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use an SNS topic as an alarm action diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/package.json b/packages/@aws-cdk/aws-cloudwatch-actions/package.json index 9d1182f03d1f6..8fa84de2e9646 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/package.json +++ b/packages/@aws-cdk/aws-cloudwatch-actions/package.json @@ -82,7 +82,7 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -91,7 +91,7 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/test/appscaling.test.ts b/packages/@aws-cdk/aws-cloudwatch-actions/test/appscaling.test.ts index 28c50c1792825..91b27d3e7f9f4 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/test/appscaling.test.ts +++ b/packages/@aws-cdk/aws-cloudwatch-actions/test/appscaling.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import appscaling = require('@aws-cdk/aws-applicationautoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import actions = require('../lib'); test('can use topic as alarm action', () => { diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/test/scaling.test.ts b/packages/@aws-cdk/aws-cloudwatch-actions/test/scaling.test.ts index 264ac8035e631..321416b280dea 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/test/scaling.test.ts +++ b/packages/@aws-cdk/aws-cloudwatch-actions/test/scaling.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import autoscaling = require('@aws-cdk/aws-autoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import actions = require('../lib'); test('can use topic as alarm action', () => { diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/test/sns.test.ts b/packages/@aws-cdk/aws-cloudwatch-actions/test/sns.test.ts index 3793908e915aa..44c452519af8a 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/test/sns.test.ts +++ b/packages/@aws-cdk/aws-cloudwatch-actions/test/sns.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import sns = require('@aws-cdk/aws-sns'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import actions = require('../lib'); test('can use topic as alarm action', () => { diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm-action.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm-action.ts index 7348672348b41..f73b34db47c1d 100644 --- a/packages/@aws-cdk/aws-cloudwatch/lib/alarm-action.ts +++ b/packages/@aws-cdk/aws-cloudwatch/lib/alarm-action.ts @@ -1,4 +1,4 @@ -import { Construct } from "@aws-cdk/cdk"; +import { Construct } from "@aws-cdk/core"; import { IAlarm } from "./alarm"; /** diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts index accccaeda9a26..4044d2a83b2ee 100644 --- a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts +++ b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource, Stack } from '@aws-cdk/core'; import { IAlarmAction } from './alarm-action'; import { CfnAlarm } from './cloudwatch.generated'; import { HorizontalAnnotation } from './graph'; diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/dashboard.ts b/packages/@aws-cdk/aws-cloudwatch/lib/dashboard.ts index fd96baaf68723..6dda9c505e63d 100644 --- a/packages/@aws-cdk/aws-cloudwatch/lib/dashboard.ts +++ b/packages/@aws-cdk/aws-cloudwatch/lib/dashboard.ts @@ -1,4 +1,4 @@ -import { Construct, Lazy, Resource, Stack } from "@aws-cdk/cdk"; +import { Construct, Lazy, Resource, Stack } from "@aws-cdk/core"; import { CfnDashboard } from './cloudwatch.generated'; import { Column, Row } from "./layout"; import { IWidget } from "./widget"; diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/graph.ts b/packages/@aws-cdk/aws-cloudwatch/lib/graph.ts index 0c30441ea4865..53b4aec1c8936 100644 --- a/packages/@aws-cdk/aws-cloudwatch/lib/graph.ts +++ b/packages/@aws-cdk/aws-cloudwatch/lib/graph.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Alarm } from "./alarm"; import { IMetric } from "./metric-types"; import { ConcreteWidget } from "./widget"; diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/metric.ts b/packages/@aws-cdk/aws-cloudwatch/lib/metric.ts index 6c12d8448da94..a5dbfaeb371e3 100644 --- a/packages/@aws-cdk/aws-cloudwatch/lib/metric.ts +++ b/packages/@aws-cdk/aws-cloudwatch/lib/metric.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Alarm, ComparisonOperator, TreatMissingData } from './alarm'; import { Dimension, IMetric, MetricAlarmConfig, MetricGraphConfig, Unit } from './metric-types'; import { normalizeStatistic, parseStatistic } from './util.statistic'; diff --git a/packages/@aws-cdk/aws-cloudwatch/package.json b/packages/@aws-cdk/aws-cloudwatch/package.json index f609d89253826..ffb09d4a7b7a6 100644 --- a/packages/@aws-cdk/aws-cloudwatch/package.json +++ b/packages/@aws-cdk/aws-cloudwatch/package.json @@ -71,12 +71,12 @@ }, "dependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "awslint": { "exclude": [ diff --git a/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.ts b/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.ts index 20e62c2334609..2711a32a84bcb 100644 --- a/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.ts +++ b/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-and-dashboard.ts @@ -4,7 +4,7 @@ // to the very lowest level to create CloudFormation resources by hand, without even generated // library support. -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cloudwatch = require('../lib'); import { PeriodOverride } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.alarm.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.alarm.ts index e46b314eddd6a..5e370979d91eb 100644 --- a/packages/@aws-cdk/aws-cloudwatch/test/test.alarm.ts +++ b/packages/@aws-cdk/aws-cloudwatch/test/test.alarm.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Construct, Duration, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Alarm, IAlarm, IAlarmAction, Metric } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts index 6c9d16976b457..65c3fddc927dd 100644 --- a/packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts +++ b/packages/@aws-cdk/aws-cloudwatch/test/test.dashboard.ts @@ -1,5 +1,5 @@ import { expect, haveResource, isSuperObject } from '@aws-cdk/assert'; -import { App, Stack } from '@aws-cdk/cdk'; +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Dashboard, GraphWidget, PeriodOverride, TextWidget } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.graphs.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.graphs.ts index 3f3bea6386e23..1f20e81db8103 100644 --- a/packages/@aws-cdk/aws-cloudwatch/test/test.graphs.ts +++ b/packages/@aws-cdk/aws-cloudwatch/test/test.graphs.ts @@ -1,4 +1,4 @@ -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { AlarmWidget, GraphWidget, Metric, Shading, SingleValueWidget } from '../lib'; diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.metrics.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.metrics.ts index d7ea9d6597b4e..b90517f51c60a 100644 --- a/packages/@aws-cdk/aws-cloudwatch/test/test.metrics.ts +++ b/packages/@aws-cdk/aws-cloudwatch/test/test.metrics.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { Metric } from '../lib'; diff --git a/packages/@aws-cdk/aws-codebuild/lib/artifacts.ts b/packages/@aws-cdk/aws-codebuild/lib/artifacts.ts index 0e314f8ae5eba..a751372821c00 100644 --- a/packages/@aws-cdk/aws-codebuild/lib/artifacts.ts +++ b/packages/@aws-cdk/aws-codebuild/lib/artifacts.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { CfnProject } from './codebuild.generated'; import { IProject } from './project'; diff --git a/packages/@aws-cdk/aws-codebuild/lib/build-spec.ts b/packages/@aws-cdk/aws-codebuild/lib/build-spec.ts index 616739c0ef675..fe50306e3691b 100644 --- a/packages/@aws-cdk/aws-codebuild/lib/build-spec.ts +++ b/packages/@aws-cdk/aws-codebuild/lib/build-spec.ts @@ -1,4 +1,4 @@ -import { IResolveContext, Lazy, Stack } from '@aws-cdk/cdk'; +import { IResolveContext, Lazy, Stack } from '@aws-cdk/core'; /** * BuildSpec for CodeBuild projects diff --git a/packages/@aws-cdk/aws-codebuild/lib/cache.ts b/packages/@aws-cdk/aws-codebuild/lib/cache.ts index b92206de862a6..fb6cde55c6081 100644 --- a/packages/@aws-cdk/aws-codebuild/lib/cache.ts +++ b/packages/@aws-cdk/aws-codebuild/lib/cache.ts @@ -1,5 +1,5 @@ import { IBucket } from "@aws-cdk/aws-s3"; -import { Aws, Fn } from "@aws-cdk/cdk"; +import { Aws, Fn } from "@aws-cdk/core"; import { CfnProject } from "./codebuild.generated"; import { IProject } from "./project"; diff --git a/packages/@aws-cdk/aws-codebuild/lib/pipeline-project.ts b/packages/@aws-cdk/aws-codebuild/lib/pipeline-project.ts index 979850701a862..04adc283b4e52 100644 --- a/packages/@aws-cdk/aws-codebuild/lib/pipeline-project.ts +++ b/packages/@aws-cdk/aws-codebuild/lib/pipeline-project.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CodePipelineArtifacts } from './codepipeline-artifacts'; import { CodePipelineSource } from './codepipeline-source'; import { CommonProjectProps, Project } from './project'; diff --git a/packages/@aws-cdk/aws-codebuild/lib/project.ts b/packages/@aws-cdk/aws-codebuild/lib/project.ts index 522b06e3a25ec..aee2638f74dba 100644 --- a/packages/@aws-cdk/aws-codebuild/lib/project.ts +++ b/packages/@aws-cdk/aws-codebuild/lib/project.ts @@ -5,7 +5,7 @@ import { DockerImageAsset, DockerImageAssetProps } from '@aws-cdk/aws-ecr-assets import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { Aws, CfnResource, Construct, Duration, IResource, Lazy, PhysicalName, Resource, Stack } from '@aws-cdk/cdk'; +import { Aws, CfnResource, Construct, Duration, IResource, Lazy, PhysicalName, Resource, Stack } from '@aws-cdk/core'; import { IArtifacts } from './artifacts'; import { BuildSpec } from './build-spec'; import { Cache } from './cache'; diff --git a/packages/@aws-cdk/aws-codebuild/lib/source.ts b/packages/@aws-cdk/aws-codebuild/lib/source.ts index 671a3cf1ba947..1bc03d1cdd127 100644 --- a/packages/@aws-cdk/aws-codebuild/lib/source.ts +++ b/packages/@aws-cdk/aws-codebuild/lib/source.ts @@ -1,7 +1,7 @@ import codecommit = require('@aws-cdk/aws-codecommit'); import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { CfnProject } from './codebuild.generated'; import { IProject } from './project'; import { diff --git a/packages/@aws-cdk/aws-codebuild/package.json b/packages/@aws-cdk/aws-codebuild/package.json index 141e0620d4750..6207470f02ec4 100644 --- a/packages/@aws-cdk/aws-codebuild/package.json +++ b/packages/@aws-cdk/aws-codebuild/package.json @@ -88,7 +88,7 @@ "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -103,7 +103,7 @@ "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.caching.ts b/packages/@aws-cdk/aws-codebuild/test/integ.caching.ts index 1b0d23ef83a54..dffb8f9fa8ebd 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.caching.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.caching.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); import { Cache } from '../lib/cache'; diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.defaults.lit.ts b/packages/@aws-cdk/aws-codebuild/test/integ.defaults.lit.ts index 4697e2c4c5d47..a912cce3f9cd6 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.defaults.lit.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.defaults.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.ts b/packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.ts index 37c695ceafccb..ccc6abce9284f 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import codebuild = require('../lib'); diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.ecr.lit.ts b/packages/@aws-cdk/aws-codebuild/test/integ.ecr.lit.ts index 4c53ed1e3bbb5..251635d2da786 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.ecr.lit.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.ecr.lit.ts @@ -1,5 +1,5 @@ import ecr = require('@aws-cdk/aws-ecr'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.github.ts b/packages/@aws-cdk/aws-codebuild/test/integ.github.ts index 2db2ae3344434..504a854cca1d4 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.github.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.github.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.ts b/packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.ts index 837c5f0dd1b9d..63c8116a0708a 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.ts b/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.ts index 322672300fe5b..1c1639789d0a0 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-vpc.ts b/packages/@aws-cdk/aws-codebuild/test/integ.project-vpc.ts index 3dde7bce6f7df..730cbc33bf0f3 100644 --- a/packages/@aws-cdk/aws-codebuild/test/integ.project-vpc.ts +++ b/packages/@aws-cdk/aws-codebuild/test/integ.project-vpc.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codebuild = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts b/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts index 72d5901c65bdd..1210e88e70754 100644 --- a/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts +++ b/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts @@ -3,7 +3,7 @@ import codecommit = require('@aws-cdk/aws-codecommit'); import ec2 = require('@aws-cdk/aws-ec2'); import kms = require('@aws-cdk/aws-kms'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codebuild = require('../lib'); import { CodePipelineSource } from '../lib/codepipeline-source'; diff --git a/packages/@aws-cdk/aws-codebuild/test/test.project.ts b/packages/@aws-cdk/aws-codebuild/test/test.project.ts index 856dc11c552c7..55a6d4294744f 100644 --- a/packages/@aws-cdk/aws-codebuild/test/test.project.ts +++ b/packages/@aws-cdk/aws-codebuild/test/test.project.ts @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike, not } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import { Bucket } from '@aws-cdk/aws-s3'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codebuild = require('../lib'); diff --git a/packages/@aws-cdk/aws-codecommit/lib/repository.ts b/packages/@aws-cdk/aws-codecommit/lib/repository.ts index edd06f5ac4bef..b9b8df35b3879 100644 --- a/packages/@aws-cdk/aws-codecommit/lib/repository.ts +++ b/packages/@aws-cdk/aws-codecommit/lib/repository.ts @@ -1,5 +1,5 @@ import events = require('@aws-cdk/aws-events'); -import { Construct, IConstruct, IResource, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IConstruct, IResource, Resource, Stack } from '@aws-cdk/core'; import { CfnRepository } from './codecommit.generated'; export interface IRepository extends IResource { diff --git a/packages/@aws-cdk/aws-codecommit/package.json b/packages/@aws-cdk/aws-codecommit/package.json index a574c83357bb9..2565187532af8 100644 --- a/packages/@aws-cdk/aws-codecommit/package.json +++ b/packages/@aws-cdk/aws-codecommit/package.json @@ -79,13 +79,13 @@ "dependencies": { "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-codecommit/test/integ.codecommit-events.ts b/packages/@aws-cdk/aws-codecommit/test/integ.codecommit-events.ts index 184e53534c669..232e5fdeb0d6f 100644 --- a/packages/@aws-cdk/aws-codecommit/test/integ.codecommit-events.ts +++ b/packages/@aws-cdk/aws-codecommit/test/integ.codecommit-events.ts @@ -1,5 +1,5 @@ import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codecommit = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codecommit/test/test.codecommit.ts b/packages/@aws-cdk/aws-codecommit/test/test.codecommit.ts index 5e8e8a846399c..de4203bdfcaf9 100644 --- a/packages/@aws-cdk/aws-codecommit/test/test.codecommit.ts +++ b/packages/@aws-cdk/aws-codecommit/test/test.codecommit.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Repository, RepositoryProps } from '../lib'; diff --git a/packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts b/packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts index a3e388650b7d0..e4c5dacb3199c 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { CfnApplication } from "../codedeploy.generated"; import { arnForApplication } from "../utils"; diff --git a/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-config.ts b/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-config.ts index 218a1c740477b..5dd4146c0b8d1 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-config.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-config.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { arnForDeploymentConfig } from '../utils'; /** diff --git a/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts index 9047df42ada8a..d9387332b5d12 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts @@ -1,7 +1,7 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnDeploymentGroup } from '../codedeploy.generated'; import { AutoRollbackConfig } from '../rollback-config'; diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/application.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/application.ts index 94a4e98a3933f..2ecaa986d3e2a 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/server/application.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/server/application.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { CfnApplication } from '../codedeploy.generated'; import { arnForApplication } from '../utils'; diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts index 9b6e02a617018..3351248eec9dd 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnDeploymentConfig } from '../codedeploy.generated'; import { arnForDeploymentConfig } from '../utils'; diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts index d36f57174895e..3b4386546029f 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts @@ -3,8 +3,8 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); -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 { CfnDeploymentGroup } from '../codedeploy.generated'; import { AutoRollbackConfig } from '../rollback-config'; import { arnForDeploymentGroup, renderAlarmConfiguration, renderAutoRollbackConfiguration } from '../utils'; diff --git a/packages/@aws-cdk/aws-codedeploy/lib/utils.ts b/packages/@aws-cdk/aws-codedeploy/lib/utils.ts index ab720f48ef26b..ed06a4728c968 100644 --- a/packages/@aws-cdk/aws-codedeploy/lib/utils.ts +++ b/packages/@aws-cdk/aws-codedeploy/lib/utils.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import { Aws } from '@aws-cdk/cdk'; +import { Aws } from '@aws-cdk/core'; import { CfnDeploymentGroup } from './codedeploy.generated'; import { AutoRollbackConfig } from './rollback-config'; diff --git a/packages/@aws-cdk/aws-codedeploy/package.json b/packages/@aws-cdk/aws-codedeploy/package.json index 7eddb78888b8f..d96654eae8281 100644 --- a/packages/@aws-cdk/aws-codedeploy/package.json +++ b/packages/@aws-cdk/aws-codedeploy/package.json @@ -81,7 +81,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -92,7 +92,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-codedeploy/test/lambda/integ.deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/test/lambda/integ.deployment-group.ts index 72eb4f69d6cff..408648df5463d 100644 --- a/packages/@aws-cdk/aws-codedeploy/test/lambda/integ.deployment-group.ts +++ b/packages/@aws-cdk/aws-codedeploy/test/lambda/integ.deployment-group.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codedeploy = require('../../lib'); import path = require('path'); diff --git a/packages/@aws-cdk/aws-codedeploy/test/lambda/test.application.ts b/packages/@aws-cdk/aws-codedeploy/test/lambda/test.application.ts index 62f9d80027e2b..6c61469c5eb79 100644 --- a/packages/@aws-cdk/aws-codedeploy/test/lambda/test.application.ts +++ b/packages/@aws-cdk/aws-codedeploy/test/lambda/test.application.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 codedeploy = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codedeploy/test/lambda/test.deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/test/lambda/test.deployment-group.ts index 68146e9376ea5..f175110511ad9 100644 --- a/packages/@aws-cdk/aws-codedeploy/test/lambda/test.deployment-group.ts +++ b/packages/@aws-cdk/aws-codedeploy/test/lambda/test.deployment-group.ts @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike, ResourcePart } from '@aws-cdk/a import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codedeploy = require('../../lib'); import { LambdaDeploymentConfig } from '../../lib'; diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.ts index 4e10fcc064567..52c71cb1a4be4 100644 --- a/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.ts +++ b/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.ts @@ -2,7 +2,7 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); import lb = require('@aws-cdk/aws-elasticloadbalancing'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codedeploy = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-config.ts b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-config.ts index 84bef7cd3a377..7e7472ff58671 100644 --- a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-config.ts +++ b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-config.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 codedeploy = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts index d4f454d8d0b7d..516fe5eec7fce 100644 --- a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts +++ b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts @@ -3,7 +3,7 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); import lbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codedeploy = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts index 7e70ccb423d6f..a949ef46fa1cf 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts @@ -1,5 +1,5 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); -import { SecretValue } from '@aws-cdk/cdk'; +import { SecretValue } from '@aws-cdk/core'; /** * Construction properties of the {@link AlexaSkillDeployAction Alexa deploy Action}. diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts index 9721d5f8dd5ce..0da996dd01245 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts @@ -2,8 +2,8 @@ import cloudformation = require('@aws-cdk/aws-cloudformation'); import { CloudFormationCapabilities } from '@aws-cdk/aws-cloudformation'; import codepipeline = require('@aws-cdk/aws-codepipeline'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); -import { Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Stack } from '@aws-cdk/core'; /** * Properties common to all CloudFormation actions diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts index 7de9abd2922d4..52684af0857cc 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts @@ -1,7 +1,7 @@ import codebuild = require('@aws-cdk/aws-codebuild'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); /** * The type of the CodeBuild action that determines its CodePipeline Category - diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/custom-action-registration.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/custom-action-registration.ts index 0eb6d2ba675e3..e0c5a8c177da5 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/custom-action-registration.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/custom-action-registration.ts @@ -1,5 +1,5 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); /** * The creation attributes used for defining a configuration property diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/github/source-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/github/source-action.ts index 559be30bb842a..208c5330b41e6 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/github/source-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/github/source-action.ts @@ -1,5 +1,5 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); -import { SecretValue } from '@aws-cdk/cdk'; +import { SecretValue } from '@aws-cdk/core'; import { sourceArtifactBounds } from '../common'; /** diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts index 1d14f9361c709..9a575dbf1b5ca 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/jenkins/jenkins-provider.ts @@ -1,5 +1,5 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CustomActionRegistration } from "../custom-action-registration"; /** diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/lambda/invoke-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/lambda/invoke-action.ts index 6c864e329049c..9132e29416986 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/lambda/invoke-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/lambda/invoke-action.ts @@ -1,7 +1,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; /** * Construction properties of the {@link LambdaInvokeAction Lambda invoke CodePipeline Action}. diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts index ea679ac648cfb..daa690f6aa0a0 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts @@ -1,7 +1,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import sns = require('@aws-cdk/aws-sns'); import subs = require('@aws-cdk/aws-sns-subscriptions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); /** * Construction properties of the {@link ManualApprovalAction}. diff --git a/packages/@aws-cdk/aws-codepipeline-actions/package.json b/packages/@aws-cdk/aws-codepipeline-actions/package.json index 41222aef5e93f..70b5fa83a0782 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/package.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/package.json @@ -86,7 +86,7 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sns-subscriptions": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -105,7 +105,7 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sns-subscriptions": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts index 123b773019dc8..574afba1bce43 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts @@ -5,7 +5,7 @@ import { Repository } from '@aws-cdk/aws-codecommit'; import codepipeline = require('@aws-cdk/aws-codepipeline'); import { Role } from '@aws-cdk/aws-iam'; import { PolicyStatement, ServicePrincipal } from '@aws-cdk/aws-iam'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import cpactions = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.pipeline-actions.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.pipeline-actions.ts index a83f47cab910a..57b935c192601 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.pipeline-actions.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.pipeline-actions.ts @@ -1,8 +1,8 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); -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 _ = require('lodash'); import nodeunit = require('nodeunit'); import cpactions = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts index cf61a8096b44d..8049e7a23f58a 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts @@ -2,7 +2,7 @@ import { countResources, expect, haveResourceLike, not } from "@aws-cdk/assert"; import codebuild = require('@aws-cdk/aws-codebuild'); import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); -import { Stack } from "@aws-cdk/cdk"; +import { Stack } from "@aws-cdk/core"; import { Test } from 'nodeunit'; import cpactions = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/ecs/test.ecs-deploy-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/ecs/test.ecs-deploy-action.ts index 11da9af0ca943..9b163ab4b282f 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/ecs/test.ecs-deploy-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/ecs/test.ecs-deploy-action.ts @@ -1,7 +1,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import cpactions = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts index f50219c197c53..da6ea1383c823 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts @@ -1,6 +1,6 @@ import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts index 901d563dc88fb..32dd9a5c2a5bc 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts @@ -3,7 +3,7 @@ import codebuild = require('@aws-cdk/aws-codebuild'); import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import codepipeline_actions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts index a84483bc3e3e7..982a550c42652 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts @@ -2,7 +2,7 @@ import cloudtrail = require('@aws-cdk/aws-cloudtrail'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts index c8c54d0191cbc..3e5ace0beac6f 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts @@ -1,6 +1,6 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import { App, RemovalPolicy, SecretValue, Stack } from '@aws-cdk/cdk'; +import { App, RemovalPolicy, SecretValue, Stack } from '@aws-cdk/core'; import cpactions = require('../lib'); const app = new App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.ts index ef81b1faeaa6b..ea9c63b7a9010 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.ts @@ -1,6 +1,6 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-wtih-action-role.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-wtih-action-role.ts index a1036a3c5895d..fd5a458adcbaa 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-wtih-action-role.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn-wtih-action-role.ts @@ -1,7 +1,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.ts index 3f1c2fe5ad070..21ac1836f1213 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.ts @@ -2,7 +2,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import { Role } from '@aws-cdk/aws-iam'; import { ServicePrincipal } from '@aws-cdk/aws-iam'; import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.ts index 3c6e6441ecd86..9d2d79f458d37 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.ts @@ -2,7 +2,7 @@ import codebuild = require('@aws-cdk/aws-codebuild'); import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts index 29ec7eeeee737..fc1e812e4a976 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts @@ -1,7 +1,7 @@ import codebuild = require('@aws-cdk/aws-codebuild'); import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts index 37caee0fe9f3f..7886236b4f353 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts @@ -1,6 +1,6 @@ import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.ts index dfd74bc35784d..080d36b79711e 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-deploy.ts @@ -1,7 +1,7 @@ import codedeploy = require('@aws-cdk/aws-codedeploy'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts index a0cbf55476214..976fa2eedf714 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts @@ -1,7 +1,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import ecr = require('@aws-cdk/aws-ecr'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.ts index 6c4d76223861d..baccc1f73dbbd 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.ts @@ -4,7 +4,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecr = require('@aws-cdk/aws-ecr'); import ecs = require('@aws-cdk/aws-ecs'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); // tslint:disable:object-literal-key-quotes diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.ts index dd6b0ff5b860d..fe5ebfae9a93f 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.ts @@ -6,7 +6,7 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import events = require('@aws-cdk/aws-events'); import targets = require('@aws-cdk/aws-events-targets'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.ts index 4d2379130545b..b75e69cc5ca9c 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-jenkins.ts @@ -1,6 +1,6 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.ts index ec9824d7eb08f..a867911118d9c 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.ts @@ -1,6 +1,6 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts index 9f01ee3374d98..5a460421058a0 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts @@ -1,6 +1,6 @@ import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cpactions = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/test.lambda-invoke-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/test.lambda-invoke-action.ts index 9b262faf21554..737df4a578e10 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/test.lambda-invoke-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/test.lambda-invoke-action.ts @@ -1,7 +1,7 @@ import { expect, haveResourceLike } from "@aws-cdk/assert"; import codepipeline = require('@aws-cdk/aws-codepipeline'); import lambda = require('@aws-cdk/aws-lambda'); -import { Aws, Lazy, SecretValue, Stack, Token } from "@aws-cdk/cdk"; +import { Aws, Lazy, SecretValue, Stack, Token } from "@aws-cdk/core"; import { Test } from 'nodeunit'; import cpactions = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/s3/test.s3-source-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/s3/test.s3-source-action.ts index 84a024f12a997..54087a7cffbed 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/s3/test.s3-source-action.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/s3/test.s3-source-action.ts @@ -2,7 +2,7 @@ import { countResources, expect, haveResourceLike, not } from "@aws-cdk/assert"; import codebuild = require('@aws-cdk/aws-codebuild'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import s3 = require('@aws-cdk/aws-s3'); -import { Stack } from "@aws-cdk/cdk"; +import { Stack } from "@aws-cdk/core"; import { Test } from 'nodeunit'; import cpactions = require('../../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts index 090e5d0990434..7a37e4eef7791 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts @@ -7,7 +7,7 @@ import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import { App, Aws, CfnParameter, ConstructNode, SecretValue, Stack } from '@aws-cdk/cdk'; +import { App, Aws, CfnParameter, ConstructNode, SecretValue, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import cpactions = require('../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline/lib/action.ts b/packages/@aws-cdk/aws-codepipeline/lib/action.ts index d69e347061882..9a0b3dbcc6f57 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/action.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/action.ts @@ -1,6 +1,6 @@ import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); -import { Construct, IResource } from '@aws-cdk/cdk'; +import { Construct, IResource } from '@aws-cdk/core'; import { Artifact } from './artifact'; import validation = require('./validation'); diff --git a/packages/@aws-cdk/aws-codepipeline/lib/artifact.ts b/packages/@aws-cdk/aws-codepipeline/lib/artifact.ts index 917cb979b8d66..e16dd09899977 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/artifact.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/artifact.ts @@ -1,5 +1,5 @@ import s3 = require("@aws-cdk/aws-s3"); -import { Lazy, Token } from "@aws-cdk/cdk"; +import { Lazy, Token } from "@aws-cdk/core"; import validation = require('./validation'); /** diff --git a/packages/@aws-cdk/aws-codepipeline/lib/cross-region-support-stack.ts b/packages/@aws-cdk/aws-codepipeline/lib/cross-region-support-stack.ts index ee0fd8cdb1383..33b6003433631 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/cross-region-support-stack.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/cross-region-support-stack.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import crypto = require('crypto'); /** diff --git a/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts b/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts index 04bd0cc3baf0a..e274dc84df550 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts @@ -2,7 +2,7 @@ import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import s3 = require('@aws-cdk/aws-s3'); -import { App, Construct, Lazy, PhysicalName, RemovalPolicy, Resource, Stack, Token } from '@aws-cdk/cdk'; +import { App, Construct, Lazy, PhysicalName, RemovalPolicy, Resource, Stack, Token } from '@aws-cdk/core'; import { Action, IPipeline, IStage } from "./action"; import { CfnPipeline } from './codepipeline.generated'; import { CrossRegionSupportStack } from './cross-region-support-stack'; diff --git a/packages/@aws-cdk/aws-codepipeline/lib/stage.ts b/packages/@aws-cdk/aws-codepipeline/lib/stage.ts index 24c7956067c74..0e3ef20eaa507 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/stage.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/stage.ts @@ -1,5 +1,5 @@ import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Action, IPipeline, IStage } from "./action"; import { Artifact } from "./artifact"; import { CfnPipeline } from './codepipeline.generated'; diff --git a/packages/@aws-cdk/aws-codepipeline/lib/validation.ts b/packages/@aws-cdk/aws-codepipeline/lib/validation.ts index 29f7fd785c13a..ec1bb1ec29192 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/validation.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/validation.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ActionCategory } from "./action"; import { Artifact } from "./artifact"; diff --git a/packages/@aws-cdk/aws-codepipeline/package.json b/packages/@aws-cdk/aws-codepipeline/package.json index 526c139226170..882df5b1f4a5b 100644 --- a/packages/@aws-cdk/aws-codepipeline/package.json +++ b/packages/@aws-cdk/aws-codepipeline/package.json @@ -81,7 +81,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -89,7 +89,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.action.ts b/packages/@aws-cdk/aws-codepipeline/test/test.action.ts index 42e0d893e58f5..4eebfcf135b8d 100644 --- a/packages/@aws-cdk/aws-codepipeline/test/test.action.ts +++ b/packages/@aws-cdk/aws-codepipeline/test/test.action.ts @@ -1,5 +1,5 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codepipeline = require('../lib'); import validations = require('../lib/validation'); diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.artifacts.ts b/packages/@aws-cdk/aws-codepipeline/test/test.artifacts.ts index 8701435352d78..affb4c65e93c8 100644 --- a/packages/@aws-cdk/aws-codepipeline/test/test.artifacts.ts +++ b/packages/@aws-cdk/aws-codepipeline/test/test.artifacts.ts @@ -1,6 +1,6 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; -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 { Test } from 'nodeunit'; import codepipeline = require('../lib'); import { FakeBuildAction } from './fake-build-action'; diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.general-validation.ts b/packages/@aws-cdk/aws-codepipeline/test/test.general-validation.ts index 637045f471244..2667b09e727bf 100644 --- a/packages/@aws-cdk/aws-codepipeline/test/test.general-validation.ts +++ b/packages/@aws-cdk/aws-codepipeline/test/test.general-validation.ts @@ -1,5 +1,5 @@ -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 { Test } from 'nodeunit'; import { IStage } from '../lib/action'; import { Artifact } from '../lib/artifact'; diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts b/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts index 9e2b2d0404918..ceb3b625f3247 100644 --- a/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts @@ -1,6 +1,6 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codepipeline = require('../lib'); diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.stages.ts b/packages/@aws-cdk/aws-codepipeline/test/test.stages.ts index f3b86a122d84f..09c3c4e36e0ed 100644 --- a/packages/@aws-cdk/aws-codepipeline/test/test.stages.ts +++ b/packages/@aws-cdk/aws-codepipeline/test/test.stages.ts @@ -1,5 +1,5 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import codepipeline = require('../lib'); diff --git a/packages/@aws-cdk/aws-cognito/lib/user-pool-client.ts b/packages/@aws-cdk/aws-cognito/lib/user-pool-client.ts index c9bea7df2d341..3c8ba65605148 100644 --- a/packages/@aws-cdk/aws-cognito/lib/user-pool-client.ts +++ b/packages/@aws-cdk/aws-cognito/lib/user-pool-client.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { CfnUserPoolClient } from './cognito.generated'; import { IUserPool } from './user-pool'; diff --git a/packages/@aws-cdk/aws-cognito/lib/user-pool.ts b/packages/@aws-cdk/aws-cognito/lib/user-pool.ts index 93dec30cdbb7b..44e2db5ada8c7 100644 --- a/packages/@aws-cdk/aws-cognito/lib/user-pool.ts +++ b/packages/@aws-cdk/aws-cognito/lib/user-pool.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { CfnUserPool } from './cognito.generated'; /** diff --git a/packages/@aws-cdk/aws-cognito/package.json b/packages/@aws-cdk/aws-cognito/package.json index baab13d1eb229..52fef4b0f813d 100644 --- a/packages/@aws-cdk/aws-cognito/package.json +++ b/packages/@aws-cdk/aws-cognito/package.json @@ -71,13 +71,13 @@ "dependencies": { "@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://github.com/awslabs/aws-cdk", "peerDependencies": { "@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" diff --git a/packages/@aws-cdk/aws-cognito/test/test.user-pool-client.ts b/packages/@aws-cdk/aws-cognito/test/test.user-pool-client.ts index 6f7fbb5c809ce..c28355b02cc0d 100644 --- a/packages/@aws-cdk/aws-cognito/test/test.user-pool-client.ts +++ b/packages/@aws-cdk/aws-cognito/test/test.user-pool-client.ts @@ -1,5 +1,5 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import cognito = require('../lib'); diff --git a/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts b/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts index 52cacc481c4c4..e009fabb58dc2 100644 --- a/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts +++ b/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts @@ -1,6 +1,6 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import cognito = require('../lib'); diff --git a/packages/@aws-cdk/aws-config/lib/managed-rules.ts b/packages/@aws-cdk/aws-config/lib/managed-rules.ts index 343fdb9553162..474ae8d6aaec9 100644 --- a/packages/@aws-cdk/aws-config/lib/managed-rules.ts +++ b/packages/@aws-cdk/aws-config/lib/managed-rules.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import sns = require('@aws-cdk/aws-sns'); -import { Construct, Duration, Lazy, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, Lazy, Stack } from '@aws-cdk/core'; import { ManagedRule, RuleProps } from './rule'; /** diff --git a/packages/@aws-cdk/aws-config/lib/rule.ts b/packages/@aws-cdk/aws-config/lib/rule.ts index 22f79f00337b2..b6ee767383551 100644 --- a/packages/@aws-cdk/aws-config/lib/rule.ts +++ b/packages/@aws-cdk/aws-config/lib/rule.ts @@ -1,7 +1,7 @@ import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { CfnConfigRule } from './config.generated'; /** diff --git a/packages/@aws-cdk/aws-config/package.json b/packages/@aws-cdk/aws-config/package.json index b17d8f5d23335..5a7f766b002bb 100644 --- a/packages/@aws-cdk/aws-config/package.json +++ b/packages/@aws-cdk/aws-config/package.json @@ -75,7 +75,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -83,7 +83,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-config/test/integ.rule.lit.ts b/packages/@aws-cdk/aws-config/test/integ.rule.lit.ts index 6077487022d3b..4332f24458dca 100644 --- a/packages/@aws-cdk/aws-config/test/integ.rule.lit.ts +++ b/packages/@aws-cdk/aws-config/test/integ.rule.lit.ts @@ -1,7 +1,7 @@ import targets = require('@aws-cdk/aws-events-targets'); import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import config = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-config/test/test.managed-rules.ts b/packages/@aws-cdk/aws-config/test/test.managed-rules.ts index 6ff4ce2c02ee2..a589670c2f261 100644 --- a/packages/@aws-cdk/aws-config/test/test.managed-rules.ts +++ b/packages/@aws-cdk/aws-config/test/test.managed-rules.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import config = require('../lib'); diff --git a/packages/@aws-cdk/aws-config/test/test.rule.ts b/packages/@aws-cdk/aws-config/test/test.rule.ts index 6b9f8a7eee551..d904b9542d732 100644 --- a/packages/@aws-cdk/aws-config/test/test.rule.ts +++ b/packages/@aws-cdk/aws-config/test/test.rule.ts @@ -1,7 +1,7 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import targets = require('@aws-cdk/aws-events-targets'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import config = require('../lib'); diff --git a/packages/@aws-cdk/aws-datapipeline/package.json b/packages/@aws-cdk/aws-datapipeline/package.json index 4047c6e891e8f..1f56838772112 100644 --- a/packages/@aws-cdk/aws-datapipeline/package.json +++ b/packages/@aws-cdk/aws-datapipeline/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-dax/package.json b/packages/@aws-cdk/aws-dax/package.json index b49c9aa29c2e6..724ecfe514f8c 100644 --- a/packages/@aws-cdk/aws-dax/package.json +++ b/packages/@aws-cdk/aws-dax/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-directoryservice/package.json b/packages/@aws-cdk/aws-directoryservice/package.json index dbd70e0ce5d04..88e620d42aa73 100644 --- a/packages/@aws-cdk/aws-directoryservice/package.json +++ b/packages/@aws-cdk/aws-directoryservice/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-dlm/package.json b/packages/@aws-cdk/aws-dlm/package.json index 941c57b01caf3..ef386f28c596e 100644 --- a/packages/@aws-cdk/aws-dlm/package.json +++ b/packages/@aws-cdk/aws-dlm/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" diff --git a/packages/@aws-cdk/aws-dms/package.json b/packages/@aws-cdk/aws-dms/package.json index ec314d1153096..2c367f7f120ed 100644 --- a/packages/@aws-cdk/aws-dms/package.json +++ b/packages/@aws-cdk/aws-dms/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-docdb/package.json b/packages/@aws-cdk/aws-docdb/package.json index 751baba38f1b8..6cfc8e6562765 100644 --- a/packages/@aws-cdk/aws-docdb/package.json +++ b/packages/@aws-cdk/aws-docdb/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" diff --git a/packages/@aws-cdk/aws-dynamodb-global/README.md b/packages/@aws-cdk/aws-dynamodb-global/README.md index f9455962c86a0..55b30c27c5919 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/README.md +++ b/packages/@aws-cdk/aws-dynamodb-global/README.md @@ -22,7 +22,7 @@ Here is a minimal deployable Global DynamoDB tables definition: ```typescript import { AttributeType } from '@aws-cdk/aws-dynamodb'; import { GlobalTable } from '@aws-cdk/aws-dynamodb-global'; -import { App } from '@aws-cdk/cdk'; +import { App } from '@aws-cdk/core'; const app = new App(); new GlobalTable(app, 'globdynamodb', { diff --git a/packages/@aws-cdk/aws-dynamodb-global/lib/aws-dynamodb-global.ts b/packages/@aws-cdk/aws-dynamodb-global/lib/aws-dynamodb-global.ts index 340e10b129467..4371a7625838a 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/lib/aws-dynamodb-global.ts +++ b/packages/@aws-cdk/aws-dynamodb-global/lib/aws-dynamodb-global.ts @@ -1,5 +1,5 @@ import dynamodb = require("@aws-cdk/aws-dynamodb"); -import cdk = require("@aws-cdk/cdk"); +import cdk = require("@aws-cdk/core"); import { GlobalTableCoordinator } from "./global-table-coordinator"; /** diff --git a/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts b/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts index fb5f681868f1b..b3ea3abe223a9 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts +++ b/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts @@ -1,7 +1,7 @@ import cfn = require("@aws-cdk/aws-cloudformation"); import iam = require("@aws-cdk/aws-iam"); import lambda = require("@aws-cdk/aws-lambda"); -import cdk = require("@aws-cdk/cdk"); +import cdk = require("@aws-cdk/core"); import path = require("path"); import { GlobalTableProps } from "./aws-dynamodb-global"; diff --git a/packages/@aws-cdk/aws-dynamodb-global/package.json b/packages/@aws-cdk/aws-dynamodb-global/package.json index ff7bcce230330..d332e3e1766d5 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/package.json +++ b/packages/@aws-cdk/aws-dynamodb-global/package.json @@ -48,7 +48,7 @@ "@aws-cdk/aws-dynamodb": "^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" }, "devDependencies": { "@aws-cdk/assert": "^0.35.0", @@ -62,7 +62,7 @@ "@aws-cdk/aws-dynamodb": "^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" }, "scripts": { "build": "cdk-build", diff --git a/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.ts b/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.ts index e2e8681b8cc0d..3cf7f886844c5 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.ts +++ b/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.ts @@ -1,6 +1,6 @@ /// !cdk-integ * import { AttributeType } from '@aws-cdk/aws-dynamodb'; -import { App } from '@aws-cdk/cdk'; +import { App } from '@aws-cdk/core'; import { GlobalTable } from '../lib'; const app = new App(); diff --git a/packages/@aws-cdk/aws-dynamodb-global/test/test.dynamodb.global.ts b/packages/@aws-cdk/aws-dynamodb-global/test/test.dynamodb.global.ts index 194aaa2ecad99..25d162673a7c6 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/test/test.dynamodb.global.ts +++ b/packages/@aws-cdk/aws-dynamodb-global/test/test.dynamodb.global.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import { Attribute, AttributeType, StreamViewType } from '@aws-cdk/aws-dynamodb'; import { Table } from '@aws-cdk/aws-dynamodb'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import * as assert from 'assert'; import { Test } from 'nodeunit'; import { diff --git a/packages/@aws-cdk/aws-dynamodb/lib/table.ts b/packages/@aws-cdk/aws-dynamodb/lib/table.ts index ef811219280fe..4881675e3dfc6 100644 --- a/packages/@aws-cdk/aws-dynamodb/lib/table.ts +++ b/packages/@aws-cdk/aws-dynamodb/lib/table.ts @@ -1,6 +1,6 @@ import appscaling = require('@aws-cdk/aws-applicationautoscaling'); import iam = require('@aws-cdk/aws-iam'); -import { Aws, Construct, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Aws, Construct, Lazy, Resource, Stack } from '@aws-cdk/core'; import { CfnTable } from './dynamodb.generated'; import { EnableScalingProps, IScalableTableAttribute } from './scalable-attribute-api'; import { ScalableTableAttribute } from './scalable-table-attribute'; diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json index 8260721b4b5db..780f28fa28f77 100644 --- a/packages/@aws-cdk/aws-dynamodb/package.json +++ b/packages/@aws-cdk/aws-dynamodb/package.json @@ -72,13 +72,13 @@ "dependencies": { "@aws-cdk/aws-applicationautoscaling": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-applicationautoscaling": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-dynamodb/test/integ.autoscaling.lit.ts b/packages/@aws-cdk/aws-dynamodb/test/integ.autoscaling.lit.ts index 98b6a7fc8d3f6..5527c906c6c15 100644 --- a/packages/@aws-cdk/aws-dynamodb/test/integ.autoscaling.lit.ts +++ b/packages/@aws-cdk/aws-dynamodb/test/integ.autoscaling.lit.ts @@ -1,5 +1,5 @@ import appscaling = require('@aws-cdk/aws-applicationautoscaling'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import dynamodb = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ondemand.ts b/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ondemand.ts index 4ff942c7de643..2ceea0aed5c38 100644 --- a/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ondemand.ts +++ b/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ondemand.ts @@ -1,4 +1,4 @@ -import { App, Stack, Tag } from '@aws-cdk/cdk'; +import { App, Stack, Tag } from '@aws-cdk/core'; import { Attribute, AttributeType, BillingMode, ProjectionType, StreamViewType, Table } from '../lib'; // CDK parameters diff --git a/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ts b/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ts index 2281996c14871..581557af10fdb 100644 --- a/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ts +++ b/packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { App, Stack, Tag } from '@aws-cdk/cdk'; +import { App, Stack, Tag } from '@aws-cdk/core'; import { Attribute, AttributeType, ProjectionType, StreamViewType, Table } from '../lib'; // CDK parameters diff --git a/packages/@aws-cdk/aws-dynamodb/test/test.dynamodb.ts b/packages/@aws-cdk/aws-dynamodb/test/test.dynamodb.ts index 6b9e69b70f40a..ece8ad53da7c5 100644 --- a/packages/@aws-cdk/aws-dynamodb/test/test.dynamodb.ts +++ b/packages/@aws-cdk/aws-dynamodb/test/test.dynamodb.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import appscaling = require('@aws-cdk/aws-applicationautoscaling'); import iam = require('@aws-cdk/aws-iam'); -import { ConstructNode, Stack, Tag } from '@aws-cdk/cdk'; +import { ConstructNode, Stack, Tag } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Attribute, diff --git a/packages/@aws-cdk/aws-ec2/lib/machine-image.ts b/packages/@aws-cdk/aws-ec2/lib/machine-image.ts index f74ebbf37091f..cadefe074d55d 100644 --- a/packages/@aws-cdk/aws-ec2/lib/machine-image.ts +++ b/packages/@aws-cdk/aws-ec2/lib/machine-image.ts @@ -1,5 +1,5 @@ import ssm = require('@aws-cdk/aws-ssm'); -import { Construct, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, Stack, Token } from '@aws-cdk/core'; import { UserData } from './user-data'; import { WindowsVersion } from './windows-versions'; diff --git a/packages/@aws-cdk/aws-ec2/lib/port.ts b/packages/@aws-cdk/aws-ec2/lib/port.ts index cd8985c4660b0..f8117687db146 100644 --- a/packages/@aws-cdk/aws-ec2/lib/port.ts +++ b/packages/@aws-cdk/aws-ec2/lib/port.ts @@ -1,4 +1,4 @@ -import { Token } from '@aws-cdk/cdk'; +import { Token } from '@aws-cdk/core'; /** * Protocol for use in Connection Rules diff --git a/packages/@aws-cdk/aws-ec2/lib/security-group.ts b/packages/@aws-cdk/aws-ec2/lib/security-group.ts index 23a05c8abe0da..b75e0af1db057 100644 --- a/packages/@aws-cdk/aws-ec2/lib/security-group.ts +++ b/packages/@aws-cdk/aws-ec2/lib/security-group.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Lazy, Resource, ResourceProps, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource, ResourceProps, Stack } from '@aws-cdk/core'; import { Connections } from './connections'; import { CfnSecurityGroup, CfnSecurityGroupEgress, CfnSecurityGroupIngress } from './ec2.generated'; import { IPeer } from './peer'; diff --git a/packages/@aws-cdk/aws-ec2/lib/util.ts b/packages/@aws-cdk/aws-ec2/lib/util.ts index 6dc48af4350d5..9c71ed3ee7669 100644 --- a/packages/@aws-cdk/aws-ec2/lib/util.ts +++ b/packages/@aws-cdk/aws-ec2/lib/util.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ISubnet, SelectedSubnets, Subnet, SubnetType } from './vpc'; /** diff --git a/packages/@aws-cdk/aws-ec2/lib/vpc-endpoint.ts b/packages/@aws-cdk/aws-ec2/lib/vpc-endpoint.ts index 05d28d1825a6c..aa950c344dc28 100644 --- a/packages/@aws-cdk/aws-ec2/lib/vpc-endpoint.ts +++ b/packages/@aws-cdk/aws-ec2/lib/vpc-endpoint.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Aws, Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Aws, Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { Connections, IConnectable } from './connections'; import { CfnVPCEndpoint } from './ec2.generated'; import { Port } from './port'; diff --git a/packages/@aws-cdk/aws-ec2/lib/vpc.ts b/packages/@aws-cdk/aws-ec2/lib/vpc.ts index aa5082a4826da..73e4c8b2c5615 100644 --- a/packages/@aws-cdk/aws-ec2/lib/vpc.ts +++ b/packages/@aws-cdk/aws-ec2/lib/vpc.ts @@ -1,5 +1,5 @@ import { ConcreteDependable, Construct, ContextProvider, DependableTrait, IConstruct, - IDependable, IResource, Resource, Stack, Tag } from '@aws-cdk/cdk'; + IDependable, IResource, Resource, Stack, Tag } from '@aws-cdk/core'; import cxapi = require('@aws-cdk/cx-api'); import { CfnEIP, CfnInternetGateway, CfnNatGateway, CfnRoute, CfnVPNGateway, CfnVPNGatewayRoutePropagation } from './ec2.generated'; import { CfnRouteTable, CfnSubnet, CfnSubnetRouteTableAssociation, CfnVPC, CfnVPCGatewayAttachment } from './ec2.generated'; diff --git a/packages/@aws-cdk/aws-ec2/lib/vpn.ts b/packages/@aws-cdk/aws-ec2/lib/vpn.ts index 3517ad371308a..c76fd2943b487 100644 --- a/packages/@aws-cdk/aws-ec2/lib/vpn.ts +++ b/packages/@aws-cdk/aws-ec2/lib/vpn.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import net = require('net'); import { CfnCustomerGateway, CfnVPNConnection, CfnVPNConnectionRoute } from './ec2.generated'; import { IVpc } from './vpc'; diff --git a/packages/@aws-cdk/aws-ec2/package.json b/packages/@aws-cdk/aws-ec2/package.json index 1208c53761a40..7e4a54ceb9a05 100644 --- a/packages/@aws-cdk/aws-ec2/package.json +++ b/packages/@aws-cdk/aws-ec2/package.json @@ -73,7 +73,7 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-ssm": "^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" }, "homepage": "https://github.com/awslabs/aws-cdk", @@ -81,7 +81,7 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-ssm": "^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": { diff --git a/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.lit.ts b/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.lit.ts index c47ea57c8b839..dca84b2691f17 100644 --- a/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.lit.ts +++ b/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.lit.ts @@ -1,5 +1,5 @@ /// !cdk-integ * -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ec2 = require("../lib"); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ec2/test/integ.share-vpcs.lit.ts b/packages/@aws-cdk/aws-ec2/test/integ.share-vpcs.lit.ts index 8931bdb19e874..9603a67c001f3 100644 --- a/packages/@aws-cdk/aws-ec2/test/integ.share-vpcs.lit.ts +++ b/packages/@aws-cdk/aws-ec2/test/integ.share-vpcs.lit.ts @@ -1,5 +1,5 @@ /// !cdk-integ * -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ec2 = require("../lib"); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ec2/test/integ.vpc-endpoint.lit.ts b/packages/@aws-cdk/aws-ec2/test/integ.vpc-endpoint.lit.ts index 71041a79c6d0e..a35d5276b3acd 100644 --- a/packages/@aws-cdk/aws-ec2/test/integ.vpc-endpoint.lit.ts +++ b/packages/@aws-cdk/aws-ec2/test/integ.vpc-endpoint.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ec2 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ec2/test/integ.vpc.ts b/packages/@aws-cdk/aws-ec2/test/integ.vpc.ts index 61eee83200066..efed6dd81f14f 100644 --- a/packages/@aws-cdk/aws-ec2/test/integ.vpc.ts +++ b/packages/@aws-cdk/aws-ec2/test/integ.vpc.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ec2 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ec2/test/integ.vpn.ts b/packages/@aws-cdk/aws-ec2/test/integ.vpn.ts index 88b750521fd28..bdba8b04393c8 100644 --- a/packages/@aws-cdk/aws-ec2/test/integ.vpn.ts +++ b/packages/@aws-cdk/aws-ec2/test/integ.vpn.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ec2 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ec2/test/test.connections.ts b/packages/@aws-cdk/aws-ec2/test/test.connections.ts index e44aee248ad7c..acc400c463ab3 100644 --- a/packages/@aws-cdk/aws-ec2/test/test.connections.ts +++ b/packages/@aws-cdk/aws-ec2/test/test.connections.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { App, ConstructNode, Stack } from '@aws-cdk/cdk'; +import { App, ConstructNode, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { diff --git a/packages/@aws-cdk/aws-ec2/test/test.l1.ts b/packages/@aws-cdk/aws-ec2/test/test.l1.ts index ca90171b20fbe..ffe0ef04fc42a 100644 --- a/packages/@aws-cdk/aws-ec2/test/test.l1.ts +++ b/packages/@aws-cdk/aws-ec2/test/test.l1.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ec2 = require('../lib'); diff --git a/packages/@aws-cdk/aws-ec2/test/test.security-group.ts b/packages/@aws-cdk/aws-ec2/test/test.security-group.ts index 50cf725e5ada2..6ba3eca6e593d 100644 --- a/packages/@aws-cdk/aws-ec2/test/test.security-group.ts +++ b/packages/@aws-cdk/aws-ec2/test/test.security-group.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Lazy, Stack } from '@aws-cdk/cdk'; +import { Lazy, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Peer, Port, SecurityGroup, Vpc } from "../lib"; diff --git a/packages/@aws-cdk/aws-ec2/test/test.vpc-endpoint.ts b/packages/@aws-cdk/aws-ec2/test/test.vpc-endpoint.ts index 2187987045462..2f612324b883f 100644 --- a/packages/@aws-cdk/aws-ec2/test/test.vpc-endpoint.ts +++ b/packages/@aws-cdk/aws-ec2/test/test.vpc-endpoint.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import { AnyPrincipal, PolicyStatement } from '@aws-cdk/aws-iam'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; // tslint:disable-next-line:max-line-length import { GatewayVpcEndpoint, GatewayVpcEndpointAwsService, InterfaceVpcEndpoint, InterfaceVpcEndpointAwsService, SubnetType, Vpc } from '../lib'; diff --git a/packages/@aws-cdk/aws-ec2/test/test.vpc.ts b/packages/@aws-cdk/aws-ec2/test/test.vpc.ts index dcc26d107a3e5..331edf2d9f709 100644 --- a/packages/@aws-cdk/aws-ec2/test/test.vpc.ts +++ b/packages/@aws-cdk/aws-ec2/test/test.vpc.ts @@ -1,5 +1,5 @@ import { countResources, expect, haveResource, haveResourceLike, isSuperObject } from '@aws-cdk/assert'; -import { Stack, Tag } from '@aws-cdk/cdk'; +import { Stack, Tag } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { CfnVPC, DefaultInstanceTenancy, SubnetType, Vpc } from '../lib'; diff --git a/packages/@aws-cdk/aws-ec2/test/test.vpn.ts b/packages/@aws-cdk/aws-ec2/test/test.vpn.ts index 5e805f6d04c37..81845f7a51387 100644 --- a/packages/@aws-cdk/aws-ec2/test/test.vpn.ts +++ b/packages/@aws-cdk/aws-ec2/test/test.vpn.ts @@ -1,5 +1,5 @@ import { expect, haveResource, } from '@aws-cdk/assert'; -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Vpc, VpnConnection } from '../lib'; diff --git a/packages/@aws-cdk/aws-ecr-assets/lib/adopted-repository.ts b/packages/@aws-cdk/aws-ecr-assets/lib/adopted-repository.ts index 13e417d40d703..7a6eca11513a5 100644 --- a/packages/@aws-cdk/aws-ecr-assets/lib/adopted-repository.ts +++ b/packages/@aws-cdk/aws-ecr-assets/lib/adopted-repository.ts @@ -2,7 +2,7 @@ import cfn = require('@aws-cdk/aws-cloudformation'); import ecr = require('@aws-cdk/aws-ecr'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); interface AdoptedRepositoryProps { diff --git a/packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts b/packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts index 770ee2238657d..1e888bc14f492 100644 --- a/packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts +++ b/packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts @@ -1,6 +1,6 @@ import assets = require('@aws-cdk/assets'); import ecr = require('@aws-cdk/aws-ecr'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cxapi = require('@aws-cdk/cx-api'); import fs = require('fs'); import path = require('path'); diff --git a/packages/@aws-cdk/aws-ecr-assets/package.json b/packages/@aws-cdk/aws-ecr-assets/package.json index d9d53229f44b9..2c340a31c11e6 100644 --- a/packages/@aws-cdk/aws-ecr-assets/package.json +++ b/packages/@aws-cdk/aws-ecr-assets/package.json @@ -72,7 +72,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", @@ -83,7 +83,7 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "nyc": { diff --git a/packages/@aws-cdk/aws-ecr-assets/test/integ.assets-docker.ts b/packages/@aws-cdk/aws-ecr-assets/test/integ.assets-docker.ts index 667d4c3bedcd6..31e95c8515c35 100644 --- a/packages/@aws-cdk/aws-ecr-assets/test/integ.assets-docker.ts +++ b/packages/@aws-cdk/aws-ecr-assets/test/integ.assets-docker.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import assets = require('../lib'); diff --git a/packages/@aws-cdk/aws-ecr-assets/test/test.image-asset.ts b/packages/@aws-cdk/aws-ecr-assets/test/test.image-asset.ts index b6b4a2ec0a15a..9ab3ea69c5650 100644 --- a/packages/@aws-cdk/aws-ecr-assets/test/test.image-asset.ts +++ b/packages/@aws-cdk/aws-ecr-assets/test/test.image-asset.ts @@ -1,6 +1,6 @@ import { expect, haveResource, SynthUtils } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import fs = require('fs'); import { Test } from 'nodeunit'; import path = require('path'); diff --git a/packages/@aws-cdk/aws-ecr/lib/lifecycle.ts b/packages/@aws-cdk/aws-ecr/lib/lifecycle.ts index 63468e4f1ae69..e8ab7103f5d5f 100644 --- a/packages/@aws-cdk/aws-ecr/lib/lifecycle.ts +++ b/packages/@aws-cdk/aws-ecr/lib/lifecycle.ts @@ -1,4 +1,4 @@ -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; /** * An ECR life cycle rule diff --git a/packages/@aws-cdk/aws-ecr/lib/repository.ts b/packages/@aws-cdk/aws-ecr/lib/repository.ts index 52217a20d16d1..0f592040b69f9 100644 --- a/packages/@aws-cdk/aws-ecr/lib/repository.ts +++ b/packages/@aws-cdk/aws-ecr/lib/repository.ts @@ -1,6 +1,6 @@ import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); -import { Construct, IConstruct, IResource, Lazy, RemovalPolicy, Resource, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, IConstruct, IResource, Lazy, RemovalPolicy, Resource, Stack, Token } from '@aws-cdk/core'; import { CfnRepository } from './ecr.generated'; import { CountType, LifecycleRule, TagStatus } from './lifecycle'; diff --git a/packages/@aws-cdk/aws-ecr/package.json b/packages/@aws-cdk/aws-ecr/package.json index 5f8b8a86e9e5e..2e82365ac6b2d 100644 --- a/packages/@aws-cdk/aws-ecr/package.json +++ b/packages/@aws-cdk/aws-ecr/package.json @@ -76,13 +76,13 @@ "dependencies": { "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-ecr/test/integ.basic.ts b/packages/@aws-cdk/aws-ecr/test/integ.basic.ts index d913cb77d323e..7c627c281825b 100644 --- a/packages/@aws-cdk/aws-ecr/test/integ.basic.ts +++ b/packages/@aws-cdk/aws-ecr/test/integ.basic.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecr = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ecr/test/test.repository.ts b/packages/@aws-cdk/aws-ecr/test/test.repository.ts index 6b9f33f12d54e..cfb712013853b 100644 --- a/packages/@aws-cdk/aws-ecr/test/test.repository.ts +++ b/packages/@aws-cdk/aws-ecr/test/test.repository.ts @@ -1,7 +1,7 @@ import { expect, haveResource, haveResourceLike, ResourcePart } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); -import { RemovalPolicy } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { RemovalPolicy } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import ecr = require('../lib'); diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/base/load-balanced-service-base.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/base/load-balanced-service-base.ts index 58419cdbc1b86..c5914c92c421e 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/base/load-balanced-service-base.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/base/load-balanced-service-base.ts @@ -3,7 +3,7 @@ import ecs = require('@aws-cdk/aws-ecs'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); import { AddressRecordTarget, ARecord, IHostedZone } from '@aws-cdk/aws-route53'; import route53targets = require('@aws-cdk/aws-route53-targets'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export enum LoadBalancerType { APPLICATION, diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/base/queue-processing-service-base.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/base/queue-processing-service-base.ts index 08b24683ec3ae..adf2bfdb695c4 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/base/queue-processing-service-base.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/base/queue-processing-service-base.ts @@ -1,7 +1,7 @@ import autoscaling = require('@aws-cdk/aws-applicationautoscaling'); import ecs = require('@aws-cdk/aws-ecs'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); /** * Properties to define a queue processing service diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/load-balanced-ecs-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/load-balanced-ecs-service.ts index ce4be1ecce73e..6b7beb9b0eff6 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/load-balanced-ecs-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/load-balanced-ecs-service.ts @@ -1,5 +1,5 @@ import ecs = require('@aws-cdk/aws-ecs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { LoadBalancedServiceBase, LoadBalancedServiceBaseProps } from '../base/load-balanced-service-base'; /** diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts index 3d78627818c3c..82528c761d72d 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/queue-processing-ecs-service.ts @@ -1,5 +1,5 @@ import ecs = require('@aws-cdk/aws-ecs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { QueueProcessingServiceBase, QueueProcessingServiceBaseProps } from '../base/queue-processing-service-base'; /** diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts index ea7de37ba7d0e..0ba8fec79b283 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts @@ -1,7 +1,7 @@ import ecs = require('@aws-cdk/aws-ecs'); import events = require('@aws-cdk/aws-events'); import eventsTargets = require('@aws-cdk/aws-events-targets'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export interface ScheduledEc2TaskProps { /** diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/load-balanced-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/load-balanced-fargate-service.ts index 40d5a885c9ad2..db1854031cd7c 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/load-balanced-fargate-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/load-balanced-fargate-service.ts @@ -1,6 +1,6 @@ import ecs = require('@aws-cdk/aws-ecs'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { LoadBalancedServiceBase, LoadBalancedServiceBaseProps } from '../base/load-balanced-service-base'; /** diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts index 953e125685f10..6333fc194fe3f 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts @@ -1,5 +1,5 @@ import ecs = require('@aws-cdk/aws-ecs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { QueueProcessingServiceBase, QueueProcessingServiceBaseProps } from '../base/queue-processing-service-base'; /** diff --git a/packages/@aws-cdk/aws-ecs-patterns/package.json b/packages/@aws-cdk/aws-ecs-patterns/package.json index 48afa0bfa2150..da4624e24d4f5 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/package.json +++ b/packages/@aws-cdk/aws-ecs-patterns/package.json @@ -77,7 +77,7 @@ "@aws-cdk/aws-route53": "^0.35.0", "@aws-cdk/aws-route53-targets": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -92,7 +92,7 @@ "@aws-cdk/aws-route53": "^0.35.0", "@aws-cdk/aws-route53-targets": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.ts index d17daca0799d9..ab5c7ac1121ee 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ScheduledEc2Task } from '../../lib'; diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts index f46b734e5c677..fde271f8084e1 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts @@ -3,7 +3,7 @@ import { Certificate } from '@aws-cdk/aws-certificatemanager'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import { PublicHostedZone } from '@aws-cdk/aws-route53'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecsPatterns = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.queue-processing-ecs-service.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.queue-processing-ecs-service.ts index 65fe55935719b..bc0ec6e4e8336 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.queue-processing-ecs-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.queue-processing-ecs-service.ts @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecsPatterns = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts index fb47b71d64e65..9b7e30622e5b8 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts @@ -2,7 +2,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { ScheduledEc2Task } from '../../lib'; diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.ts b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.ts index 9d296d9208388..19d7eec2e63b8 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import ecsPatterns = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.ts b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.ts index 3043cfb86d900..f445ed32b8e30 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecsPatterns = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.ts b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.ts index a4509bec9d06c..3f6a7861c7852 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecsPatterns = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.load-balanced-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.load-balanced-fargate-service.ts index d99b81c6cd6f8..eacae40b2a487 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.load-balanced-fargate-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.load-balanced-fargate-service.ts @@ -3,7 +3,7 @@ import { Certificate } from '@aws-cdk/aws-certificatemanager'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecsPatterns = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.queue-processing-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.queue-processing-fargate-service.ts index 92b76c0bbd689..f6781e59eb8dc 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.queue-processing-fargate-service.ts +++ b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.queue-processing-fargate-service.ts @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecsPatterns = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs/lib/base/base-service.ts b/packages/@aws-cdk/aws-ecs/lib/base/base-service.ts index 2e906d25bb8be..bce52ed640834 100644 --- a/packages/@aws-cdk/aws-ecs/lib/base/base-service.ts +++ b/packages/@aws-cdk/aws-ecs/lib/base/base-service.ts @@ -4,7 +4,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); import iam = require('@aws-cdk/aws-iam'); import cloudmap = require('@aws-cdk/aws-servicediscovery'); -import { Construct, Duration, Fn, IResolvable, IResource, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, Fn, IResolvable, IResource, Lazy, Resource, Stack } from '@aws-cdk/core'; import { NetworkMode, TaskDefinition } from '../base/task-definition'; import { ICluster } from '../cluster'; import { CfnService } from '../ecs.generated'; diff --git a/packages/@aws-cdk/aws-ecs/lib/base/scalable-task-count.ts b/packages/@aws-cdk/aws-ecs/lib/base/scalable-task-count.ts index b9164b3b964e4..b0adc66480bfa 100644 --- a/packages/@aws-cdk/aws-ecs/lib/base/scalable-task-count.ts +++ b/packages/@aws-cdk/aws-ecs/lib/base/scalable-task-count.ts @@ -1,7 +1,7 @@ import appscaling = require('@aws-cdk/aws-applicationautoscaling'); import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; // tslint:disable-next-line:no-empty-interface export interface ScalableTaskCountProps extends appscaling.BaseScalableAttributeProps { diff --git a/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts b/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts index 89fb6e85f87c0..8d9ed48f8f233 100644 --- a/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { ContainerDefinition, ContainerDefinitionOptions } from '../container-definition'; import { CfnTaskDefinition } from '../ecs.generated'; import { PlacementConstraint } from '../placement'; diff --git a/packages/@aws-cdk/aws-ecs/lib/cluster.ts b/packages/@aws-cdk/aws-ecs/lib/cluster.ts index 9923a2219ef30..d7f4b88d7e5f6 100644 --- a/packages/@aws-cdk/aws-ecs/lib/cluster.ts +++ b/packages/@aws-cdk/aws-ecs/lib/cluster.ts @@ -4,7 +4,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import cloudmap = require('@aws-cdk/aws-servicediscovery'); import ssm = require('@aws-cdk/aws-ssm'); -import { Construct, Duration, IResource, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Resource, Stack } from '@aws-cdk/core'; import { InstanceDrainHook } from './drain-hook/instance-drain-hook'; import { CfnCluster } from './ecs.generated'; diff --git a/packages/@aws-cdk/aws-ecs/lib/container-definition.ts b/packages/@aws-cdk/aws-ecs/lib/container-definition.ts index b00e1a93b5154..7551590436ec7 100644 --- a/packages/@aws-cdk/aws-ecs/lib/container-definition.ts +++ b/packages/@aws-cdk/aws-ecs/lib/container-definition.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { NetworkMode, TaskDefinition } from './base/task-definition'; import { ContainerImage, ContainerImageConfig } from './container-image'; import { CfnTaskDefinition } from './ecs.generated'; diff --git a/packages/@aws-cdk/aws-ecs/lib/container-image.ts b/packages/@aws-cdk/aws-ecs/lib/container-image.ts index 780708dba27b8..adffce9c1254f 100644 --- a/packages/@aws-cdk/aws-ecs/lib/container-image.ts +++ b/packages/@aws-cdk/aws-ecs/lib/container-image.ts @@ -1,5 +1,5 @@ import ecr = require('@aws-cdk/aws-ecr'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ContainerDefinition } from './container-definition'; import { CfnTaskDefinition } from './ecs.generated'; diff --git a/packages/@aws-cdk/aws-ecs/lib/drain-hook/instance-drain-hook.ts b/packages/@aws-cdk/aws-ecs/lib/drain-hook/instance-drain-hook.ts index 18d036c22a858..1b908568810bf 100644 --- a/packages/@aws-cdk/aws-ecs/lib/drain-hook/instance-drain-hook.ts +++ b/packages/@aws-cdk/aws-ecs/lib/drain-hook/instance-drain-hook.ts @@ -2,7 +2,7 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import hooks = require('@aws-cdk/aws-autoscaling-hooktargets'); import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import fs = require('fs'); import path = require('path'); import { ICluster } from '../cluster'; diff --git a/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts b/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts index 21f3fc299609d..b851d3d58fb80 100644 --- a/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts +++ b/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elb = require('@aws-cdk/aws-elasticloadbalancing'); -import { Construct, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, Lazy, Resource } from '@aws-cdk/core'; import { BaseService, BaseServiceProps, IService } from '../base/base-service'; import { NetworkMode, TaskDefinition } from '../base/task-definition'; import { CfnService } from '../ecs.generated'; diff --git a/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-task-definition.ts b/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-task-definition.ts index 088241b8aeeff..e41041eb3fdea 100644 --- a/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-task-definition.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { CommonTaskDefinitionProps, Compatibility, ITaskDefinition, NetworkMode, TaskDefinition } from '../base/task-definition'; import { PlacementConstraint } from '../placement'; diff --git a/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts b/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts index 933d882bf67fd..7e0aedc26370c 100644 --- a/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts +++ b/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); -import { Construct, Resource } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Construct, Resource } from '@aws-cdk/core'; import { BaseService, BaseServiceProps, IService } from '../base/base-service'; import { TaskDefinition } from '../base/task-definition'; diff --git a/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-task-definition.ts b/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-task-definition.ts index f46cc50af073f..8464806c96a67 100644 --- a/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/lib/fargate/fargate-task-definition.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { CommonTaskDefinitionProps, Compatibility, ITaskDefinition, NetworkMode, TaskDefinition } from '../base/task-definition'; /** diff --git a/packages/@aws-cdk/aws-ecs/lib/images/asset-image.ts b/packages/@aws-cdk/aws-ecs/lib/images/asset-image.ts index 2030ee8c6fe16..175d1efeac128 100644 --- a/packages/@aws-cdk/aws-ecs/lib/images/asset-image.ts +++ b/packages/@aws-cdk/aws-ecs/lib/images/asset-image.ts @@ -1,5 +1,5 @@ import { DockerImageAsset } from '@aws-cdk/aws-ecr-assets'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ContainerDefinition } from '../container-definition'; import { ContainerImage, ContainerImageConfig } from '../container-image'; diff --git a/packages/@aws-cdk/aws-ecs/lib/images/ecr.ts b/packages/@aws-cdk/aws-ecs/lib/images/ecr.ts index a5b161bf41dc6..0d6e70e0818d7 100644 --- a/packages/@aws-cdk/aws-ecs/lib/images/ecr.ts +++ b/packages/@aws-cdk/aws-ecs/lib/images/ecr.ts @@ -1,5 +1,5 @@ import ecr = require('@aws-cdk/aws-ecr'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { ContainerDefinition } from '../container-definition'; import { ContainerImage, ContainerImageConfig } from '../container-image'; diff --git a/packages/@aws-cdk/aws-ecs/lib/images/repository.ts b/packages/@aws-cdk/aws-ecs/lib/images/repository.ts index 15d5f6bd7be0d..83ca010e8323b 100644 --- a/packages/@aws-cdk/aws-ecs/lib/images/repository.ts +++ b/packages/@aws-cdk/aws-ecs/lib/images/repository.ts @@ -1,5 +1,5 @@ import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { ContainerDefinition } from "../container-definition"; import { ContainerImage, ContainerImageConfig } from "../container-image"; diff --git a/packages/@aws-cdk/aws-ecs/lib/linux-parameters.ts b/packages/@aws-cdk/aws-ecs/lib/linux-parameters.ts index 715ec3f66d0d4..28841e0a148c8 100644 --- a/packages/@aws-cdk/aws-ecs/lib/linux-parameters.ts +++ b/packages/@aws-cdk/aws-ecs/lib/linux-parameters.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnTaskDefinition } from './ecs.generated'; /** diff --git a/packages/@aws-cdk/aws-ecs/lib/log-drivers/aws-log-driver.ts b/packages/@aws-cdk/aws-ecs/lib/log-drivers/aws-log-driver.ts index 2be6c7f1125fc..f605a31ca28cc 100644 --- a/packages/@aws-cdk/aws-ecs/lib/log-drivers/aws-log-driver.ts +++ b/packages/@aws-cdk/aws-ecs/lib/log-drivers/aws-log-driver.ts @@ -1,5 +1,5 @@ import logs = require('@aws-cdk/aws-logs'); -import { Construct, Stack } from '@aws-cdk/cdk'; +import { Construct, Stack } from '@aws-cdk/core'; import { ContainerDefinition } from '../container-definition'; import { LogDriver, LogDriverConfig } from "./log-driver"; diff --git a/packages/@aws-cdk/aws-ecs/lib/log-drivers/log-driver.ts b/packages/@aws-cdk/aws-ecs/lib/log-drivers/log-driver.ts index 234545e4a0dd5..f64faa48ca711 100644 --- a/packages/@aws-cdk/aws-ecs/lib/log-drivers/log-driver.ts +++ b/packages/@aws-cdk/aws-ecs/lib/log-drivers/log-driver.ts @@ -1,4 +1,4 @@ -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { ContainerDefinition } from '../container-definition'; import { AwsLogDriver, AwsLogDriverProps } from './aws-log-driver'; diff --git a/packages/@aws-cdk/aws-ecs/package.json b/packages/@aws-cdk/aws-ecs/package.json index cb33a4f76ab96..34431d615b302 100644 --- a/packages/@aws-cdk/aws-ecs/package.json +++ b/packages/@aws-cdk/aws-ecs/package.json @@ -93,7 +93,7 @@ "@aws-cdk/aws-servicediscovery": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", @@ -119,7 +119,7 @@ "@aws-cdk/aws-servicediscovery": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "engines": { diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.ts b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.ts index 00c28dfd238be..9007793708199 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.ts +++ b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecs = require('../../lib'); import { NetworkMode } from '../../lib'; diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.ts b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.ts index 7ee82b239b07d..c58e7c68ff129 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.ts +++ b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecs = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-awsvpc-nw.ts b/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-awsvpc-nw.ts index c050241359589..0bec8ec26c1ff 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-awsvpc-nw.ts +++ b/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-awsvpc-nw.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecs = require('../../lib'); import { NetworkMode } from '../../lib'; diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-bridge-nw.ts b/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-bridge-nw.ts index b915e8d3f383b..d22afcfe27509 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-bridge-nw.ts +++ b/packages/@aws-cdk/aws-ecs/test/ec2/integ.sd-bridge-nw.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecs = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-service.ts b/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-service.ts index ee4db8bf19287..25dcbf13e4c2a 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-service.ts +++ b/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-service.ts @@ -2,7 +2,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import elb = require('@aws-cdk/aws-elasticloadbalancing'); import cloudmap = require('@aws-cdk/aws-servicediscovery'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../../lib'); import { BinPackResource, BuiltInAttributes, ContainerImage, NetworkMode } from '../../lib'; diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-task-definition.ts b/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-task-definition.ts index b4e948a755a68..60e26c8b53e39 100644 --- a/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/test/ec2/test.ec2-task-definition.ts @@ -1,7 +1,7 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import { Protocol } from '@aws-cdk/aws-ec2'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.ts b/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.ts index c21f8c1072087..8d7852e02acd2 100644 --- a/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.ts +++ b/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ecs = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts b/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts index 1c596070f48d4..71a2c21ce78c1 100644 --- a/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts +++ b/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require("@aws-cdk/aws-elasticloadbalancingv2"); import cloudmap = require('@aws-cdk/aws-servicediscovery'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../../lib'); import { ContainerImage } from '../../lib'; diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-task-definition.ts b/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-task-definition.ts index e84fdbd5a48ee..75ca6c0920b0d 100644 --- a/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-task-definition.ts @@ -1,5 +1,5 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../../lib'); diff --git a/packages/@aws-cdk/aws-ecs/test/test.aws-log-driver.ts b/packages/@aws-cdk/aws-ecs/test/test.aws-log-driver.ts index 6f232daf7df8c..4b82ea9a03260 100644 --- a/packages/@aws-cdk/aws-ecs/test/test.aws-log-driver.ts +++ b/packages/@aws-cdk/aws-ecs/test/test.aws-log-driver.ts @@ -1,6 +1,6 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../lib'); diff --git a/packages/@aws-cdk/aws-ecs/test/test.container-definition.ts b/packages/@aws-cdk/aws-ecs/test/test.container-definition.ts index 0084c255aba41..f4d76ce48f53b 100644 --- a/packages/@aws-cdk/aws-ecs/test/test.container-definition.ts +++ b/packages/@aws-cdk/aws-ecs/test/test.container-definition.ts @@ -1,6 +1,6 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../lib'); diff --git a/packages/@aws-cdk/aws-ecs/test/test.ecs-cluster.ts b/packages/@aws-cdk/aws-ecs/test/test.ecs-cluster.ts index cf9043fc8f13d..99d3c3cbc0c75 100644 --- a/packages/@aws-cdk/aws-ecs/test/test.ecs-cluster.ts +++ b/packages/@aws-cdk/aws-ecs/test/test.ecs-cluster.ts @@ -2,7 +2,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import { InstanceType } from '@aws-cdk/aws-ec2'; import cloudmap = require('@aws-cdk/aws-servicediscovery'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ecs = require('../lib'); diff --git a/packages/@aws-cdk/aws-ecs/test/test.task-definition.ts b/packages/@aws-cdk/aws-ecs/test/test.task-definition.ts index a6a9409a559a2..cd60e61a40ddd 100644 --- a/packages/@aws-cdk/aws-ecs/test/test.task-definition.ts +++ b/packages/@aws-cdk/aws-ecs/test/test.task-definition.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 ecs = require('../lib'); diff --git a/packages/@aws-cdk/aws-efs/package.json b/packages/@aws-cdk/aws-efs/package.json index 3a4ae05d1207a..bbeac66caa584 100644 --- a/packages/@aws-cdk/aws-efs/package.json +++ b/packages/@aws-cdk/aws-efs/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-eks/lib/cluster.ts b/packages/@aws-cdk/aws-eks/lib/cluster.ts index 0b9405a1391d2..2e57f99f33cab 100644 --- a/packages/@aws-cdk/aws-eks/lib/cluster.ts +++ b/packages/@aws-cdk/aws-eks/lib/cluster.ts @@ -2,7 +2,7 @@ import autoscaling = require('@aws-cdk/aws-autoscaling'); import ec2 = require('@aws-cdk/aws-ec2'); import { Subnet } from '@aws-cdk/aws-ec2'; import iam = require('@aws-cdk/aws-iam'); -import { CfnOutput, Construct, IResource, Resource, Tag } from '@aws-cdk/cdk'; +import { CfnOutput, Construct, IResource, Resource, Tag } from '@aws-cdk/core'; import { EksOptimizedAmi, nodeTypeForInstanceType } from './ami'; import { CfnCluster } from './eks.generated'; import { maxPodsForInstanceType } from './instance-data'; diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json index 57008cbbca06f..3a817d21732b3 100644 --- a/packages/@aws-cdk/aws-eks/package.json +++ b/packages/@aws-cdk/aws-eks/package.json @@ -73,14 +73,14 @@ "@aws-cdk/aws-autoscaling": "^0.35.0", "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-autoscaling": "^0.35.0", "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-eks/test/example.ssh-into-nodes.lit.ts b/packages/@aws-cdk/aws-eks/test/example.ssh-into-nodes.lit.ts index e60dae8ac62bf..e561f264a65df 100644 --- a/packages/@aws-cdk/aws-eks/test/example.ssh-into-nodes.lit.ts +++ b/packages/@aws-cdk/aws-eks/test/example.ssh-into-nodes.lit.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import eks = require('../lib'); class EksClusterStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.ts index c642b878f4cbb..ef7f3baa2fe4c 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.ts +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import eks = require('../lib'); class EksClusterStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-eks/test/test.cluster.ts b/packages/@aws-cdk/aws-eks/test/test.cluster.ts index 839833905e8b4..eaff4340b822d 100644 --- a/packages/@aws-cdk/aws-eks/test/test.cluster.ts +++ b/packages/@aws-cdk/aws-eks/test/test.cluster.ts @@ -1,7 +1,7 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); -import { CfnOutput } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { CfnOutput } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import eks = require('../lib'); diff --git a/packages/@aws-cdk/aws-elasticache/package.json b/packages/@aws-cdk/aws-elasticache/package.json index 0650c5dc581c8..a6cec882f7bd6 100644 --- a/packages/@aws-cdk/aws-elasticache/package.json +++ b/packages/@aws-cdk/aws-elasticache/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/package.json b/packages/@aws-cdk/aws-elasticbeanstalk/package.json index d098926729b1d..b34d2e0cb5dc5 100644 --- a/packages/@aws-cdk/aws-elasticbeanstalk/package.json +++ b/packages/@aws-cdk/aws-elasticbeanstalk/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/lib/load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancing/lib/load-balancer.ts index e8d1be9124478..9186f48fd818e 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/lib/load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancing/lib/load-balancer.ts @@ -1,5 +1,5 @@ import { Connections, IConnectable, ISecurityGroup, ISubnet, IVpc, Peer, Port, SecurityGroup } from '@aws-cdk/aws-ec2'; -import { Construct, Duration, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, Duration, Lazy, Resource } from '@aws-cdk/core'; import { CfnLoadBalancer } from './elasticloadbalancing.generated'; /** diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/package.json b/packages/@aws-cdk/aws-elasticloadbalancing/package.json index 6856d8b6740ce..8b34bbbf10366 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/package.json +++ b/packages/@aws-cdk/aws-elasticloadbalancing/package.json @@ -71,12 +71,12 @@ }, "dependencies": { "@aws-cdk/aws-ec2": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-ec2": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.ts b/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.ts index d28f53088154c..8d532b5ec5737 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import elb = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/test/test.loadbalancer.ts b/packages/@aws-cdk/aws-elasticloadbalancing/test/test.loadbalancer.ts index fac680a0d1d1e..17acf4af8a245 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/test/test.loadbalancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancing/test/test.loadbalancer.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import { Connections, Peer, Vpc } from '@aws-cdk/aws-ec2'; -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ILoadBalancerTarget, LoadBalancer, LoadBalancingProtocol } from '../lib'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-certificate.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-certificate.ts index 634070f0b979b..7c63722634fa0 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-certificate.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-certificate.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnListenerCertificate } from '../elasticloadbalancingv2.generated'; import { IApplicationListener } from './application-listener'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts index a52d4351cc35b..4132d30d635b2 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnListenerRule } from '../elasticloadbalancingv2.generated'; import { IApplicationListener } from './application-listener'; import { IApplicationTargetGroup } from './application-target-group'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener.ts index 41cf8198cf129..ca20762908ced 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, Duration, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Lazy, Resource } from '@aws-cdk/core'; import { BaseListener } from '../shared/base-listener'; import { HealthCheck } from '../shared/base-target-group'; import { ApplicationProtocol, SslPolicy } from '../shared/enums'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts index 7897335468a2c..6a699030eba56 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts @@ -2,7 +2,7 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); -import { Construct, Duration, Lazy, Resource, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, Duration, Lazy, Resource, Stack, Token } from '@aws-cdk/core'; import { BaseLoadBalancer, BaseLoadBalancerProps, ILoadBalancerV2 } from '../shared/base-load-balancer'; import { IpAddressType } from '../shared/enums'; import { ApplicationListener, BaseApplicationListenerProps } from './application-listener'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts index f49cb1d305a6f..4d095af8b4da5 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-target-group.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, Duration, IConstruct } from '@aws-cdk/cdk'; +import { Construct, Duration, IConstruct } from '@aws-cdk/core'; import { BaseTargetGroupProps, ITargetGroup, loadBalancerNameFromListenerArn, LoadBalancerTargetProps, TargetGroupBase, TargetGroupImportProps } from '../shared/base-target-group'; import { ApplicationProtocol } from '../shared/enums'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts index a74b31cf8a48a..d5d9b578b8d02 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-listener.ts @@ -1,4 +1,4 @@ -import { Construct, Duration, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Resource } from '@aws-cdk/core'; import { BaseListener } from '../shared/base-listener'; import { HealthCheck } from '../shared/base-target-group'; import { Protocol, SslPolicy } from '../shared/enums'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts index beeb4bf1d239f..f5e7e3f0efb81 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { BaseLoadBalancer, BaseLoadBalancerProps, ILoadBalancerV2 } from '../shared/base-load-balancer'; import { BaseNetworkListenerProps, NetworkListener } from './network-listener'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts index d9c9bb78066f7..33d8b133d5fbb 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/nlb/network-target-group.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { BaseTargetGroupProps, ITargetGroup, loadBalancerNameFromListenerArn, LoadBalancerTargetProps, TargetGroupBase, TargetGroupImportProps } from '../shared/base-target-group'; import { Protocol } from '../shared/enums'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-listener.ts index 298ea0739bbd9..255f02c16deee 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-listener.ts @@ -1,4 +1,4 @@ -import { Construct, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, Lazy, Resource } from '@aws-cdk/core'; import { CfnListener } from '../elasticloadbalancingv2.generated'; import { ITargetGroup } from './base-target-group'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts index 4009a1707e51d..a8c90c9b7d2cb 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { CfnLoadBalancer } from '../elasticloadbalancingv2.generated'; import { Attributes, ifUndefined, renderAttributes } from './util'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts index e98066d7ab2f7..a81479faa36bf 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-target-group.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnTargetGroup } from '../elasticloadbalancingv2.generated'; import { Protocol, TargetType } from './enums'; import { Attributes, renderAttributes } from './util'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/imported.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/imported.ts index 6def9ea86ff42..f94898074cca7 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/imported.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/imported.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ITargetGroup, TargetGroupImportProps } from './base-target-group'; /** diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json index 5062453f2ea8a..d217bb5ceea1e 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json @@ -75,7 +75,7 @@ "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -84,7 +84,7 @@ "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts index 1a4509b7c09d5..bb635ef3774f4 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.listener.ts @@ -1,7 +1,7 @@ import { expect, haveResource, MatchStyle } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -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 { Test } from 'nodeunit'; import elbv2 = require('../../lib'); import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.load-balancer.ts index 5a81e1671e878..5e448b233b53d 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.load-balancer.ts @@ -1,8 +1,8 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import s3 = require('@aws-cdk/aws-s3'); -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 { Test } from 'nodeunit'; import elbv2 = require('../../lib'); diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.security-groups.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.security-groups.ts index 98b74d3a93875..46c11e929f0d7 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.security-groups.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/test.security-groups.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import elbv2 = require('../../lib'); import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/helpers.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/helpers.ts index addd947d5796f..255e8fe3592b0 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/helpers.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/helpers.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import elbv2 = require('../lib'); export class FakeSelfRegisteringTarget extends cdk.Construct implements elbv2.IApplicationLoadBalancerTarget, elbv2.INetworkLoadBalancerTarget, diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.ts index a6b11691c8364..e82129c1cf749 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import elbv2 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.ts index 034b79b2d6065..9a4342f08cef7 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import elbv2 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.listener.ts index efae2f6eef41a..8de080a54b1f4 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.listener.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.listener.ts @@ -1,7 +1,7 @@ import { expect, haveResource, MatchStyle } from '@aws-cdk/assert'; import acm = require('@aws-cdk/aws-certificatemanager'); import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import elbv2 = require('../../lib'); import { FakeSelfRegisteringTarget } from '../helpers'; diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.load-balancer.ts index b04d7198b98ce..1c71bd31c5756 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.load-balancer.ts +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.load-balancer.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import elbv2 = require('../../lib'); diff --git a/packages/@aws-cdk/aws-elasticsearch/package.json b/packages/@aws-cdk/aws-elasticsearch/package.json index 7a6849dde86f6..06419a8ef47e4 100644 --- a/packages/@aws-cdk/aws-elasticsearch/package.json +++ b/packages/@aws-cdk/aws-elasticsearch/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-emr/package.json b/packages/@aws-cdk/aws-emr/package.json index f0f38b95b70d5..7703581c76f11 100644 --- a/packages/@aws-cdk/aws-emr/package.json +++ b/packages/@aws-cdk/aws-emr/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts b/packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts index 1503fead7a628..97c325c12b26a 100644 --- a/packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts +++ b/packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts @@ -3,7 +3,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import events = require ('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { ContainerOverride } from './ecs-task-properties'; import { singletonEventRole } from './util'; diff --git a/packages/@aws-cdk/aws-events-targets/lib/util.ts b/packages/@aws-cdk/aws-events-targets/lib/util.ts index 1b0215589ff9f..e0c60e2075835 100644 --- a/packages/@aws-cdk/aws-events-targets/lib/util.ts +++ b/packages/@aws-cdk/aws-events-targets/lib/util.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Construct, IConstruct } from "@aws-cdk/cdk"; +import { Construct, IConstruct } from "@aws-cdk/core"; /** * Obtain the Role for the CloudWatch event diff --git a/packages/@aws-cdk/aws-events-targets/package.json b/packages/@aws-cdk/aws-events-targets/package.json index 6d35367eb7444..4c4e171a31b4b 100644 --- a/packages/@aws-cdk/aws-events-targets/package.json +++ b/packages/@aws-cdk/aws-events-targets/package.json @@ -91,7 +91,7 @@ "@aws-cdk/aws-sns-subscriptions": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", "@aws-cdk/aws-stepfunctions": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -107,7 +107,7 @@ "@aws-cdk/aws-sns-subscriptions": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", "@aws-cdk/aws-stepfunctions": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-events-targets/test/codebuild/codebuild.test.ts b/packages/@aws-cdk/aws-events-targets/test/codebuild/codebuild.test.ts index c0c422f747021..0d5d370999415 100644 --- a/packages/@aws-cdk/aws-events-targets/test/codebuild/codebuild.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/codebuild/codebuild.test.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import codebuild = require('@aws-cdk/aws-codebuild'); import events = require('@aws-cdk/aws-events'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import targets = require('../../lib'); test('use codebuild project as an eventrule target', () => { diff --git a/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts b/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts index 62d67211aada2..15f9c357a20a9 100644 --- a/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts +++ b/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts @@ -5,7 +5,7 @@ import events = require('@aws-cdk/aws-events'); import sns = require('@aws-cdk/aws-sns'); import subs = require('@aws-cdk/aws-sns-subscriptions'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.ts b/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.ts index 24d9059395147..9324c65d5f109 100644 --- a/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.ts +++ b/packages/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.ts @@ -1,7 +1,7 @@ import codecommit = require('@aws-cdk/aws-codecommit'); import codepipeline = require('@aws-cdk/aws-codepipeline'); import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); class MockAction extends codepipeline.Action { diff --git a/packages/@aws-cdk/aws-events-targets/test/codepipeline/pipeline.test.ts b/packages/@aws-cdk/aws-events-targets/test/codepipeline/pipeline.test.ts index 639f7d1ad3e1a..60bd93005f3ca 100644 --- a/packages/@aws-cdk/aws-events-targets/test/codepipeline/pipeline.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/codepipeline/pipeline.test.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import codepipeline = require('@aws-cdk/aws-codepipeline'); import events = require('@aws-cdk/aws-events'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import targets = require('../../lib'); test('use codebuild project as an eventrule target', () => { diff --git a/packages/@aws-cdk/aws-events-targets/test/ecs/event-rule-target.test.ts b/packages/@aws-cdk/aws-events-targets/test/ecs/event-rule-target.test.ts index d5e08d6995d9e..f0feb5a4d83fa 100644 --- a/packages/@aws-cdk/aws-events-targets/test/ecs/event-rule-target.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/ecs/event-rule-target.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); test("Can use EC2 taskdef as EventRule target", () => { diff --git a/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-ec2-task.lit.ts b/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-ec2-task.lit.ts index e8238e82debf5..c2889ab61308d 100644 --- a/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-ec2-task.lit.ts +++ b/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-ec2-task.lit.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); import path = require('path'); diff --git a/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-fargate-task.ts b/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-fargate-task.ts index fba34df0564f3..81caece3ee424 100644 --- a/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-fargate-task.ts +++ b/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-fargate-task.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import events = require('@aws-cdk/aws-events'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); import path = require('path'); diff --git a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts index bf4e5f2f01877..6b6b5708cef45 100644 --- a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts +++ b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts @@ -1,6 +1,6 @@ import events = require('@aws-cdk/aws-events'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-events-targets/test/lambda/lambda.test.ts b/packages/@aws-cdk/aws-events-targets/test/lambda/lambda.test.ts index f3a49b1a2f50a..ff7e41837b526 100644 --- a/packages/@aws-cdk/aws-events-targets/test/lambda/lambda.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/lambda/lambda.test.ts @@ -1,7 +1,7 @@ import { countResources, expect, haveResource } from '@aws-cdk/assert'; import events = require('@aws-cdk/aws-events'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); test('use lambda as an event rule target', () => { diff --git a/packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts b/packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts index 01e1ad0929812..79e3542190920 100644 --- a/packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts +++ b/packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts @@ -2,7 +2,7 @@ import events = require('@aws-cdk/aws-events'); import sns = require('@aws-cdk/aws-sns'); import subs = require('@aws-cdk/aws-sns-subscriptions'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); // --------------------------------- diff --git a/packages/@aws-cdk/aws-events-targets/test/sns/sns.test.ts b/packages/@aws-cdk/aws-events-targets/test/sns/sns.test.ts index 7fb36ff8d417c..cadf5eb2eb442 100644 --- a/packages/@aws-cdk/aws-events-targets/test/sns/sns.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/sns/sns.test.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import events = require('@aws-cdk/aws-events'); import sns = require('@aws-cdk/aws-sns'); -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import targets = require('../../lib'); test('sns topic as an event rule target', () => { diff --git a/packages/@aws-cdk/aws-events-targets/test/sqs/integ.sqs-event-rule-target.ts b/packages/@aws-cdk/aws-events-targets/test/sqs/integ.sqs-event-rule-target.ts index a468df4954893..b6bc7214e8984 100644 --- a/packages/@aws-cdk/aws-events-targets/test/sqs/integ.sqs-event-rule-target.ts +++ b/packages/@aws-cdk/aws-events-targets/test/sqs/integ.sqs-event-rule-target.ts @@ -1,6 +1,6 @@ import events = require('@aws-cdk/aws-events'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); // --------------------------------- diff --git a/packages/@aws-cdk/aws-events-targets/test/sqs/sqs.test.ts b/packages/@aws-cdk/aws-events-targets/test/sqs/sqs.test.ts index 1bc25c0163727..31dc30cfa4ef0 100644 --- a/packages/@aws-cdk/aws-events-targets/test/sqs/sqs.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/sqs/sqs.test.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import events = require('@aws-cdk/aws-events'); import sqs = require('@aws-cdk/aws-sqs'); -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import targets = require('../../lib'); test('sns topic as an event rule target', () => { diff --git a/packages/@aws-cdk/aws-events-targets/test/stepfunctions/statemachine.test.ts b/packages/@aws-cdk/aws-events-targets/test/stepfunctions/statemachine.test.ts index f96132663acdc..e2b6dad120db5 100644 --- a/packages/@aws-cdk/aws-events-targets/test/stepfunctions/statemachine.test.ts +++ b/packages/@aws-cdk/aws-events-targets/test/stepfunctions/statemachine.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import events = require('@aws-cdk/aws-events'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../../lib'); test('State machine can be used as Event Rule target', () => { diff --git a/packages/@aws-cdk/aws-events/lib/input.ts b/packages/@aws-cdk/aws-events/lib/input.ts index 7e05a1849c4c7..d0f30065e476b 100644 --- a/packages/@aws-cdk/aws-events/lib/input.ts +++ b/packages/@aws-cdk/aws-events/lib/input.ts @@ -1,5 +1,5 @@ import { captureStackTrace, DefaultTokenResolver, IResolvable, - IResolveContext, Lazy, Stack, StringConcat, Token, Tokenization } from '@aws-cdk/cdk'; + IResolveContext, Lazy, Stack, StringConcat, Token, Tokenization } from '@aws-cdk/core'; import { IRule } from './rule-ref'; /** diff --git a/packages/@aws-cdk/aws-events/lib/rule-ref.ts b/packages/@aws-cdk/aws-events/lib/rule-ref.ts index 52455797ae23d..63c567cf3b0b3 100644 --- a/packages/@aws-cdk/aws-events/lib/rule-ref.ts +++ b/packages/@aws-cdk/aws-events/lib/rule-ref.ts @@ -1,4 +1,4 @@ -import { IResource } from '@aws-cdk/cdk'; +import { IResource } from '@aws-cdk/core'; export interface IRule extends IResource { /** diff --git a/packages/@aws-cdk/aws-events/lib/rule.ts b/packages/@aws-cdk/aws-events/lib/rule.ts index b223c12254240..2834dc70998d3 100644 --- a/packages/@aws-cdk/aws-events/lib/rule.ts +++ b/packages/@aws-cdk/aws-events/lib/rule.ts @@ -1,4 +1,4 @@ -import { Construct, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, Lazy, Resource } from '@aws-cdk/core'; import { EventPattern } from './event-pattern'; import { CfnRule } from './events.generated'; import { IRule } from './rule-ref'; diff --git a/packages/@aws-cdk/aws-events/lib/schedule.ts b/packages/@aws-cdk/aws-events/lib/schedule.ts index 0b2fcce0d142c..14e7ba7690328 100644 --- a/packages/@aws-cdk/aws-events/lib/schedule.ts +++ b/packages/@aws-cdk/aws-events/lib/schedule.ts @@ -1,4 +1,4 @@ -import { Duration } from "@aws-cdk/cdk"; +import { Duration } from "@aws-cdk/core"; /** * Schedule for scheduled event rules diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json index 235f8839f79e2..dad43e24f0a18 100644 --- a/packages/@aws-cdk/aws-events/package.json +++ b/packages/@aws-cdk/aws-events/package.json @@ -71,12 +71,12 @@ }, "dependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-events/test/test.input.ts b/packages/@aws-cdk/aws-events/test/test.input.ts index 5a18d98ff6027..4e7bb315bc2c9 100644 --- a/packages/@aws-cdk/aws-events/test/test.input.ts +++ b/packages/@aws-cdk/aws-events/test/test.input.ts @@ -1,6 +1,6 @@ import { expect, haveResourceLike } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); -import { Duration, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { IRuleTarget, RuleTargetInput, Schedule } from '../lib'; import { Rule } from '../lib/rule'; diff --git a/packages/@aws-cdk/aws-events/test/test.rule.ts b/packages/@aws-cdk/aws-events/test/test.rule.ts index e737117f27e7d..dccb81e9606d8 100644 --- a/packages/@aws-cdk/aws-events/test/test.rule.ts +++ b/packages/@aws-cdk/aws-events/test/test.rule.ts @@ -1,8 +1,8 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import { ServicePrincipal } from '@aws-cdk/aws-iam'; -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 { Test } from 'nodeunit'; import { EventField, IRule, IRuleTarget, RuleTargetInput, Schedule } from '../lib'; import { Rule } from '../lib/rule'; diff --git a/packages/@aws-cdk/aws-events/test/test.schedule.ts b/packages/@aws-cdk/aws-events/test/test.schedule.ts index 8297560278c14..8e2a3905ea54d 100644 --- a/packages/@aws-cdk/aws-events/test/test.schedule.ts +++ b/packages/@aws-cdk/aws-events/test/test.schedule.ts @@ -1,4 +1,4 @@ -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import events = require('../lib'); diff --git a/packages/@aws-cdk/aws-fsx/package.json b/packages/@aws-cdk/aws-fsx/package.json index ef43e5f830565..0f6b454f2b12b 100644 --- a/packages/@aws-cdk/aws-fsx/package.json +++ b/packages/@aws-cdk/aws-fsx/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" diff --git a/packages/@aws-cdk/aws-gamelift/package.json b/packages/@aws-cdk/aws-gamelift/package.json index ebab241f233a0..1d95d709027a9 100644 --- a/packages/@aws-cdk/aws-gamelift/package.json +++ b/packages/@aws-cdk/aws-gamelift/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-glue/lib/database.ts b/packages/@aws-cdk/aws-glue/lib/database.ts index 6053aafffeb6d..2fd30d94f960c 100644 --- a/packages/@aws-cdk/aws-glue/lib/database.ts +++ b/packages/@aws-cdk/aws-glue/lib/database.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import { Construct, IResource, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource, Stack } from '@aws-cdk/core'; import { CfnDatabase } from './glue.generated'; export interface IDatabase extends IResource { diff --git a/packages/@aws-cdk/aws-glue/lib/table.ts b/packages/@aws-cdk/aws-glue/lib/table.ts index 31bffd62cc605..91e9b7c4db12e 100644 --- a/packages/@aws-cdk/aws-glue/lib/table.ts +++ b/packages/@aws-cdk/aws-glue/lib/table.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import s3 = require('@aws-cdk/aws-s3'); -import { Construct, Fn, IResource, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Fn, IResource, Resource, Stack } from '@aws-cdk/core'; import { DataFormat } from './data-format'; import { IDatabase } from './database'; import { CfnTable } from './glue.generated'; diff --git a/packages/@aws-cdk/aws-glue/package.json b/packages/@aws-cdk/aws-glue/package.json index 6c15c477942e2..bbee2b862df8e 100644 --- a/packages/@aws-cdk/aws-glue/package.json +++ b/packages/@aws-cdk/aws-glue/package.json @@ -73,14 +73,14 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-glue/test/integ.table.ts b/packages/@aws-cdk/aws-glue/test/integ.table.ts index 4dd92193d01fa..f6c96477d4fa2 100644 --- a/packages/@aws-cdk/aws-glue/test/integ.table.ts +++ b/packages/@aws-cdk/aws-glue/test/integ.table.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import glue = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-glue/test/test.database.ts b/packages/@aws-cdk/aws-glue/test/test.database.ts index 58fbc58869652..40bae759f3268 100644 --- a/packages/@aws-cdk/aws-glue/test/test.database.ts +++ b/packages/@aws-cdk/aws-glue/test/test.database.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import glue = require('../lib'); diff --git a/packages/@aws-cdk/aws-glue/test/test.table.ts b/packages/@aws-cdk/aws-glue/test/test.table.ts index 0e2447fd5a2e7..e49f09ffb9da5 100644 --- a/packages/@aws-cdk/aws-glue/test/test.table.ts +++ b/packages/@aws-cdk/aws-glue/test/test.table.ts @@ -2,7 +2,7 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import glue = require('../lib'); diff --git a/packages/@aws-cdk/aws-greengrass/package.json b/packages/@aws-cdk/aws-greengrass/package.json index 412fdcd28f883..03a95a20b3364 100644 --- a/packages/@aws-cdk/aws-greengrass/package.json +++ b/packages/@aws-cdk/aws-greengrass/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" diff --git a/packages/@aws-cdk/aws-guardduty/package.json b/packages/@aws-cdk/aws-guardduty/package.json index af24eb0f8cff0..f50cee6b8b349 100644 --- a/packages/@aws-cdk/aws-guardduty/package.json +++ b/packages/@aws-cdk/aws-guardduty/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-iam/lib/grant.ts b/packages/@aws-cdk/aws-iam/lib/grant.ts index 5b6b35feddef1..339dae9b7a644 100644 --- a/packages/@aws-cdk/aws-iam/lib/grant.ts +++ b/packages/@aws-cdk/aws-iam/lib/grant.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { PolicyStatement } from "./policy-statement"; import { IGrantable } from "./principals"; diff --git a/packages/@aws-cdk/aws-iam/lib/group.ts b/packages/@aws-cdk/aws-iam/lib/group.ts index fc50b20709fd6..965f453fd6ea4 100644 --- a/packages/@aws-cdk/aws-iam/lib/group.ts +++ b/packages/@aws-cdk/aws-iam/lib/group.ts @@ -1,4 +1,4 @@ -import { Construct, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Lazy, Resource, Stack } from '@aws-cdk/core'; import { CfnGroup } from './iam.generated'; import { IIdentity } from './identity-base'; import { IManagedPolicy } from './managed-policy'; diff --git a/packages/@aws-cdk/aws-iam/lib/identity-base.ts b/packages/@aws-cdk/aws-iam/lib/identity-base.ts index 1e53ed2f58d29..f4cc2e08c5d14 100644 --- a/packages/@aws-cdk/aws-iam/lib/identity-base.ts +++ b/packages/@aws-cdk/aws-iam/lib/identity-base.ts @@ -1,4 +1,4 @@ -import { IResource } from '@aws-cdk/cdk'; +import { IResource } from '@aws-cdk/core'; import { IManagedPolicy } from './managed-policy'; import { Policy } from "./policy"; import { IPrincipal } from "./principals"; diff --git a/packages/@aws-cdk/aws-iam/lib/lazy-role.ts b/packages/@aws-cdk/aws-iam/lib/lazy-role.ts index b226b033bfbbf..85860d9725569 100644 --- a/packages/@aws-cdk/aws-iam/lib/lazy-role.ts +++ b/packages/@aws-cdk/aws-iam/lib/lazy-role.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Grant } from './grant'; import { IManagedPolicy } from './managed-policy'; import { Policy } from './policy'; diff --git a/packages/@aws-cdk/aws-iam/lib/managed-policy.ts b/packages/@aws-cdk/aws-iam/lib/managed-policy.ts index 7ff8771d5b987..3d78663f85269 100644 --- a/packages/@aws-cdk/aws-iam/lib/managed-policy.ts +++ b/packages/@aws-cdk/aws-iam/lib/managed-policy.ts @@ -1,4 +1,4 @@ -import { IResolveContext, Lazy, Stack } from '@aws-cdk/cdk'; +import { IResolveContext, Lazy, Stack } from '@aws-cdk/core'; /** * A managed policy diff --git a/packages/@aws-cdk/aws-iam/lib/policy-document.ts b/packages/@aws-cdk/aws-iam/lib/policy-document.ts index 5a96706e5c717..1ee0f0960e809 100644 --- a/packages/@aws-cdk/aws-iam/lib/policy-document.ts +++ b/packages/@aws-cdk/aws-iam/lib/policy-document.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); -import { captureStackTrace, IPostProcessor } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { captureStackTrace, IPostProcessor } from '@aws-cdk/core'; import { PolicyStatement } from './policy-statement'; /** diff --git a/packages/@aws-cdk/aws-iam/lib/policy-statement.ts b/packages/@aws-cdk/aws-iam/lib/policy-statement.ts index ec3f58e5d8864..e10771a676b38 100644 --- a/packages/@aws-cdk/aws-iam/lib/policy-statement.ts +++ b/packages/@aws-cdk/aws-iam/lib/policy-statement.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { AccountPrincipal, AccountRootPrincipal, Anyone, ArnPrincipal, CanonicalUserPrincipal, FederatedPrincipal, IPrincipal, ServicePrincipal, ServicePrincipalOpts } from './principals'; import { mergePrincipal } from './util'; diff --git a/packages/@aws-cdk/aws-iam/lib/policy.ts b/packages/@aws-cdk/aws-iam/lib/policy.ts index 80e77de548471..0617aacf6a5a1 100644 --- a/packages/@aws-cdk/aws-iam/lib/policy.ts +++ b/packages/@aws-cdk/aws-iam/lib/policy.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { IGroup } from './group'; import { CfnPolicy } from './iam.generated'; import { PolicyDocument } from './policy-document'; diff --git a/packages/@aws-cdk/aws-iam/lib/principals.ts b/packages/@aws-cdk/aws-iam/lib/principals.ts index 42d8bc75fd1ee..2814b6adef3da 100644 --- a/packages/@aws-cdk/aws-iam/lib/principals.ts +++ b/packages/@aws-cdk/aws-iam/lib/principals.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); -import { captureStackTrace, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { captureStackTrace, Stack } from '@aws-cdk/core'; import { Default, RegionInfo } from '@aws-cdk/region-info'; import { PolicyStatement } from './policy-statement'; import { mergePrincipal } from './util'; diff --git a/packages/@aws-cdk/aws-iam/lib/role.ts b/packages/@aws-cdk/aws-iam/lib/role.ts index 90ed71a223ef9..25153769293fc 100644 --- a/packages/@aws-cdk/aws-iam/lib/role.ts +++ b/packages/@aws-cdk/aws-iam/lib/role.ts @@ -1,4 +1,4 @@ -import { Construct, Duration, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, Lazy, Resource, Stack } from '@aws-cdk/core'; import { Grant } from './grant'; import { CfnRole } from './iam.generated'; import { IIdentity } from './identity-base'; diff --git a/packages/@aws-cdk/aws-iam/lib/unknown-principal.ts b/packages/@aws-cdk/aws-iam/lib/unknown-principal.ts index 5b94fff6bf643..181d2780bc513 100644 --- a/packages/@aws-cdk/aws-iam/lib/unknown-principal.ts +++ b/packages/@aws-cdk/aws-iam/lib/unknown-principal.ts @@ -1,4 +1,4 @@ -import { IConstruct, Stack } from '@aws-cdk/cdk'; +import { IConstruct, Stack } from '@aws-cdk/core'; import { PolicyStatement } from './policy-statement'; import { IPrincipal, PrincipalPolicyFragment } from './principals'; diff --git a/packages/@aws-cdk/aws-iam/lib/user.ts b/packages/@aws-cdk/aws-iam/lib/user.ts index 506217c6abcd0..18bfbb1856a1d 100644 --- a/packages/@aws-cdk/aws-iam/lib/user.ts +++ b/packages/@aws-cdk/aws-iam/lib/user.ts @@ -1,4 +1,4 @@ -import { Construct, Lazy, Resource, SecretValue } from '@aws-cdk/cdk'; +import { Construct, Lazy, Resource, SecretValue } from '@aws-cdk/core'; import { IGroup } from './group'; import { CfnUser } from './iam.generated'; import { IIdentity } from './identity-base'; diff --git a/packages/@aws-cdk/aws-iam/lib/util.ts b/packages/@aws-cdk/aws-iam/lib/util.ts index 504b6922ba954..9203c0efbb6f7 100644 --- a/packages/@aws-cdk/aws-iam/lib/util.ts +++ b/packages/@aws-cdk/aws-iam/lib/util.ts @@ -1,4 +1,4 @@ -import { Lazy } from '@aws-cdk/cdk'; +import { Lazy } from '@aws-cdk/core'; import { IPolicy } from './policy'; const MAX_POLICY_NAME_LEN = 128; diff --git a/packages/@aws-cdk/aws-iam/package.json b/packages/@aws-cdk/aws-iam/package.json index 81485401ec8c5..ea07f1e683515 100644 --- a/packages/@aws-cdk/aws-iam/package.json +++ b/packages/@aws-cdk/aws-iam/package.json @@ -72,11 +72,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/region-info": "^0.35.0" }, "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/region-info": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", diff --git a/packages/@aws-cdk/aws-iam/test/example.attaching.lit.ts b/packages/@aws-cdk/aws-iam/test/example.attaching.lit.ts index 1f01efb1a5004..02509fb3a04f9 100644 --- a/packages/@aws-cdk/aws-iam/test/example.attaching.lit.ts +++ b/packages/@aws-cdk/aws-iam/test/example.attaching.lit.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); -import { SecretValue } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { SecretValue } from '@aws-cdk/core'; import { Group, Policy, User } from '../lib'; export class ExampleConstruct extends cdk.Construct { diff --git a/packages/@aws-cdk/aws-iam/test/example.external-id.lit.ts b/packages/@aws-cdk/aws-iam/test/example.external-id.lit.ts index 11f313559707b..37c7ff537bad1 100644 --- a/packages/@aws-cdk/aws-iam/test/example.external-id.lit.ts +++ b/packages/@aws-cdk/aws-iam/test/example.external-id.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import iam = require('../lib'); export class ExampleConstruct extends cdk.Construct { diff --git a/packages/@aws-cdk/aws-iam/test/example.managedpolicy.lit.ts b/packages/@aws-cdk/aws-iam/test/example.managedpolicy.lit.ts index 67483dfea6e6c..f1f2445e194fb 100644 --- a/packages/@aws-cdk/aws-iam/test/example.managedpolicy.lit.ts +++ b/packages/@aws-cdk/aws-iam/test/example.managedpolicy.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Group, ManagedPolicy } from '../lib'; export class ExampleConstruct extends cdk.Construct { diff --git a/packages/@aws-cdk/aws-iam/test/example.role.lit.ts b/packages/@aws-cdk/aws-iam/test/example.role.lit.ts index 16435effd71f5..6d8584526ac58 100644 --- a/packages/@aws-cdk/aws-iam/test/example.role.lit.ts +++ b/packages/@aws-cdk/aws-iam/test/example.role.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { PolicyStatement, Role, ServicePrincipal } from '../lib'; export class ExampleConstruct extends cdk.Construct { diff --git a/packages/@aws-cdk/aws-iam/test/integ.composite-principal.ts b/packages/@aws-cdk/aws-iam/test/integ.composite-principal.ts index cd41126ebcd23..9d22c7ea8d285 100644 --- a/packages/@aws-cdk/aws-iam/test/integ.composite-principal.ts +++ b/packages/@aws-cdk/aws-iam/test/integ.composite-principal.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import iam = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-iam/test/integ.group.ts b/packages/@aws-cdk/aws-iam/test/integ.group.ts index 3ed8b78e95b25..996eeca2841b1 100644 --- a/packages/@aws-cdk/aws-iam/test/integ.group.ts +++ b/packages/@aws-cdk/aws-iam/test/integ.group.ts @@ -1,6 +1,6 @@ // Creates a default group, with no users and no policy attached. -import { App, Stack } from "@aws-cdk/cdk"; +import { App, Stack } from "@aws-cdk/core"; import { Group } from "../lib"; const app = new App(); diff --git a/packages/@aws-cdk/aws-iam/test/integ.policy.ts b/packages/@aws-cdk/aws-iam/test/integ.policy.ts index 193643b3e166a..17f5ffac55778 100644 --- a/packages/@aws-cdk/aws-iam/test/integ.policy.ts +++ b/packages/@aws-cdk/aws-iam/test/integ.policy.ts @@ -1,4 +1,4 @@ -import { App, Stack } from "@aws-cdk/cdk"; +import { App, Stack } from "@aws-cdk/core"; import { Policy, PolicyStatement } from "../lib"; import { User } from "../lib/user"; diff --git a/packages/@aws-cdk/aws-iam/test/integ.role.ts b/packages/@aws-cdk/aws-iam/test/integ.role.ts index b18b429db597f..7a6bc25df3186 100644 --- a/packages/@aws-cdk/aws-iam/test/integ.role.ts +++ b/packages/@aws-cdk/aws-iam/test/integ.role.ts @@ -1,4 +1,4 @@ -import { App, Stack } from "@aws-cdk/cdk"; +import { App, Stack } from "@aws-cdk/core"; import { AccountRootPrincipal, Policy, PolicyStatement, Role, ServicePrincipal } from "../lib"; const app = new App(); diff --git a/packages/@aws-cdk/aws-iam/test/integ.user.ts b/packages/@aws-cdk/aws-iam/test/integ.user.ts index 6870ac52ea550..044464d3ff77b 100644 --- a/packages/@aws-cdk/aws-iam/test/integ.user.ts +++ b/packages/@aws-cdk/aws-iam/test/integ.user.ts @@ -1,4 +1,4 @@ -import { App, SecretValue, Stack } from "@aws-cdk/cdk"; +import { App, SecretValue, Stack } from "@aws-cdk/core"; import { User } from "../lib"; const app = new App(); diff --git a/packages/@aws-cdk/aws-iam/test/integ.users-and-groups.ts b/packages/@aws-cdk/aws-iam/test/integ.users-and-groups.ts index b332ed31c215e..f4cee3750a699 100644 --- a/packages/@aws-cdk/aws-iam/test/integ.users-and-groups.ts +++ b/packages/@aws-cdk/aws-iam/test/integ.users-and-groups.ts @@ -1,4 +1,4 @@ -import { App, Stack } from "@aws-cdk/cdk"; +import { App, Stack } from "@aws-cdk/core"; import { Group, Policy, PolicyStatement, User } from "../lib"; const app = new App(); diff --git a/packages/@aws-cdk/aws-iam/test/test.auto-cross-stack-refs.ts b/packages/@aws-cdk/aws-iam/test/test.auto-cross-stack-refs.ts index 4697f93d81167..262bced9d1401 100644 --- a/packages/@aws-cdk/aws-iam/test/test.auto-cross-stack-refs.ts +++ b/packages/@aws-cdk/aws-iam/test/test.auto-cross-stack-refs.ts @@ -1,5 +1,5 @@ import { expect, SynthUtils } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import iam = require('../lib'); diff --git a/packages/@aws-cdk/aws-iam/test/test.escape-hatch.ts b/packages/@aws-cdk/aws-iam/test/test.escape-hatch.ts index 0a1719ead0ea4..b12bcaee0a4ec 100644 --- a/packages/@aws-cdk/aws-iam/test/test.escape-hatch.ts +++ b/packages/@aws-cdk/aws-iam/test/test.escape-hatch.ts @@ -1,8 +1,8 @@ // tests for the L1 escape hatches (overrides). those are in the IAM module // because we want to verify them end-to-end, as a complement to the unit -// tests in the @aws-cdk/cdk module +// tests in the @aws-cdk/core module import { expect } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import iam = require('../lib'); diff --git a/packages/@aws-cdk/aws-iam/test/test.grant.ts b/packages/@aws-cdk/aws-iam/test/test.grant.ts index 942d12f5560d4..c6346ada5fd4c 100644 --- a/packages/@aws-cdk/aws-iam/test/test.grant.ts +++ b/packages/@aws-cdk/aws-iam/test/test.grant.ts @@ -1,4 +1,4 @@ -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Grant } from '../lib'; import iam = require('../lib'); diff --git a/packages/@aws-cdk/aws-iam/test/test.group.ts b/packages/@aws-cdk/aws-iam/test/test.group.ts index d0ff150a69809..274b705a66b29 100644 --- a/packages/@aws-cdk/aws-iam/test/test.group.ts +++ b/packages/@aws-cdk/aws-iam/test/test.group.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { App, Stack } from '@aws-cdk/cdk'; +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Group, User } from '../lib'; diff --git a/packages/@aws-cdk/aws-iam/test/test.lazy-role.ts b/packages/@aws-cdk/aws-iam/test/test.lazy-role.ts index ef298e2131abe..1480bb2d74838 100644 --- a/packages/@aws-cdk/aws-iam/test/test.lazy-role.ts +++ b/packages/@aws-cdk/aws-iam/test/test.lazy-role.ts @@ -1,5 +1,5 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import nodeunit = require('nodeunit'); import iam = require('../lib'); diff --git a/packages/@aws-cdk/aws-iam/test/test.managed-policy.ts b/packages/@aws-cdk/aws-iam/test/test.managed-policy.ts index 00d2fa67646a3..c80947e8412a6 100644 --- a/packages/@aws-cdk/aws-iam/test/test.managed-policy.ts +++ b/packages/@aws-cdk/aws-iam/test/test.managed-policy.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { ManagedPolicy } from '../lib'; diff --git a/packages/@aws-cdk/aws-iam/test/test.policy-document.ts b/packages/@aws-cdk/aws-iam/test/test.policy-document.ts index 7da37983c8221..2062c0d3c1dd3 100644 --- a/packages/@aws-cdk/aws-iam/test/test.policy-document.ts +++ b/packages/@aws-cdk/aws-iam/test/test.policy-document.ts @@ -1,4 +1,4 @@ -import { Lazy, Stack, Token } from '@aws-cdk/cdk'; +import { Lazy, Stack, Token } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Anyone, AnyPrincipal, CanonicalUserPrincipal, Effect, IPrincipal, PolicyDocument, PolicyStatement } from '../lib'; import { ArnPrincipal, CompositePrincipal, FederatedPrincipal, PrincipalPolicyFragment, ServicePrincipal } from '../lib'; diff --git a/packages/@aws-cdk/aws-iam/test/test.policy.ts b/packages/@aws-cdk/aws-iam/test/test.policy.ts index fd2530c6ab835..7fe0fb17affb6 100644 --- a/packages/@aws-cdk/aws-iam/test/test.policy.ts +++ b/packages/@aws-cdk/aws-iam/test/test.policy.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { App, Stack } from '@aws-cdk/cdk'; +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Group, Policy, PolicyStatement, Role, ServicePrincipal, User } from '../lib'; import { generatePolicyName } from '../lib/util'; diff --git a/packages/@aws-cdk/aws-iam/test/test.role.ts b/packages/@aws-cdk/aws-iam/test/test.role.ts index 0191a841825f0..a4375d292d666 100644 --- a/packages/@aws-cdk/aws-iam/test/test.role.ts +++ b/packages/@aws-cdk/aws-iam/test/test.role.ts @@ -1,5 +1,5 @@ import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ArnPrincipal, CompositePrincipal, FederatedPrincipal, PolicyStatement, Role, ServicePrincipal, User } from '../lib'; diff --git a/packages/@aws-cdk/aws-iam/test/test.user.ts b/packages/@aws-cdk/aws-iam/test/test.user.ts index 4cc7d827b122b..62a708605f861 100644 --- a/packages/@aws-cdk/aws-iam/test/test.user.ts +++ b/packages/@aws-cdk/aws-iam/test/test.user.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { App, SecretValue, Stack } from '@aws-cdk/cdk'; +import { App, SecretValue, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { User } from '../lib'; diff --git a/packages/@aws-cdk/aws-inspector/package.json b/packages/@aws-cdk/aws-inspector/package.json index 509bcc3de90fa..f606fbf2078ed 100644 --- a/packages/@aws-cdk/aws-inspector/package.json +++ b/packages/@aws-cdk/aws-inspector/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-iot/package.json b/packages/@aws-cdk/aws-iot/package.json index b815c1fd231c4..ea9813648f66d 100644 --- a/packages/@aws-cdk/aws-iot/package.json +++ b/packages/@aws-cdk/aws-iot/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-iot1click/package.json b/packages/@aws-cdk/aws-iot1click/package.json index 1e6b489017f06..e2778024dde08 100644 --- a/packages/@aws-cdk/aws-iot1click/package.json +++ b/packages/@aws-cdk/aws-iot1click/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" diff --git a/packages/@aws-cdk/aws-iotanalytics/package.json b/packages/@aws-cdk/aws-iotanalytics/package.json index 34cbb3d558240..536a3555db69b 100644 --- a/packages/@aws-cdk/aws-iotanalytics/package.json +++ b/packages/@aws-cdk/aws-iotanalytics/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" diff --git a/packages/@aws-cdk/aws-iotthingsgraph/package.json b/packages/@aws-cdk/aws-iotthingsgraph/package.json index 33480e32139f7..528b43d9c51f8 100644 --- a/packages/@aws-cdk/aws-iotthingsgraph/package.json +++ b/packages/@aws-cdk/aws-iotthingsgraph/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" diff --git a/packages/@aws-cdk/aws-kinesis/lib/stream.ts b/packages/@aws-cdk/aws-kinesis/lib/stream.ts index 77a53c6841616..0eb91be4577d0 100644 --- a/packages/@aws-cdk/aws-kinesis/lib/stream.ts +++ b/packages/@aws-cdk/aws-kinesis/lib/stream.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { Construct, IResource, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource, Stack } from '@aws-cdk/core'; import { CfnStream } from './kinesis.generated'; export interface IStream extends IResource { diff --git a/packages/@aws-cdk/aws-kinesis/package.json b/packages/@aws-cdk/aws-kinesis/package.json index 1ec863ffca9e8..73a25e6af2b9b 100644 --- a/packages/@aws-cdk/aws-kinesis/package.json +++ b/packages/@aws-cdk/aws-kinesis/package.json @@ -71,14 +71,14 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-kinesis/test/test.stream.ts b/packages/@aws-cdk/aws-kinesis/test/test.stream.ts index c784c27de1e02..151d886b66fde 100644 --- a/packages/@aws-cdk/aws-kinesis/test/test.stream.ts +++ b/packages/@aws-cdk/aws-kinesis/test/test.stream.ts @@ -1,7 +1,7 @@ import { expect } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { App, Stack } from '@aws-cdk/cdk'; +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Stream, StreamEncryption } from '../lib'; diff --git a/packages/@aws-cdk/aws-kinesisanalytics/package.json b/packages/@aws-cdk/aws-kinesisanalytics/package.json index ea31ce5aed0f7..0da074e49a519 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics/package.json +++ b/packages/@aws-cdk/aws-kinesisanalytics/package.json @@ -72,11 +72,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-kinesisfirehose/package.json b/packages/@aws-cdk/aws-kinesisfirehose/package.json index d763d829e8d77..6679efdec0fbc 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose/package.json +++ b/packages/@aws-cdk/aws-kinesisfirehose/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-kms/lib/alias.ts b/packages/@aws-cdk/aws-kms/lib/alias.ts index 416c28f34ef68..ea5f6b2259635 100644 --- a/packages/@aws-cdk/aws-kms/lib/alias.ts +++ b/packages/@aws-cdk/aws-kms/lib/alias.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Resource, Token } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource, Token } from '@aws-cdk/core'; import { IKey } from './key'; import { CfnAlias } from './kms.generated'; diff --git a/packages/@aws-cdk/aws-kms/lib/key.ts b/packages/@aws-cdk/aws-kms/lib/key.ts index e69f997ad5695..3fd989d154a45 100644 --- a/packages/@aws-cdk/aws-kms/lib/key.ts +++ b/packages/@aws-cdk/aws-kms/lib/key.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import { PolicyDocument, PolicyStatement } from '@aws-cdk/aws-iam'; -import { Construct, IResource, RemovalPolicy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, RemovalPolicy, Resource, Stack } from '@aws-cdk/core'; import { Alias } from './alias'; import { CfnKey } from './kms.generated'; diff --git a/packages/@aws-cdk/aws-kms/package.json b/packages/@aws-cdk/aws-kms/package.json index 2e9ec59da5169..af1b0c418826c 100644 --- a/packages/@aws-cdk/aws-kms/package.json +++ b/packages/@aws-cdk/aws-kms/package.json @@ -71,12 +71,12 @@ }, "dependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-kms/test/integ.key-sharing.lit.ts b/packages/@aws-cdk/aws-kms/test/integ.key-sharing.lit.ts index d3a80ccdc0b83..6e7026edb8f45 100644 --- a/packages/@aws-cdk/aws-kms/test/integ.key-sharing.lit.ts +++ b/packages/@aws-cdk/aws-kms/test/integ.key-sharing.lit.ts @@ -1,6 +1,6 @@ /// !cdk-integ * -import cdk = require('@aws-cdk/cdk'); -import { RemovalPolicy } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { RemovalPolicy } from '@aws-cdk/core'; import kms = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-kms/test/integ.key.ts b/packages/@aws-cdk/aws-kms/test/integ.key.ts index 377a57a3458dc..b2ab19f4bbe05 100644 --- a/packages/@aws-cdk/aws-kms/test/integ.key.ts +++ b/packages/@aws-cdk/aws-kms/test/integ.key.ts @@ -1,6 +1,6 @@ import { PolicyStatement } from '@aws-cdk/aws-iam'; import iam = require('@aws-cdk/aws-iam'); -import { App, RemovalPolicy, Stack } from '@aws-cdk/cdk'; +import { App, RemovalPolicy, Stack } from '@aws-cdk/core'; import { Key } from '../lib'; const app = new App(); diff --git a/packages/@aws-cdk/aws-kms/test/test.alias.ts b/packages/@aws-cdk/aws-kms/test/test.alias.ts index c4d3d0219b840..e7f5f1ea9a6ff 100644 --- a/packages/@aws-cdk/aws-kms/test/test.alias.ts +++ b/packages/@aws-cdk/aws-kms/test/test.alias.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { App, Stack } from '@aws-cdk/cdk'; +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Key } from '../lib'; import { Alias } from '../lib/alias'; diff --git a/packages/@aws-cdk/aws-kms/test/test.key.ts b/packages/@aws-cdk/aws-kms/test/test.key.ts index 5a013cf3e18a7..30a429c40b31f 100644 --- a/packages/@aws-cdk/aws-kms/test/test.key.ts +++ b/packages/@aws-cdk/aws-kms/test/test.key.ts @@ -1,6 +1,6 @@ import { exactlyMatchTemplate, expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import { PolicyStatement, User } from '@aws-cdk/aws-iam'; -import { App, RemovalPolicy, Stack, Tag } from '@aws-cdk/cdk'; +import { App, RemovalPolicy, Stack, Tag } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Key } from '../lib'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/lib/api.ts b/packages/@aws-cdk/aws-lambda-event-sources/lib/api.ts index d6f618cb5b4b4..8dae175ff4db3 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/lib/api.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/lib/api.ts @@ -1,6 +1,6 @@ import apigw = require('@aws-cdk/aws-apigateway'); import lambda = require('@aws-cdk/aws-lambda'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; export class ApiEventSource implements lambda.IEventSource { constructor(private readonly method: string, private readonly path: string, private readonly options?: apigw.MethodOptions) { diff --git a/packages/@aws-cdk/aws-lambda-event-sources/package.json b/packages/@aws-cdk/aws-lambda-event-sources/package.json index a159830401a84..7c062b2bfd59e 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/package.json +++ b/packages/@aws-cdk/aws-lambda-event-sources/package.json @@ -73,7 +73,7 @@ "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sns-subscriptions": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -88,7 +88,7 @@ "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sns-subscriptions": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.ts index 6069440dd7014..f7402d883b58f 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.ts @@ -1,6 +1,6 @@ import dynamodb = require('@aws-cdk/aws-dynamodb'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { DynamoEventSource } from '../lib'; import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.ts index f4670fe3e341f..2d31fa25c2860 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.ts @@ -1,6 +1,6 @@ import kinesis = require('@aws-cdk/aws-kinesis'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { KinesisEventSource } from '../lib'; import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.ts index 18b118c1ed0a1..8b252084d74d9 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { S3EventSource } from '../lib'; import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.ts index 0964f992a157e..80731455bfcc5 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.ts @@ -1,5 +1,5 @@ import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { SnsEventSource } from '../lib'; import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.ts index 3d9589f2669e0..b3c4906331624 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.ts @@ -1,5 +1,5 @@ import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { SqsEventSource } from '../lib'; import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts index e48a6dd005527..242c6a2696074 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts @@ -1,5 +1,5 @@ import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export class TestFunction extends lambda.Function { constructor(scope: cdk.Construct, id: string) { diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test.api.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test.api.ts index a0681f36a765d..a24bba25890ce 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test.api.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test.api.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import events = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test.dynamo.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test.dynamo.ts index e51cbf01d32d9..64080ad6ba1bf 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test.dynamo.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test.dynamo.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import dynamodb = require('@aws-cdk/aws-dynamodb'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import sources = require('../lib'); import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test.kinesis.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test.kinesis.ts index d28e90f4daabb..93050af864f3d 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test.kinesis.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test.kinesis.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import kinesis = require('@aws-cdk/aws-kinesis'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import sources = require('../lib'); import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test.s3.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test.s3.ts index e8c11a5aa1999..24d6801aff3bd 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test.s3.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test.s3.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import sources = require('../lib'); import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test.sns.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test.sns.ts index bcac2b353c278..5557423b93043 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test.sns.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test.sns.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import sources = require('../lib'); import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test.sqs.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test.sqs.ts index b93568fa28d24..15b7c2720072b 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test.sqs.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test.sqs.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import sources = require('../lib'); import { TestFunction } from './test-function'; diff --git a/packages/@aws-cdk/aws-lambda/lib/alias.ts b/packages/@aws-cdk/aws-lambda/lib/alias.ts index 4845d6e374008..509591296151f 100644 --- a/packages/@aws-cdk/aws-lambda/lib/alias.ts +++ b/packages/@aws-cdk/aws-lambda/lib/alias.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { IFunction, QualifiedFunctionBase } from './function-base'; import { IVersion } from './lambda-version'; import { CfnAlias } from './lambda.generated'; diff --git a/packages/@aws-cdk/aws-lambda/lib/code.ts b/packages/@aws-cdk/aws-lambda/lib/code.ts index 350656ec1c892..49a90431a6995 100644 --- a/packages/@aws-cdk/aws-lambda/lib/code.ts +++ b/packages/@aws-cdk/aws-lambda/lib/code.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); import s3_assets = require('@aws-cdk/aws-s3-assets'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnFunction } from './lambda.generated'; export abstract class Code { diff --git a/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts b/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts index 25d7e2312843b..83b126326cd9e 100644 --- a/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts +++ b/packages/@aws-cdk/aws-lambda/lib/event-source-mapping.ts @@ -1,5 +1,5 @@ -import cdk = require('@aws-cdk/cdk'); -import { Resource } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Resource } from '@aws-cdk/core'; import { IFunction } from './function-base'; import { CfnEventSourceMapping } from './lambda.generated'; diff --git a/packages/@aws-cdk/aws-lambda/lib/function-base.ts b/packages/@aws-cdk/aws-lambda/lib/function-base.ts index c79ed1e4f8ba0..4615ecc239b30 100644 --- a/packages/@aws-cdk/aws-lambda/lib/function-base.ts +++ b/packages/@aws-cdk/aws-lambda/lib/function-base.ts @@ -1,7 +1,7 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); -import { IResource, Resource } from '@aws-cdk/cdk'; +import { IResource, Resource } from '@aws-cdk/core'; import { IEventSource } from './event-source'; import { EventSourceMapping, EventSourceMappingOptions } from './event-source-mapping'; import { IVersion } from './lambda-version'; diff --git a/packages/@aws-cdk/aws-lambda/lib/function.ts b/packages/@aws-cdk/aws-lambda/lib/function.ts index bda70da7dcef3..f31e3142b9435 100644 --- a/packages/@aws-cdk/aws-lambda/lib/function.ts +++ b/packages/@aws-cdk/aws-lambda/lib/function.ts @@ -3,7 +3,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import logs = require('@aws-cdk/aws-logs'); import sqs = require('@aws-cdk/aws-sqs'); -import { Construct, Duration, Fn, Lazy, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, Duration, Fn, Lazy, Stack, Token } from '@aws-cdk/core'; import { Code } from './code'; import { IEventSource } from './event-source'; import { FunctionAttributes, FunctionBase, IFunction } from './function-base'; diff --git a/packages/@aws-cdk/aws-lambda/lib/lambda-version.ts b/packages/@aws-cdk/aws-lambda/lib/lambda-version.ts index c8b0daa36425b..07b3a2287ea25 100644 --- a/packages/@aws-cdk/aws-lambda/lib/lambda-version.ts +++ b/packages/@aws-cdk/aws-lambda/lib/lambda-version.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { IFunction, QualifiedFunctionBase } from './function-base'; import { CfnVersion } from './lambda.generated'; diff --git a/packages/@aws-cdk/aws-lambda/lib/layers.ts b/packages/@aws-cdk/aws-lambda/lib/layers.ts index 0a7320ca81d2d..da6c28cc4736b 100644 --- a/packages/@aws-cdk/aws-lambda/lib/layers.ts +++ b/packages/@aws-cdk/aws-lambda/lib/layers.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { Code } from './code'; import { CfnLayerVersion, CfnLayerVersionPermission } from './lambda.generated'; import { Runtime } from './runtime'; diff --git a/packages/@aws-cdk/aws-lambda/lib/log-retention.ts b/packages/@aws-cdk/aws-lambda/lib/log-retention.ts index 0e49857094f96..f5f3a9ddf5f30 100644 --- a/packages/@aws-cdk/aws-lambda/lib/log-retention.ts +++ b/packages/@aws-cdk/aws-lambda/lib/log-retention.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import { Code } from './code'; import { Runtime } from './runtime'; diff --git a/packages/@aws-cdk/aws-lambda/lib/singleton-lambda.ts b/packages/@aws-cdk/aws-lambda/lib/singleton-lambda.ts index 08025d5dc3636..936a441f49bc7 100644 --- a/packages/@aws-cdk/aws-lambda/lib/singleton-lambda.ts +++ b/packages/@aws-cdk/aws-lambda/lib/singleton-lambda.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); -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 { Function as LambdaFunction, FunctionProps } from './function'; import { FunctionBase, IFunction } from './function-base'; import { Permission } from './permission'; diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json index a87578a3f8ad4..c3c8510b658e3 100644 --- a/packages/@aws-cdk/aws-lambda/package.json +++ b/packages/@aws-cdk/aws-lambda/package.json @@ -91,7 +91,7 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", @@ -104,7 +104,7 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "engines": { diff --git a/packages/@aws-cdk/aws-lambda/test/integ.assets.file.ts b/packages/@aws-cdk/aws-lambda/test/integ.assets.file.ts index b3aa328d27567..49b2259199982 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.assets.file.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.assets.file.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.assets.lit.ts b/packages/@aws-cdk/aws-lambda/test/integ.assets.lit.ts index d82e249645fce..0fa19e3986b49 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.assets.lit.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.assets.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts b/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts index 4832356abd86d..3c62f6bf5566a 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import lambda = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts b/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts index 89ec3b6a1bf22..f719e8730152f 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts b/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts index c9ada091a6b14..c13e543d30937 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts @@ -1,5 +1,5 @@ import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import lambda = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.ts b/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.ts index d554bd91f73a9..9d66205b9868b 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import lambda = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-lambda/test/test.alias.ts b/packages/@aws-cdk/aws-lambda/test/test.alias.ts index 14d53123702fb..1964cf5efbdd0 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.alias.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.alias.ts @@ -1,6 +1,6 @@ import { beASupersetOfTemplate, expect, haveResource, haveResourceLike } from '@aws-cdk/assert'; import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.code.ts b/packages/@aws-cdk/aws-lambda/test/test.code.ts index d262c9b56715b..890d068a5a138 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.code.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.code.ts @@ -1,5 +1,5 @@ import { expect, haveResource, haveResourceLike, ResourcePart } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cxapi = require('@aws-cdk/cx-api'); import { Test } from 'nodeunit'; import path = require('path'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.function.ts b/packages/@aws-cdk/aws-lambda/test/test.function.ts index f1b142c4ef910..1cfdc3e90ec12 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.function.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.function.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import _ = require('lodash'); import {Test, testCase} from 'nodeunit'; import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts index dfe4406cc74ec..576963b73b75f 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts @@ -2,7 +2,7 @@ import { expect, haveResource, MatchStyle, ResourcePart } from '@aws-cdk/assert' import iam = require('@aws-cdk/aws-iam'); import logs = require('@aws-cdk/aws-logs'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import path = require('path'); import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.layers.ts b/packages/@aws-cdk/aws-lambda/test/test.layers.ts index ef27acff52839..2f7164278ebee 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.layers.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.layers.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test, testCase } from 'nodeunit'; import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.log-retention.ts b/packages/@aws-cdk/aws-lambda/test/test.log-retention.ts index 94fe1791b9303..c709434d8de1f 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.log-retention.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.log-retention.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { LogRetention } from '../lib/log-retention'; diff --git a/packages/@aws-cdk/aws-lambda/test/test.singleton-lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.singleton-lambda.ts index 74b02f61e6890..e1997a1a8e630 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.singleton-lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.singleton-lambda.ts @@ -1,5 +1,5 @@ import { expect, matchTemplate } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts index ffebc2289da5a..16eab5c38c1d8 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { ICallbackFunction, Test } from 'nodeunit'; import lambda = require('../lib'); diff --git a/packages/@aws-cdk/aws-logs-destinations/lib/kinesis.ts b/packages/@aws-cdk/aws-logs-destinations/lib/kinesis.ts index 415120986d1ff..8d00cb18b163c 100644 --- a/packages/@aws-cdk/aws-logs-destinations/lib/kinesis.ts +++ b/packages/@aws-cdk/aws-logs-destinations/lib/kinesis.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import kinesis = require('@aws-cdk/aws-kinesis'); import logs = require('@aws-cdk/aws-logs'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use a Kinesis stream as the destination for a log subscription diff --git a/packages/@aws-cdk/aws-logs-destinations/lib/lambda.ts b/packages/@aws-cdk/aws-logs-destinations/lib/lambda.ts index 3abf9b824f96f..562ec263c03f2 100644 --- a/packages/@aws-cdk/aws-logs-destinations/lib/lambda.ts +++ b/packages/@aws-cdk/aws-logs-destinations/lib/lambda.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); import logs = require('@aws-cdk/aws-logs'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use a Lamda Function as the destination for a log subscription diff --git a/packages/@aws-cdk/aws-logs-destinations/package.json b/packages/@aws-cdk/aws-logs-destinations/package.json index 4a2106cb133ee..7f45b8778570f 100644 --- a/packages/@aws-cdk/aws-logs-destinations/package.json +++ b/packages/@aws-cdk/aws-logs-destinations/package.json @@ -80,7 +80,7 @@ "@aws-cdk/aws-kinesis": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -88,7 +88,7 @@ "@aws-cdk/aws-kinesis": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-logs-destinations/test/kinesis.test.ts b/packages/@aws-cdk/aws-logs-destinations/test/kinesis.test.ts index 63dc4871a6746..5da43ceda25e7 100644 --- a/packages/@aws-cdk/aws-logs-destinations/test/kinesis.test.ts +++ b/packages/@aws-cdk/aws-logs-destinations/test/kinesis.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import kinesis = require('@aws-cdk/aws-kinesis'); import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import dests = require('../lib'); test('stream can be subscription destination', () => { diff --git a/packages/@aws-cdk/aws-logs-destinations/test/lambda.test.ts b/packages/@aws-cdk/aws-logs-destinations/test/lambda.test.ts index 6b6025f3045f3..319a588522ae4 100644 --- a/packages/@aws-cdk/aws-logs-destinations/test/lambda.test.ts +++ b/packages/@aws-cdk/aws-logs-destinations/test/lambda.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import lambda = require('@aws-cdk/aws-lambda'); import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import dests = require('../lib'); test('lambda can be used as metric subscription destination', () => { diff --git a/packages/@aws-cdk/aws-logs/lib/cross-account-destination.ts b/packages/@aws-cdk/aws-logs/lib/cross-account-destination.ts index b49f8c86cab01..2c9814d34872e 100644 --- a/packages/@aws-cdk/aws-logs/lib/cross-account-destination.ts +++ b/packages/@aws-cdk/aws-logs/lib/cross-account-destination.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); -import { Construct, Lazy, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Construct, Lazy, Stack } from '@aws-cdk/core'; import { ILogGroup } from './log-group'; import { CfnDestination } from './logs.generated'; import { ILogSubscriptionDestination, LogSubscriptionDestinationConfig } from './subscription-filter'; diff --git a/packages/@aws-cdk/aws-logs/lib/log-group.ts b/packages/@aws-cdk/aws-logs/lib/log-group.ts index b30c665748906..c3095413f35d0 100644 --- a/packages/@aws-cdk/aws-logs/lib/log-group.ts +++ b/packages/@aws-cdk/aws-logs/lib/log-group.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import iam = require('@aws-cdk/aws-iam'); -import { Construct, IResource, RemovalPolicy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, RemovalPolicy, Resource, Stack } from '@aws-cdk/core'; import { LogStream } from './log-stream'; import { CfnLogGroup } from './logs.generated'; import { MetricFilter } from './metric-filter'; diff --git a/packages/@aws-cdk/aws-logs/lib/log-stream.ts b/packages/@aws-cdk/aws-logs/lib/log-stream.ts index 776cbd834b325..952f979577da5 100644 --- a/packages/@aws-cdk/aws-logs/lib/log-stream.ts +++ b/packages/@aws-cdk/aws-logs/lib/log-stream.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, RemovalPolicy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, RemovalPolicy, Resource } from '@aws-cdk/core'; import { ILogGroup } from './log-group'; import { CfnLogStream } from './logs.generated'; diff --git a/packages/@aws-cdk/aws-logs/lib/metric-filter.ts b/packages/@aws-cdk/aws-logs/lib/metric-filter.ts index e66cb831a1b71..58d164048e37f 100644 --- a/packages/@aws-cdk/aws-logs/lib/metric-filter.ts +++ b/packages/@aws-cdk/aws-logs/lib/metric-filter.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { ILogGroup, MetricFilterOptions } from './log-group'; import { CfnMetricFilter } from './logs.generated'; diff --git a/packages/@aws-cdk/aws-logs/lib/subscription-filter.ts b/packages/@aws-cdk/aws-logs/lib/subscription-filter.ts index db6677f7d32fe..59fb432adbc1f 100644 --- a/packages/@aws-cdk/aws-logs/lib/subscription-filter.ts +++ b/packages/@aws-cdk/aws-logs/lib/subscription-filter.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { ILogGroup, SubscriptionFilterOptions } from './log-group'; import { CfnSubscriptionFilter } from './logs.generated'; diff --git a/packages/@aws-cdk/aws-logs/package.json b/packages/@aws-cdk/aws-logs/package.json index 8187007490984..cc1f7d816d533 100644 --- a/packages/@aws-cdk/aws-logs/package.json +++ b/packages/@aws-cdk/aws-logs/package.json @@ -72,13 +72,13 @@ "dependencies": { "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-logs/test/example.retention.lit.ts b/packages/@aws-cdk/aws-logs/test/example.retention.lit.ts index 230eec2e165a5..75e3c4b11308b 100644 --- a/packages/@aws-cdk/aws-logs/test/example.retention.lit.ts +++ b/packages/@aws-cdk/aws-logs/test/example.retention.lit.ts @@ -1,4 +1,4 @@ -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { LogGroup, RetentionDays } from '../lib'; const stack = new Stack(); diff --git a/packages/@aws-cdk/aws-logs/test/integ.metricfilter.lit.ts b/packages/@aws-cdk/aws-logs/test/integ.metricfilter.lit.ts index 336171b5a4452..719c3be77ab08 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.metricfilter.lit.ts +++ b/packages/@aws-cdk/aws-logs/test/integ.metricfilter.lit.ts @@ -1,4 +1,4 @@ -import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/cdk'; +import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core'; import { FilterPattern, LogGroup, MetricFilter } from '../lib'; class MetricFilterIntegStack extends Stack { diff --git a/packages/@aws-cdk/aws-logs/test/test.destination.ts b/packages/@aws-cdk/aws-logs/test/test.destination.ts index 9d42a6f3852c4..15705a9387e03 100644 --- a/packages/@aws-cdk/aws-logs/test/test.destination.ts +++ b/packages/@aws-cdk/aws-logs/test/test.destination.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { CrossAccountDestination } from '../lib'; diff --git a/packages/@aws-cdk/aws-logs/test/test.loggroup.ts b/packages/@aws-cdk/aws-logs/test/test.loggroup.ts index bf76be856c59a..a66093405192e 100644 --- a/packages/@aws-cdk/aws-logs/test/test.loggroup.ts +++ b/packages/@aws-cdk/aws-logs/test/test.loggroup.ts @@ -1,6 +1,6 @@ import { expect, haveResource, matchTemplate } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import { RemovalPolicy, Stack } from '@aws-cdk/cdk'; +import { RemovalPolicy, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { LogGroup, RetentionDays } from '../lib'; diff --git a/packages/@aws-cdk/aws-logs/test/test.logstream.ts b/packages/@aws-cdk/aws-logs/test/test.logstream.ts index cbafdb2a96479..87a3e9297ac2a 100644 --- a/packages/@aws-cdk/aws-logs/test/test.logstream.ts +++ b/packages/@aws-cdk/aws-logs/test/test.logstream.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { LogGroup, LogStream } from '../lib'; diff --git a/packages/@aws-cdk/aws-logs/test/test.metricfilter.ts b/packages/@aws-cdk/aws-logs/test/test.metricfilter.ts index 84b612dd2031b..cd0f60aa5cbb5 100644 --- a/packages/@aws-cdk/aws-logs/test/test.metricfilter.ts +++ b/packages/@aws-cdk/aws-logs/test/test.metricfilter.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { FilterPattern, LogGroup, MetricFilter } from '../lib'; diff --git a/packages/@aws-cdk/aws-logs/test/test.subscriptionfilter.ts b/packages/@aws-cdk/aws-logs/test/test.subscriptionfilter.ts index b2063fc70035c..b612a7b8a29a8 100644 --- a/packages/@aws-cdk/aws-logs/test/test.subscriptionfilter.ts +++ b/packages/@aws-cdk/aws-logs/test/test.subscriptionfilter.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Construct, Stack } from '@aws-cdk/cdk'; +import { Construct, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { FilterPattern, ILogGroup, ILogSubscriptionDestination, LogGroup, SubscriptionFilter } from '../lib'; diff --git a/packages/@aws-cdk/aws-mediastore/package.json b/packages/@aws-cdk/aws-mediastore/package.json index 71bd9fb67e20d..bb6c488d67fe5 100644 --- a/packages/@aws-cdk/aws-mediastore/package.json +++ b/packages/@aws-cdk/aws-mediastore/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" diff --git a/packages/@aws-cdk/aws-msk/package.json b/packages/@aws-cdk/aws-msk/package.json index 1e766a048437f..829b575d14832 100644 --- a/packages/@aws-cdk/aws-msk/package.json +++ b/packages/@aws-cdk/aws-msk/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" diff --git a/packages/@aws-cdk/aws-neptune/package.json b/packages/@aws-cdk/aws-neptune/package.json index 44f0e78668c75..4d6565cc0332d 100644 --- a/packages/@aws-cdk/aws-neptune/package.json +++ b/packages/@aws-cdk/aws-neptune/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" diff --git a/packages/@aws-cdk/aws-opsworks/package.json b/packages/@aws-cdk/aws-opsworks/package.json index 39a98330000cc..551cd63a31573 100644 --- a/packages/@aws-cdk/aws-opsworks/package.json +++ b/packages/@aws-cdk/aws-opsworks/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-opsworkscm/package.json b/packages/@aws-cdk/aws-opsworkscm/package.json index 0cd7ad6188a61..684d87e3759f1 100644 --- a/packages/@aws-cdk/aws-opsworkscm/package.json +++ b/packages/@aws-cdk/aws-opsworkscm/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" diff --git a/packages/@aws-cdk/aws-pinpoint/package.json b/packages/@aws-cdk/aws-pinpoint/package.json index 753a3285f1864..1790fbfd507e6 100644 --- a/packages/@aws-cdk/aws-pinpoint/package.json +++ b/packages/@aws-cdk/aws-pinpoint/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" diff --git a/packages/@aws-cdk/aws-pinpointemail/package.json b/packages/@aws-cdk/aws-pinpointemail/package.json index bc95d6b506d71..ef44260874d0d 100644 --- a/packages/@aws-cdk/aws-pinpointemail/package.json +++ b/packages/@aws-cdk/aws-pinpointemail/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" diff --git a/packages/@aws-cdk/aws-ram/package.json b/packages/@aws-cdk/aws-ram/package.json index a5e78e542302e..c95b1c4fd0780 100644 --- a/packages/@aws-cdk/aws-ram/package.json +++ b/packages/@aws-cdk/aws-ram/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" diff --git a/packages/@aws-cdk/aws-rds/lib/cluster-ref.ts b/packages/@aws-cdk/aws-rds/lib/cluster-ref.ts index 9250b27ac9766..f9fab146684d4 100644 --- a/packages/@aws-cdk/aws-rds/lib/cluster-ref.ts +++ b/packages/@aws-cdk/aws-rds/lib/cluster-ref.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import { IResource } from '@aws-cdk/cdk'; +import { IResource } from '@aws-cdk/core'; import { Endpoint } from './endpoint'; /** diff --git a/packages/@aws-cdk/aws-rds/lib/cluster.ts b/packages/@aws-cdk/aws-rds/lib/cluster.ts index 2ee89e606cfb7..c8bc4b6ab57b1 100644 --- a/packages/@aws-cdk/aws-rds/lib/cluster.ts +++ b/packages/@aws-cdk/aws-rds/lib/cluster.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import kms = require('@aws-cdk/aws-kms'); import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import { Construct, RemovalPolicy, Resource, Token } from '@aws-cdk/cdk'; +import { Construct, RemovalPolicy, Resource, Token } from '@aws-cdk/core'; import { DatabaseClusterAttributes, IDatabaseCluster } from './cluster-ref'; import { DatabaseSecret } from './database-secret'; import { Endpoint } from './endpoint'; diff --git a/packages/@aws-cdk/aws-rds/lib/database-secret.ts b/packages/@aws-cdk/aws-rds/lib/database-secret.ts index 977346328114a..5472de43b796e 100644 --- a/packages/@aws-cdk/aws-rds/lib/database-secret.ts +++ b/packages/@aws-cdk/aws-rds/lib/database-secret.ts @@ -1,6 +1,6 @@ import kms = require('@aws-cdk/aws-kms'); import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Construction properties for a DatabaseSecret. diff --git a/packages/@aws-cdk/aws-rds/lib/endpoint.ts b/packages/@aws-cdk/aws-rds/lib/endpoint.ts index 4b66d44d034d0..56081166bcf73 100644 --- a/packages/@aws-cdk/aws-rds/lib/endpoint.ts +++ b/packages/@aws-cdk/aws-rds/lib/endpoint.ts @@ -1,4 +1,4 @@ -import { Token } from '@aws-cdk/cdk'; +import { Token } from '@aws-cdk/core'; /** * Connection endpoint of a database cluster or instance diff --git a/packages/@aws-cdk/aws-rds/lib/instance.ts b/packages/@aws-cdk/aws-rds/lib/instance.ts index c920e61d01d2b..747b22ff024ca 100644 --- a/packages/@aws-cdk/aws-rds/lib/instance.ts +++ b/packages/@aws-cdk/aws-rds/lib/instance.ts @@ -5,7 +5,7 @@ import kms = require('@aws-cdk/aws-kms'); import lambda = require('@aws-cdk/aws-lambda'); import logs = require('@aws-cdk/aws-logs'); import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import { Construct, Duration, IResource, RemovalPolicy, Resource, SecretValue, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, RemovalPolicy, Resource, SecretValue, Stack, Token } from '@aws-cdk/core'; import { DatabaseSecret } from './database-secret'; import { Endpoint } from './endpoint'; import { IOptionGroup } from './option-group'; diff --git a/packages/@aws-cdk/aws-rds/lib/option-group.ts b/packages/@aws-cdk/aws-rds/lib/option-group.ts index c5aabc7460923..6f2bb833b8c43 100644 --- a/packages/@aws-cdk/aws-rds/lib/option-group.ts +++ b/packages/@aws-cdk/aws-rds/lib/option-group.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { DatabaseInstanceEngine } from './instance'; import { CfnOptionGroup } from './rds.generated'; diff --git a/packages/@aws-cdk/aws-rds/lib/parameter-group.ts b/packages/@aws-cdk/aws-rds/lib/parameter-group.ts index a0be5a2661265..a55e2b3d8609b 100644 --- a/packages/@aws-cdk/aws-rds/lib/parameter-group.ts +++ b/packages/@aws-cdk/aws-rds/lib/parameter-group.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { CfnDBClusterParameterGroup, CfnDBParameterGroup } from './rds.generated'; /** diff --git a/packages/@aws-cdk/aws-rds/lib/props.ts b/packages/@aws-cdk/aws-rds/lib/props.ts index ff26825559cb2..9943f645f3ced 100644 --- a/packages/@aws-cdk/aws-rds/lib/props.ts +++ b/packages/@aws-cdk/aws-rds/lib/props.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import kms = require('@aws-cdk/aws-kms'); -import { Duration, SecretValue } from '@aws-cdk/cdk'; +import { Duration, SecretValue } from '@aws-cdk/core'; import { IParameterGroup } from './parameter-group'; import { SecretRotationApplication } from './secret-rotation'; diff --git a/packages/@aws-cdk/aws-rds/lib/secret-rotation.ts b/packages/@aws-cdk/aws-rds/lib/secret-rotation.ts index 05db13f02baf0..8b27064fe7460 100644 --- a/packages/@aws-cdk/aws-rds/lib/secret-rotation.ts +++ b/packages/@aws-cdk/aws-rds/lib/secret-rotation.ts @@ -2,7 +2,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import lambda = require('@aws-cdk/aws-lambda'); import serverless = require('@aws-cdk/aws-sam'); import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import { Construct, Duration, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, Stack } from '@aws-cdk/core'; /** * A secret rotation serverless application. diff --git a/packages/@aws-cdk/aws-rds/package.json b/packages/@aws-cdk/aws-rds/package.json index 4efa048af0618..ce7cca7de47e8 100644 --- a/packages/@aws-cdk/aws-rds/package.json +++ b/packages/@aws-cdk/aws-rds/package.json @@ -80,7 +80,7 @@ "@aws-cdk/aws-logs": "^0.35.0", "@aws-cdk/aws-sam": "^0.35.0", "@aws-cdk/aws-secretsmanager": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -93,7 +93,7 @@ "@aws-cdk/aws-logs": "^0.35.0", "@aws-cdk/aws-sam": "^0.35.0", "@aws-cdk/aws-secretsmanager": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-rds/test/integ.cluster-rotation.lit.ts b/packages/@aws-cdk/aws-rds/test/integ.cluster-rotation.lit.ts index 82981fc8b0810..d48c725ee0ac1 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.cluster-rotation.lit.ts +++ b/packages/@aws-cdk/aws-rds/test/integ.cluster-rotation.lit.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import rds = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-rds/test/integ.cluster.ts b/packages/@aws-cdk/aws-rds/test/integ.cluster.ts index 5018ead694ccc..f025ceda2435a 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.cluster.ts +++ b/packages/@aws-cdk/aws-rds/test/integ.cluster.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import kms = require('@aws-cdk/aws-kms'); -import cdk = require('@aws-cdk/cdk'); -import { SecretValue } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { SecretValue } from '@aws-cdk/core'; import { DatabaseCluster, DatabaseClusterEngine } from '../lib'; import { ClusterParameterGroup } from '../lib/parameter-group'; diff --git a/packages/@aws-cdk/aws-rds/test/integ.instance.lit.ts b/packages/@aws-cdk/aws-rds/test/integ.instance.lit.ts index 4c739ecb7cbc6..e1f1ac3f6159c 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.instance.lit.ts +++ b/packages/@aws-cdk/aws-rds/test/integ.instance.lit.ts @@ -3,7 +3,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import targets = require('@aws-cdk/aws-events-targets'); import lambda = require('@aws-cdk/aws-lambda'); import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import rds = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-rds/test/test.cluster.ts b/packages/@aws-cdk/aws-rds/test/test.cluster.ts index 4b259129b3066..985110211c21a 100644 --- a/packages/@aws-cdk/aws-rds/test/test.cluster.ts +++ b/packages/@aws-cdk/aws-rds/test/test.cluster.ts @@ -1,8 +1,8 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import kms = require('@aws-cdk/aws-kms'); -import cdk = require('@aws-cdk/cdk'); -import { SecretValue } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { SecretValue } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ClusterParameterGroup, DatabaseCluster, DatabaseClusterEngine, ParameterGroup } from '../lib'; diff --git a/packages/@aws-cdk/aws-rds/test/test.instance.ts b/packages/@aws-cdk/aws-rds/test/test.instance.ts index 7c70ad0b21423..82589532e2acb 100644 --- a/packages/@aws-cdk/aws-rds/test/test.instance.ts +++ b/packages/@aws-cdk/aws-rds/test/test.instance.ts @@ -3,7 +3,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import targets = require('@aws-cdk/aws-events-targets'); import lambda = require('@aws-cdk/aws-lambda'); import logs = require('@aws-cdk/aws-logs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import rds = require('../lib'); diff --git a/packages/@aws-cdk/aws-rds/test/test.option-group.ts b/packages/@aws-cdk/aws-rds/test/test.option-group.ts index 22c5f6999ccd2..538a428ab0d8d 100644 --- a/packages/@aws-cdk/aws-rds/test/test.option-group.ts +++ b/packages/@aws-cdk/aws-rds/test/test.option-group.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { DatabaseInstanceEngine, OptionGroup } from '../lib'; diff --git a/packages/@aws-cdk/aws-rds/test/test.parameter-group.ts b/packages/@aws-cdk/aws-rds/test/test.parameter-group.ts index f48d1ea4f3891..963485de5d0b1 100644 --- a/packages/@aws-cdk/aws-rds/test/test.parameter-group.ts +++ b/packages/@aws-cdk/aws-rds/test/test.parameter-group.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 { ClusterParameterGroup, ParameterGroup } from '../lib'; diff --git a/packages/@aws-cdk/aws-rds/test/test.secret-rotation.ts b/packages/@aws-cdk/aws-rds/test/test.secret-rotation.ts index 250c4535a183b..eee92b1a96d6b 100644 --- a/packages/@aws-cdk/aws-rds/test/test.secret-rotation.ts +++ b/packages/@aws-cdk/aws-rds/test/test.secret-rotation.ts @@ -1,8 +1,8 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import secretsmanager = require('@aws-cdk/aws-secretsmanager'); -import cdk = require('@aws-cdk/cdk'); -import { SecretValue } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { SecretValue } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import rds = require('../lib'); import { SecretRotationApplication } from '../lib'; diff --git a/packages/@aws-cdk/aws-redshift/package.json b/packages/@aws-cdk/aws-redshift/package.json index 303b73018aaa6..391fa6191da3c 100644 --- a/packages/@aws-cdk/aws-redshift/package.json +++ b/packages/@aws-cdk/aws-redshift/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-robomaker/package.json b/packages/@aws-cdk/aws-robomaker/package.json index 1c95cd92a8298..2557b038d2bf3 100644 --- a/packages/@aws-cdk/aws-robomaker/package.json +++ b/packages/@aws-cdk/aws-robomaker/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" diff --git a/packages/@aws-cdk/aws-route53-targets/package.json b/packages/@aws-cdk/aws-route53-targets/package.json index 0ce4b46ea0742..be28ea3e3efa0 100644 --- a/packages/@aws-cdk/aws-route53-targets/package.json +++ b/packages/@aws-cdk/aws-route53-targets/package.json @@ -82,7 +82,7 @@ "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-route53": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -90,7 +90,7 @@ "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-route53": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-route53-targets/test/cloudfront-target.test.ts b/packages/@aws-cdk/aws-route53-targets/test/cloudfront-target.test.ts index cb7b33b1d4ced..0ed8b6ced6f48 100644 --- a/packages/@aws-cdk/aws-route53-targets/test/cloudfront-target.test.ts +++ b/packages/@aws-cdk/aws-route53-targets/test/cloudfront-target.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import cloudfront = require('@aws-cdk/aws-cloudfront'); import route53 = require('@aws-cdk/aws-route53'); import s3 = require('@aws-cdk/aws-s3'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import targets = require('../lib'); test('use CloudFront as record target', () => { diff --git a/packages/@aws-cdk/aws-route53-targets/test/integ.alb-alias-target.ts b/packages/@aws-cdk/aws-route53-targets/test/integ.alb-alias-target.ts index a9e17e7b44353..09e3d8deb080c 100644 --- a/packages/@aws-cdk/aws-route53-targets/test/integ.alb-alias-target.ts +++ b/packages/@aws-cdk/aws-route53-targets/test/integ.alb-alias-target.ts @@ -2,7 +2,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); import route53 = require('@aws-cdk/aws-route53'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-route53-targets/test/integ.cloudfront-alias-target.ts b/packages/@aws-cdk/aws-route53-targets/test/integ.cloudfront-alias-target.ts index 3b54de8a118ab..6d04bedaf6dee 100644 --- a/packages/@aws-cdk/aws-route53-targets/test/integ.cloudfront-alias-target.ts +++ b/packages/@aws-cdk/aws-route53-targets/test/integ.cloudfront-alias-target.ts @@ -1,7 +1,7 @@ import cloudfront = require('@aws-cdk/aws-cloudfront'); import route53 = require('@aws-cdk/aws-route53'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import targets = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-route53-targets/test/load-balancer-target.test.ts b/packages/@aws-cdk/aws-route53-targets/test/load-balancer-target.test.ts index c78062120398d..703a8006faf4a 100644 --- a/packages/@aws-cdk/aws-route53-targets/test/load-balancer-target.test.ts +++ b/packages/@aws-cdk/aws-route53-targets/test/load-balancer-target.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); import route53 = require('@aws-cdk/aws-route53'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import targets = require('../lib'); test('use ALB as record target', () => { diff --git a/packages/@aws-cdk/aws-route53/lib/hosted-zone-ref.ts b/packages/@aws-cdk/aws-route53/lib/hosted-zone-ref.ts index 836e3c2f79bda..cdc0cfc17bd88 100644 --- a/packages/@aws-cdk/aws-route53/lib/hosted-zone-ref.ts +++ b/packages/@aws-cdk/aws-route53/lib/hosted-zone-ref.ts @@ -1,4 +1,4 @@ -import { IResource } from '@aws-cdk/cdk'; +import { IResource } from '@aws-cdk/core'; /** * Imported or created hosted zone diff --git a/packages/@aws-cdk/aws-route53/lib/hosted-zone.ts b/packages/@aws-cdk/aws-route53/lib/hosted-zone.ts index 35aec1a5bba81..c3ed0322b0c27 100644 --- a/packages/@aws-cdk/aws-route53/lib/hosted-zone.ts +++ b/packages/@aws-cdk/aws-route53/lib/hosted-zone.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, ContextProvider, Duration, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, ContextProvider, Duration, Lazy, Resource, Stack } from '@aws-cdk/core'; import cxapi = require('@aws-cdk/cx-api'); import { HostedZoneProviderProps } from './hosted-zone-provider'; import { HostedZoneAttributes, IHostedZone } from './hosted-zone-ref'; diff --git a/packages/@aws-cdk/aws-route53/lib/record-set.ts b/packages/@aws-cdk/aws-route53/lib/record-set.ts index 8024f8d5f28cb..e1de367756f7a 100644 --- a/packages/@aws-cdk/aws-route53/lib/record-set.ts +++ b/packages/@aws-cdk/aws-route53/lib/record-set.ts @@ -1,4 +1,4 @@ -import { Construct, Duration, IResource, Resource, Token } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Resource, Token } from '@aws-cdk/core'; import { IAliasRecordTarget } from './alias-record-target'; import { IHostedZone } from './hosted-zone-ref'; import { CfnRecordSet } from './route53.generated'; diff --git a/packages/@aws-cdk/aws-route53/package.json b/packages/@aws-cdk/aws-route53/package.json index 2c89d964b8c09..0b353b385288c 100644 --- a/packages/@aws-cdk/aws-route53/package.json +++ b/packages/@aws-cdk/aws-route53/package.json @@ -73,14 +73,14 @@ "dependencies": { "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-logs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "engines": { diff --git a/packages/@aws-cdk/aws-route53/test/integ.route53.ts b/packages/@aws-cdk/aws-route53/test/integ.route53.ts index f50521f546257..a334d1522fe7d 100644 --- a/packages/@aws-cdk/aws-route53/test/integ.route53.ts +++ b/packages/@aws-cdk/aws-route53/test/integ.route53.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { AddressRecordTarget, ARecord, CaaAmazonRecord, CnameRecord, PrivateHostedZone, PublicHostedZone, TxtRecord } from '../lib'; const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-route53/test/test.hosted-zone-provider.ts b/packages/@aws-cdk/aws-route53/test/test.hosted-zone-provider.ts index c83b163fc01a8..4043fb02f0d6d 100644 --- a/packages/@aws-cdk/aws-route53/test/test.hosted-zone-provider.ts +++ b/packages/@aws-cdk/aws-route53/test/test.hosted-zone-provider.ts @@ -1,5 +1,5 @@ import { SynthUtils } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { HostedZone, HostedZoneAttributes } from '../lib'; diff --git a/packages/@aws-cdk/aws-route53/test/test.record-set.ts b/packages/@aws-cdk/aws-route53/test/test.record-set.ts index e455961379c72..63860772628ef 100644 --- a/packages/@aws-cdk/aws-route53/test/test.record-set.ts +++ b/packages/@aws-cdk/aws-route53/test/test.record-set.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import route53 = require('../lib'); diff --git a/packages/@aws-cdk/aws-route53/test/test.route53.ts b/packages/@aws-cdk/aws-route53/test/test.route53.ts index 1eb06a4e82556..3fa18e765b705 100644 --- a/packages/@aws-cdk/aws-route53/test/test.route53.ts +++ b/packages/@aws-cdk/aws-route53/test/test.route53.ts @@ -1,6 +1,6 @@ import { beASupersetOfTemplate, exactlyMatchTemplate, expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { HostedZone, PrivateHostedZone, PublicHostedZone, TxtRecord } from '../lib'; diff --git a/packages/@aws-cdk/aws-route53resolver/package.json b/packages/@aws-cdk/aws-route53resolver/package.json index 85a172de16625..b8ca87ab27490 100644 --- a/packages/@aws-cdk/aws-route53resolver/package.json +++ b/packages/@aws-cdk/aws-route53resolver/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" diff --git a/packages/@aws-cdk/aws-s3-assets/lib/asset.ts b/packages/@aws-cdk/aws-s3-assets/lib/asset.ts index b3a9528946003..8db9982517713 100644 --- a/packages/@aws-cdk/aws-s3-assets/lib/asset.ts +++ b/packages/@aws-cdk/aws-s3-assets/lib/asset.ts @@ -1,7 +1,7 @@ import assets = require('@aws-cdk/assets'); import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import cxapi = require('@aws-cdk/cx-api'); import fs = require('fs'); import path = require('path'); diff --git a/packages/@aws-cdk/aws-s3-assets/package.json b/packages/@aws-cdk/aws-s3-assets/package.json index b260138a6c7e7..6e45fe152edae 100644 --- a/packages/@aws-cdk/aws-s3-assets/package.json +++ b/packages/@aws-cdk/aws-s3-assets/package.json @@ -70,7 +70,7 @@ "@aws-cdk/assets": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", @@ -78,7 +78,7 @@ "@aws-cdk/assets": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0" }, "engines": { diff --git a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.directory.lit.ts b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.directory.lit.ts index 38f44cb5c8f39..be4302766ac44 100644 --- a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.directory.lit.ts +++ b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.directory.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import assets = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.file.lit.ts b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.file.lit.ts index d9f7469979fbc..8994b8294915e 100644 --- a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.file.lit.ts +++ b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.file.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import assets = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.permissions.lit.ts b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.permissions.lit.ts index 9b71c1b99c32f..66b1c4af7b6ff 100644 --- a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.permissions.lit.ts +++ b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.permissions.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import assets = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.refs.lit.ts b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.refs.lit.ts index 5009917681fae..057e5a12e3a66 100644 --- a/packages/@aws-cdk/aws-s3-assets/test/integ.assets.refs.lit.ts +++ b/packages/@aws-cdk/aws-s3-assets/test/integ.assets.refs.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import assets = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-assets/test/integ.multi-assets.ts b/packages/@aws-cdk/aws-s3-assets/test/integ.multi-assets.ts index 57d44d5f7818a..70f1f5fef88b5 100644 --- a/packages/@aws-cdk/aws-s3-assets/test/integ.multi-assets.ts +++ b/packages/@aws-cdk/aws-s3-assets/test/integ.multi-assets.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import assets = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-assets/test/test.asset.ts b/packages/@aws-cdk/aws-s3-assets/test/test.asset.ts index 41c4d10611747..e3039560f0e44 100644 --- a/packages/@aws-cdk/aws-s3-assets/test/test.asset.ts +++ b/packages/@aws-cdk/aws-s3-assets/test/test.asset.ts @@ -1,7 +1,7 @@ import { expect, haveResource, ResourcePart, SynthUtils } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); -import { App, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { App, Stack } from '@aws-cdk/core'; import cxapi = require('@aws-cdk/cx-api'); import fs = require('fs'); import { Test } from 'nodeunit'; diff --git a/packages/@aws-cdk/aws-s3-deployment/lib/bucket-deployment.ts b/packages/@aws-cdk/aws-s3-deployment/lib/bucket-deployment.ts index f6c13cfc3fd70..0203e1d0855bd 100644 --- a/packages/@aws-cdk/aws-s3-deployment/lib/bucket-deployment.ts +++ b/packages/@aws-cdk/aws-s3-deployment/lib/bucket-deployment.ts @@ -1,7 +1,7 @@ import cloudformation = require('@aws-cdk/aws-cloudformation'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import { ISource } from './source'; diff --git a/packages/@aws-cdk/aws-s3-deployment/lib/source.ts b/packages/@aws-cdk/aws-s3-deployment/lib/source.ts index 8d8fe0d3016bc..971859e80f3ee 100644 --- a/packages/@aws-cdk/aws-s3-deployment/lib/source.ts +++ b/packages/@aws-cdk/aws-s3-deployment/lib/source.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); import s3_assets = require('@aws-cdk/aws-s3-assets'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export interface SourceConfig { /** diff --git a/packages/@aws-cdk/aws-s3-deployment/package.json b/packages/@aws-cdk/aws-s3-deployment/package.json index 410d1ec3fc64c..3af6bbafe2195 100644 --- a/packages/@aws-cdk/aws-s3-deployment/package.json +++ b/packages/@aws-cdk/aws-s3-deployment/package.json @@ -85,7 +85,7 @@ "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -94,7 +94,7 @@ "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-s3-assets": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.ts b/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.ts index 418920cbb79cb..f12c946467970 100644 --- a/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.ts +++ b/packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.ts @@ -1,5 +1,5 @@ import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import s3deploy = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-deployment/test/test.bucket-deployment.ts b/packages/@aws-cdk/aws-s3-deployment/test/test.bucket-deployment.ts index 60f7ae30c5591..baf8936f21fd5 100644 --- a/packages/@aws-cdk/aws-s3-deployment/test/test.bucket-deployment.ts +++ b/packages/@aws-cdk/aws-s3-deployment/test/test.bucket-deployment.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import path = require('path'); import s3deploy = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3-notifications/lib/lambda.ts b/packages/@aws-cdk/aws-s3-notifications/lib/lambda.ts index d308a24dd1056..128064eb5d243 100644 --- a/packages/@aws-cdk/aws-s3-notifications/lib/lambda.ts +++ b/packages/@aws-cdk/aws-s3-notifications/lib/lambda.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import { CfnResource, Construct, Stack } from '@aws-cdk/cdk'; +import { CfnResource, Construct, Stack } from '@aws-cdk/core'; /** * Use a Lambda function as a bucket notification destination diff --git a/packages/@aws-cdk/aws-s3-notifications/lib/sns.ts b/packages/@aws-cdk/aws-s3-notifications/lib/sns.ts index a49a15de14ded..af12bce6627c2 100644 --- a/packages/@aws-cdk/aws-s3-notifications/lib/sns.ts +++ b/packages/@aws-cdk/aws-s3-notifications/lib/sns.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use an SNS topic as a bucket notification destination diff --git a/packages/@aws-cdk/aws-s3-notifications/lib/sqs.ts b/packages/@aws-cdk/aws-s3-notifications/lib/sqs.ts index 48b2a83c0c360..4d49fe99e21d4 100644 --- a/packages/@aws-cdk/aws-s3-notifications/lib/sqs.ts +++ b/packages/@aws-cdk/aws-s3-notifications/lib/sqs.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import s3 = require('@aws-cdk/aws-s3'); import sqs = require('@aws-cdk/aws-sqs'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; /** * Use an SQS queue as a bucket notification destination diff --git a/packages/@aws-cdk/aws-s3-notifications/package.json b/packages/@aws-cdk/aws-s3-notifications/package.json index ab9c354f506ba..c21d1b6520be0 100644 --- a/packages/@aws-cdk/aws-s3-notifications/package.json +++ b/packages/@aws-cdk/aws-s3-notifications/package.json @@ -79,7 +79,7 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -88,7 +88,7 @@ "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.ts b/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.ts index 81a78de818f6b..fd854499dab79 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.ts @@ -1,7 +1,7 @@ import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -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 s3n = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.ts b/packages/@aws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.ts index 8dbd03340ef4e..ed87332d9dd0c 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.ts @@ -1,6 +1,6 @@ import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3n = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts b/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts index de568187c020a..35af80eb15e05 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import s3n = require('../../lib'); test('lambda as notification target', () => { diff --git a/packages/@aws-cdk/aws-s3-notifications/test/notifications.test.ts b/packages/@aws-cdk/aws-s3-notifications/test/notifications.test.ts index ddfcec88f7206..05f547c7c67a3 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/notifications.test.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/notifications.test.ts @@ -2,8 +2,8 @@ import { SynthUtils } from '@aws-cdk/assert'; import '@aws-cdk/assert/jest'; import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); -import { ConstructNode, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { ConstructNode, Stack } from '@aws-cdk/core'; import s3n = require('../lib'); // tslint:disable:object-literal-key-quotes diff --git a/packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts b/packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts index 24a6b4094e5d5..fa17bc698c883 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts @@ -2,7 +2,7 @@ import { SynthUtils } from '@aws-cdk/assert'; import '@aws-cdk/assert/jest'; import s3 = require('@aws-cdk/aws-s3'); import sqs = require('@aws-cdk/aws-sqs'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import notif = require('../lib'); test('queues can be used as destinations', () => { diff --git a/packages/@aws-cdk/aws-s3-notifications/test/sns.test.ts b/packages/@aws-cdk/aws-s3-notifications/test/sns.test.ts index 2550172a3718a..9c76c05eae7de 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/sns.test.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/sns.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import notif = require('../lib'); test('asBucketNotificationDestination adds bucket permissions only once for each bucket', () => { diff --git a/packages/@aws-cdk/aws-s3-notifications/test/sns/integ.sns-bucket-notifications.ts b/packages/@aws-cdk/aws-s3-notifications/test/sns/integ.sns-bucket-notifications.ts index 88dee27465fff..70c082026b939 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/sns/integ.sns-bucket-notifications.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/sns/integ.sns-bucket-notifications.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3n = require('../../lib'); class MyStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.ts b/packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.ts index 6783883b642a4..59a69f9cefa58 100644 --- a/packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.ts +++ b/packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3n = require('../../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-s3/lib/bucket-policy.ts b/packages/@aws-cdk/aws-s3/lib/bucket-policy.ts index 1ac9489dfafbe..a59c891e7ccbd 100644 --- a/packages/@aws-cdk/aws-s3/lib/bucket-policy.ts +++ b/packages/@aws-cdk/aws-s3/lib/bucket-policy.ts @@ -1,5 +1,5 @@ import { PolicyDocument } from '@aws-cdk/aws-iam'; -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { IBucket } from './bucket'; import { CfnBucketPolicy } from './s3.generated'; diff --git a/packages/@aws-cdk/aws-s3/lib/bucket.ts b/packages/@aws-cdk/aws-s3/lib/bucket.ts index 31b5e54b97f7d..d8322b11b7504 100644 --- a/packages/@aws-cdk/aws-s3/lib/bucket.ts +++ b/packages/@aws-cdk/aws-s3/lib/bucket.ts @@ -1,7 +1,7 @@ import events = require('@aws-cdk/aws-events'); import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { Construct, IResource, Lazy, RemovalPolicy, Resource, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, RemovalPolicy, Resource, Stack, Token } from '@aws-cdk/core'; import { EOL } from 'os'; import { BucketPolicy } from './bucket-policy'; import { IBucketNotificationDestination } from './destination'; diff --git a/packages/@aws-cdk/aws-s3/lib/destination.ts b/packages/@aws-cdk/aws-s3/lib/destination.ts index 39e1f1b00a33c..27ac10e0eb9a9 100644 --- a/packages/@aws-cdk/aws-s3/lib/destination.ts +++ b/packages/@aws-cdk/aws-s3/lib/destination.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { IBucket } from './bucket'; /** diff --git a/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource-handler.ts b/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource-handler.ts index 86a684f16fd75..eced385e46013 100644 --- a/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource-handler.ts +++ b/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource-handler.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); -import { Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { Stack } from '@aws-cdk/core'; /** * A Lambda-based custom resource handler that provisions S3 bucket diff --git a/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource.ts b/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource.ts index ae1b09863a148..833e58343e4a2 100644 --- a/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource.ts +++ b/packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Bucket, EventType, NotificationKeyFilter } from '../bucket'; import { BucketNotificationDestinationType, IBucketNotificationDestination } from '../destination'; import { NotificationsResourceHandler } from './notifications-resource-handler'; diff --git a/packages/@aws-cdk/aws-s3/lib/rule.ts b/packages/@aws-cdk/aws-s3/lib/rule.ts index e2f976e264e7a..0acec0795a57b 100644 --- a/packages/@aws-cdk/aws-s3/lib/rule.ts +++ b/packages/@aws-cdk/aws-s3/lib/rule.ts @@ -1,4 +1,4 @@ -import { Duration } from "@aws-cdk/cdk"; +import { Duration } from "@aws-cdk/core"; /** * Declaration of a Life cycle rule diff --git a/packages/@aws-cdk/aws-s3/lib/util.ts b/packages/@aws-cdk/aws-s3/lib/util.ts index 50582e96c67de..0847682f5c444 100644 --- a/packages/@aws-cdk/aws-s3/lib/util.ts +++ b/packages/@aws-cdk/aws-s3/lib/util.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 { BucketAttributes } from './bucket'; export function parseBucketArn(construct: cdk.IConstruct, props: BucketAttributes): string { diff --git a/packages/@aws-cdk/aws-s3/package.json b/packages/@aws-cdk/aws-s3/package.json index 6d8c11a0da34d..51ebae711f0a8 100644 --- a/packages/@aws-cdk/aws-s3/package.json +++ b/packages/@aws-cdk/aws-s3/package.json @@ -73,14 +73,14 @@ "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.ts b/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.ts index 752bc499c19c1..5566c510a11f7 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.ts +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.ts @@ -1,6 +1,6 @@ /// !cdk-integ * import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.domain-name.ts b/packages/@aws-cdk/aws-s3/test/integ.bucket.domain-name.ts index 24b3f47e36059..df250e66e8704 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.domain-name.ts +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.domain-name.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3 = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.ts b/packages/@aws-cdk/aws-s3/test/integ.bucket.ts index d8e7c27ea2d86..72e977db73196 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.ts +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3 = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.ts b/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.ts index 79b13c25df51c..c7b255aa6cf36 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.ts +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import s3 = require('../lib'); class TestStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts b/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts index 5a0ec399da681..c22d03e59205d 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts +++ b/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts @@ -1,4 +1,4 @@ -import { App, RemovalPolicy, Stack } from '@aws-cdk/cdk'; +import { App, RemovalPolicy, Stack } from '@aws-cdk/core'; import { Bucket } from '../lib'; const app = new App(); diff --git a/packages/@aws-cdk/aws-s3/test/test.bucket.ts b/packages/@aws-cdk/aws-s3/test/test.bucket.ts index 5bbea01108ce4..20ec8511c2b90 100644 --- a/packages/@aws-cdk/aws-s3/test/test.bucket.ts +++ b/packages/@aws-cdk/aws-s3/test/test.bucket.ts @@ -1,8 +1,8 @@ import { expect, haveResource, haveResourceLike, SynthUtils } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -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 { Test } from 'nodeunit'; import { EOL } from 'os'; import s3 = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3/test/test.cors.ts b/packages/@aws-cdk/aws-s3/test/test.cors.ts index 461b0142d782b..1a4c036b4b6aa 100644 --- a/packages/@aws-cdk/aws-s3/test/test.cors.ts +++ b/packages/@aws-cdk/aws-s3/test/test.cors.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Bucket, HttpMethods } from '../lib'; diff --git a/packages/@aws-cdk/aws-s3/test/test.metrics.ts b/packages/@aws-cdk/aws-s3/test/test.metrics.ts index 1a44c8b3d1096..3031d82906258 100644 --- a/packages/@aws-cdk/aws-s3/test/test.metrics.ts +++ b/packages/@aws-cdk/aws-s3/test/test.metrics.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Bucket } from '../lib'; diff --git a/packages/@aws-cdk/aws-s3/test/test.notification.ts b/packages/@aws-cdk/aws-s3/test/test.notification.ts index f11fac28ae752..87cf07d59e990 100644 --- a/packages/@aws-cdk/aws-s3/test/test.notification.ts +++ b/packages/@aws-cdk/aws-s3/test/test.notification.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 s3 = require('../lib'); diff --git a/packages/@aws-cdk/aws-s3/test/test.rules.ts b/packages/@aws-cdk/aws-s3/test/test.rules.ts index d89064a556b1f..8ac94b9020191 100644 --- a/packages/@aws-cdk/aws-s3/test/test.rules.ts +++ b/packages/@aws-cdk/aws-s3/test/test.rules.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { Bucket, StorageClass } from '../lib'; diff --git a/packages/@aws-cdk/aws-s3/test/test.util.ts b/packages/@aws-cdk/aws-s3/test/test.util.ts index 416c0c9ac8ae2..e9d137101e13e 100644 --- a/packages/@aws-cdk/aws-s3/test/test.util.ts +++ b/packages/@aws-cdk/aws-s3/test/test.util.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { parseBucketArn, parseBucketName } from '../lib/util'; diff --git a/packages/@aws-cdk/aws-sagemaker/package.json b/packages/@aws-cdk/aws-sagemaker/package.json index de30017085a16..71e978ef770e1 100644 --- a/packages/@aws-cdk/aws-sagemaker/package.json +++ b/packages/@aws-cdk/aws-sagemaker/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" diff --git a/packages/@aws-cdk/aws-sam/package.json b/packages/@aws-cdk/aws-sam/package.json index c9b3c30eb7e74..cb22cb592eff8 100644 --- a/packages/@aws-cdk/aws-sam/package.json +++ b/packages/@aws-cdk/aws-sam/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" diff --git a/packages/@aws-cdk/aws-sam/test/test.sam.ts b/packages/@aws-cdk/aws-sam/test/test.sam.ts index f2e05ce777dfc..92d7b96852c33 100644 --- a/packages/@aws-cdk/aws-sam/test/test.sam.ts +++ b/packages/@aws-cdk/aws-sam/test/test.sam.ts @@ -1,5 +1,5 @@ import {expect} from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import { CfnApplication } from '../lib'; diff --git a/packages/@aws-cdk/aws-sdb/package.json b/packages/@aws-cdk/aws-sdb/package.json index 28f4cb8e41654..8772dd47faed4 100644 --- a/packages/@aws-cdk/aws-sdb/package.json +++ b/packages/@aws-cdk/aws-sdb/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-secretsmanager/lib/rotation-schedule.ts b/packages/@aws-cdk/aws-secretsmanager/lib/rotation-schedule.ts index d342817a861fc..f66d7863ef355 100644 --- a/packages/@aws-cdk/aws-secretsmanager/lib/rotation-schedule.ts +++ b/packages/@aws-cdk/aws-secretsmanager/lib/rotation-schedule.ts @@ -1,5 +1,5 @@ import lambda = require('@aws-cdk/aws-lambda'); -import { Construct, Duration, Resource } from '@aws-cdk/cdk'; +import { Construct, Duration, Resource } from '@aws-cdk/core'; import { ISecret } from './secret'; import { CfnRotationSchedule } from './secretsmanager.generated'; diff --git a/packages/@aws-cdk/aws-secretsmanager/lib/secret.ts b/packages/@aws-cdk/aws-secretsmanager/lib/secret.ts index e0b7bde3d1577..09359f1696859 100644 --- a/packages/@aws-cdk/aws-secretsmanager/lib/secret.ts +++ b/packages/@aws-cdk/aws-secretsmanager/lib/secret.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { Construct, IResource, Resource, SecretValue, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource, SecretValue, Stack } from '@aws-cdk/core'; import { RotationSchedule, RotationScheduleOptions } from './rotation-schedule'; import secretsmanager = require('./secretsmanager.generated'); diff --git a/packages/@aws-cdk/aws-secretsmanager/package.json b/packages/@aws-cdk/aws-secretsmanager/package.json index 37b9ce27b6bd2..737143701c2de 100644 --- a/packages/@aws-cdk/aws-secretsmanager/package.json +++ b/packages/@aws-cdk/aws-secretsmanager/package.json @@ -75,14 +75,14 @@ "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", "@aws-cdk/aws-lambda": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "peerDependencies": { "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^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" diff --git a/packages/@aws-cdk/aws-secretsmanager/test/example.app-with-secret.lit.ts b/packages/@aws-cdk/aws-secretsmanager/test/example.app-with-secret.lit.ts index f15e78398c68d..d6748847dd9ce 100644 --- a/packages/@aws-cdk/aws-secretsmanager/test/example.app-with-secret.lit.ts +++ b/packages/@aws-cdk/aws-secretsmanager/test/example.app-with-secret.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import secretsmanager = require('../lib'); class ExampleStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-secretsmanager/test/integ.secret.lit.ts b/packages/@aws-cdk/aws-secretsmanager/test/integ.secret.lit.ts index 0dcf85527cb6e..cdaf3d207efff 100644 --- a/packages/@aws-cdk/aws-secretsmanager/test/integ.secret.lit.ts +++ b/packages/@aws-cdk/aws-secretsmanager/test/integ.secret.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import secretsManager = require('../lib'); class SecretsManagerStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-secretsmanager/test/test.rotation-schedule.ts b/packages/@aws-cdk/aws-secretsmanager/test/test.rotation-schedule.ts index 2037c21c19bf9..24958427aa566 100644 --- a/packages/@aws-cdk/aws-secretsmanager/test/test.rotation-schedule.ts +++ b/packages/@aws-cdk/aws-secretsmanager/test/test.rotation-schedule.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import secretsmanager = require('../lib'); diff --git a/packages/@aws-cdk/aws-secretsmanager/test/test.secret.ts b/packages/@aws-cdk/aws-secretsmanager/test/test.secret.ts index 22ab66525a380..09118826958d2 100644 --- a/packages/@aws-cdk/aws-secretsmanager/test/test.secret.ts +++ b/packages/@aws-cdk/aws-secretsmanager/test/test.secret.ts @@ -2,8 +2,8 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import lambda = require('@aws-cdk/aws-lambda'); -import cdk = require('@aws-cdk/cdk'); -import { SecretValue, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { SecretValue, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import secretsmanager = require('../lib'); diff --git a/packages/@aws-cdk/aws-servicecatalog/package.json b/packages/@aws-cdk/aws-servicecatalog/package.json index 995013978f50b..bba8aa262597a 100644 --- a/packages/@aws-cdk/aws-servicecatalog/package.json +++ b/packages/@aws-cdk/aws-servicecatalog/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/alias-target-instance.ts b/packages/@aws-cdk/aws-servicediscovery/lib/alias-target-instance.ts index f3ce0c744e669..8fd3d5a0ec18c 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/alias-target-instance.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/alias-target-instance.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { BaseInstanceProps, InstanceBase } from './instance'; import { NamespaceType } from './namespace'; import { DnsRecordType, IService, RoutingPolicy } from './service'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/cname-instance.ts b/packages/@aws-cdk/aws-servicediscovery/lib/cname-instance.ts index 3bdaf1ffeb77d..d20f9d79b3dec 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/cname-instance.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/cname-instance.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { BaseInstanceProps, InstanceBase } from './instance'; import { NamespaceType } from './namespace'; import { DnsRecordType, IService } from './service'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/http-namespace.ts b/packages/@aws-cdk/aws-servicediscovery/lib/http-namespace.ts index ac207e525a46c..d1661ad17e7de 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/http-namespace.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/http-namespace.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { BaseNamespaceProps, INamespace, NamespaceType } from './namespace'; import { BaseServiceProps, Service } from './service'; import { CfnHttpNamespace } from './servicediscovery.generated'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/instance.ts b/packages/@aws-cdk/aws-servicediscovery/lib/instance.ts index a694121c179f1..00e7d6a126934 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/instance.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/instance.ts @@ -1,4 +1,4 @@ -import { IResource, Resource } from '@aws-cdk/cdk'; +import { IResource, Resource } from '@aws-cdk/core'; import { IService } from './service'; export interface IInstance extends IResource { diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/ip-instance.ts b/packages/@aws-cdk/aws-servicediscovery/lib/ip-instance.ts index 1724cb7dbee3e..cbee4f76b253d 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/ip-instance.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/ip-instance.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { BaseInstanceProps, InstanceBase } from './instance'; import { DnsRecordType, IService } from './service'; import { CfnInstance } from './servicediscovery.generated'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/namespace.ts b/packages/@aws-cdk/aws-servicediscovery/lib/namespace.ts index f690897f2fa33..45e4fe53b1eaa 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/namespace.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/namespace.ts @@ -1,4 +1,4 @@ -import { IResource } from '@aws-cdk/cdk'; +import { IResource } from '@aws-cdk/core'; export interface INamespace extends IResource { /** diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/non-ip-instance.ts b/packages/@aws-cdk/aws-servicediscovery/lib/non-ip-instance.ts index 1346fdcf02eb7..e682dc54b0d30 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/non-ip-instance.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/non-ip-instance.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { BaseInstanceProps, InstanceBase } from './instance'; import { NamespaceType } from './namespace'; import { IService } from './service'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/private-dns-namespace.ts b/packages/@aws-cdk/aws-servicediscovery/lib/private-dns-namespace.ts index 2b5c62639a5bc..2dc2c0d09b3d0 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/private-dns-namespace.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/private-dns-namespace.ts @@ -1,5 +1,5 @@ import ec2 = require('@aws-cdk/aws-ec2'); -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { BaseNamespaceProps, INamespace, NamespaceType } from './namespace'; import { DnsServiceProps, Service } from './service'; import { CfnPrivateDnsNamespace } from './servicediscovery.generated'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/public-dns-namespace.ts b/packages/@aws-cdk/aws-servicediscovery/lib/public-dns-namespace.ts index 012a257d3f158..ab181f5f77538 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/public-dns-namespace.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/public-dns-namespace.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { BaseNamespaceProps, INamespace, NamespaceType } from './namespace'; import { DnsServiceProps, Service } from './service'; import { CfnPublicDnsNamespace } from './servicediscovery.generated'; diff --git a/packages/@aws-cdk/aws-servicediscovery/lib/service.ts b/packages/@aws-cdk/aws-servicediscovery/lib/service.ts index e17bc7bf98ede..3c5f3eb35b783 100644 --- a/packages/@aws-cdk/aws-servicediscovery/lib/service.ts +++ b/packages/@aws-cdk/aws-servicediscovery/lib/service.ts @@ -1,5 +1,5 @@ import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import { Construct, Duration, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Resource } from '@aws-cdk/core'; import { AliasTargetInstance } from './alias-target-instance'; import { CnameInstance, CnameInstanceBaseProps } from './cname-instance'; import { IInstance } from './instance'; diff --git a/packages/@aws-cdk/aws-servicediscovery/package.json b/packages/@aws-cdk/aws-servicediscovery/package.json index d476e87d3742f..d964419960cc7 100644 --- a/packages/@aws-cdk/aws-servicediscovery/package.json +++ b/packages/@aws-cdk/aws-servicediscovery/package.json @@ -73,14 +73,14 @@ "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0", "@aws-cdk/aws-route53": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-ec2": "^0.35.0", "@aws-cdk/aws-elasticloadbalancingv2": "^0.35.0", "@aws-cdk/aws-route53": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-cname-record.lit.ts b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-cname-record.lit.ts index 10d8f50be29cc..19abb34fa3d5f 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-cname-record.lit.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-cname-record.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import servicediscovery = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-http-namespace.lit.ts b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-http-namespace.lit.ts index 3b54636ae29bc..fb714b23443cc 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-http-namespace.lit.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-http-namespace.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import servicediscovery = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-private-dns-namespace.lit.ts b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-private-dns-namespace.lit.ts index 3aeecdc78abaf..8bc0ef8bdf239 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-private-dns-namespace.lit.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-private-dns-namespace.lit.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import servicediscovery = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-public-dns-namespace.lit.ts b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-public-dns-namespace.lit.ts index 964054033b7d7..c035e75b06c39 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-public-dns-namespace.lit.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/integ.service-with-public-dns-namespace.lit.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import servicediscovery = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-servicediscovery/test/test.instance.ts b/packages/@aws-cdk/aws-servicediscovery/test/test.instance.ts index 7432cf7edab2b..a228c888c4b64 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/test.instance.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/test.instance.ts @@ -1,7 +1,7 @@ import { countResources, expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import servicediscovery = require('../lib'); diff --git a/packages/@aws-cdk/aws-servicediscovery/test/test.namespace.ts b/packages/@aws-cdk/aws-servicediscovery/test/test.namespace.ts index e261c48554087..80436a693854c 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/test.namespace.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/test.namespace.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import servicediscovery = require('../lib'); diff --git a/packages/@aws-cdk/aws-servicediscovery/test/test.service.ts b/packages/@aws-cdk/aws-servicediscovery/test/test.service.ts index 8f1c5c717109d..4953b452759d9 100644 --- a/packages/@aws-cdk/aws-servicediscovery/test/test.service.ts +++ b/packages/@aws-cdk/aws-servicediscovery/test/test.service.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import ec2 = require('@aws-cdk/aws-ec2'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import servicediscovery = require('../lib'); diff --git a/packages/@aws-cdk/aws-ses/lib/receipt-filter.ts b/packages/@aws-cdk/aws-ses/lib/receipt-filter.ts index 0388839488835..1404c07253ebc 100644 --- a/packages/@aws-cdk/aws-ses/lib/receipt-filter.ts +++ b/packages/@aws-cdk/aws-ses/lib/receipt-filter.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { CfnReceiptFilter } from './ses.generated'; /** diff --git a/packages/@aws-cdk/aws-ses/lib/receipt-rule-action.ts b/packages/@aws-cdk/aws-ses/lib/receipt-rule-action.ts index 62e6e7c39f611..8ca41899939fa 100644 --- a/packages/@aws-cdk/aws-ses/lib/receipt-rule-action.ts +++ b/packages/@aws-cdk/aws-ses/lib/receipt-rule-action.ts @@ -3,7 +3,7 @@ import kms = require('@aws-cdk/aws-kms'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { CfnReceiptRule } from './ses.generated'; /** diff --git a/packages/@aws-cdk/aws-ses/lib/receipt-rule-set.ts b/packages/@aws-cdk/aws-ses/lib/receipt-rule-set.ts index 7a2ecb367b5b6..2fbef79858de4 100644 --- a/packages/@aws-cdk/aws-ses/lib/receipt-rule-set.ts +++ b/packages/@aws-cdk/aws-ses/lib/receipt-rule-set.ts @@ -1,4 +1,4 @@ -import { Construct, IResource, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Resource } from '@aws-cdk/core'; import { DropSpamReceiptRule, ReceiptRule, ReceiptRuleOptions } from './receipt-rule'; import { CfnReceiptRuleSet } from './ses.generated'; diff --git a/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts b/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts index a1247ad9e52fa..26cabef5d0ebd 100644 --- a/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts +++ b/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts @@ -1,5 +1,5 @@ import lambda = require('@aws-cdk/aws-lambda'); -import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core'; import { IReceiptRuleAction, LambdaInvocationType, ReceiptRuleActionProps, ReceiptRuleLambdaAction } from './receipt-rule-action'; import { IReceiptRuleSet } from './receipt-rule-set'; import { CfnReceiptRule } from './ses.generated'; diff --git a/packages/@aws-cdk/aws-ses/package.json b/packages/@aws-cdk/aws-ses/package.json index 2cdc7de17bfd5..2cdae94bc929f 100644 --- a/packages/@aws-cdk/aws-ses/package.json +++ b/packages/@aws-cdk/aws-ses/package.json @@ -75,7 +75,7 @@ "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -84,7 +84,7 @@ "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-s3": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-ses/test/example.receiving.lit.ts b/packages/@aws-cdk/aws-ses/test/example.receiving.lit.ts index f14cfa46d10b6..46c5b052044ca 100644 --- a/packages/@aws-cdk/aws-ses/test/example.receiving.lit.ts +++ b/packages/@aws-cdk/aws-ses/test/example.receiving.lit.ts @@ -1,6 +1,6 @@ import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ses = require('../lib'); const stack = new cdk.Stack(); diff --git a/packages/@aws-cdk/aws-ses/test/integ.receipt.ts b/packages/@aws-cdk/aws-ses/test/integ.receipt.ts index 28ad4b236c551..fba6d9d6ebc55 100644 --- a/packages/@aws-cdk/aws-ses/test/integ.receipt.ts +++ b/packages/@aws-cdk/aws-ses/test/integ.receipt.ts @@ -2,7 +2,7 @@ import kms = require('@aws-cdk/aws-kms'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ses = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ses/test/test.receipt-filter.ts b/packages/@aws-cdk/aws-ses/test/test.receipt-filter.ts index 0d14b4b6c9bff..1abbf002a2a63 100644 --- a/packages/@aws-cdk/aws-ses/test/test.receipt-filter.ts +++ b/packages/@aws-cdk/aws-ses/test/test.receipt-filter.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ReceiptFilter, ReceiptFilterPolicy, WhiteListReceiptFilter } from '../lib'; diff --git a/packages/@aws-cdk/aws-ses/test/test.receipt-rule-action.ts b/packages/@aws-cdk/aws-ses/test/test.receipt-rule-action.ts index ea60d6c59a187..9d3cc9181c8c3 100644 --- a/packages/@aws-cdk/aws-ses/test/test.receipt-rule-action.ts +++ b/packages/@aws-cdk/aws-ses/test/test.receipt-rule-action.ts @@ -3,7 +3,7 @@ import kms = require('@aws-cdk/aws-kms'); import lambda = require('@aws-cdk/aws-lambda'); import s3 = require('@aws-cdk/aws-s3'); import sns = require('@aws-cdk/aws-sns'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; // tslint:disable:max-line-length import { EmailEncoding, LambdaInvocationType, ReceiptRuleAddHeaderAction, ReceiptRuleBounceAction, ReceiptRuleBounceActionTemplate, ReceiptRuleLambdaAction, ReceiptRuleS3Action, ReceiptRuleSet, ReceiptRuleSnsAction, ReceiptRuleStopAction } from '../lib'; diff --git a/packages/@aws-cdk/aws-ses/test/test.receipt-rule-set.ts b/packages/@aws-cdk/aws-ses/test/test.receipt-rule-set.ts index 4ed5ba325e568..be24c6bc2a4b0 100644 --- a/packages/@aws-cdk/aws-ses/test/test.receipt-rule-set.ts +++ b/packages/@aws-cdk/aws-ses/test/test.receipt-rule-set.ts @@ -1,5 +1,5 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ReceiptRuleSet } from '../lib'; diff --git a/packages/@aws-cdk/aws-ses/test/test.receipt-rule.ts b/packages/@aws-cdk/aws-ses/test/test.receipt-rule.ts index 1eb31bfbc650e..b6f5d968df282 100644 --- a/packages/@aws-cdk/aws-ses/test/test.receipt-rule.ts +++ b/packages/@aws-cdk/aws-ses/test/test.receipt-rule.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import { ReceiptRule, ReceiptRuleSet, TlsPolicy } from '../lib'; diff --git a/packages/@aws-cdk/aws-sns-subscriptions/lib/lambda.ts b/packages/@aws-cdk/aws-sns-subscriptions/lib/lambda.ts index d5e2c34a52770..7f78adf61b81a 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/lib/lambda.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/lib/lambda.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { SubscriptionProps } from './subscription'; /** diff --git a/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts b/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts index 02092f1dd9ac6..2fb411f70af34 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import sns = require('@aws-cdk/aws-sns'); import sqs = require('@aws-cdk/aws-sqs'); -import { Construct } from '@aws-cdk/cdk'; +import { Construct } from '@aws-cdk/core'; import { SubscriptionProps } from './subscription'; /** diff --git a/packages/@aws-cdk/aws-sns-subscriptions/package.json b/packages/@aws-cdk/aws-sns-subscriptions/package.json index b090380aeedab..57caf4aab04fc 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/package.json +++ b/packages/@aws-cdk/aws-sns-subscriptions/package.json @@ -80,7 +80,7 @@ "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -88,7 +88,7 @@ "@aws-cdk/aws-lambda": "^0.35.0", "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-lambda.ts b/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-lambda.ts index bd4e992df9c24..3588e3a795481 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-lambda.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-lambda.ts @@ -1,6 +1,6 @@ import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import subs = require('../lib'); class SnsToLambda extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-sqs.lit.ts b/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-sqs.lit.ts index 7d369c4e817e1..86212cfc59758 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-sqs.lit.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/test/integ.sns-sqs.lit.ts @@ -1,6 +1,6 @@ import sns = require('@aws-cdk/aws-sns'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import subs = require('../lib'); class SnsToSqs extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts b/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts index e92bcd75f30cd..9462674ea9709 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts +++ b/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import lambda = require('@aws-cdk/aws-lambda'); import sns = require('@aws-cdk/aws-sns'); import sqs = require('@aws-cdk/aws-sqs'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import subs = require('../lib'); // tslint:disable:object-literal-key-quotes diff --git a/packages/@aws-cdk/aws-sns/lib/policy.ts b/packages/@aws-cdk/aws-sns/lib/policy.ts index 7b289e30a58a8..9f8f3df35fb2b 100644 --- a/packages/@aws-cdk/aws-sns/lib/policy.ts +++ b/packages/@aws-cdk/aws-sns/lib/policy.ts @@ -1,5 +1,5 @@ import { PolicyDocument } from '@aws-cdk/aws-iam'; -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { CfnTopicPolicy } from './sns.generated'; import { ITopic } from './topic-base'; diff --git a/packages/@aws-cdk/aws-sns/lib/subscription.ts b/packages/@aws-cdk/aws-sns/lib/subscription.ts index 9c8a5c4bcaf2a..6d6169a845ca0 100644 --- a/packages/@aws-cdk/aws-sns/lib/subscription.ts +++ b/packages/@aws-cdk/aws-sns/lib/subscription.ts @@ -1,4 +1,4 @@ -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { CfnSubscription } from './sns.generated'; import { SubscriptionFilter } from './subscription-filter'; import { ITopic } from './topic-base'; diff --git a/packages/@aws-cdk/aws-sns/lib/topic-base.ts b/packages/@aws-cdk/aws-sns/lib/topic-base.ts index cd76a274d10b4..35bf01907d0c8 100644 --- a/packages/@aws-cdk/aws-sns/lib/topic-base.ts +++ b/packages/@aws-cdk/aws-sns/lib/topic-base.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { IResource, Resource } from '@aws-cdk/cdk'; +import { IResource, Resource } from '@aws-cdk/core'; import { TopicPolicy } from './policy'; import { ITopicSubscription } from './subscriber'; import { Subscription } from './subscription'; diff --git a/packages/@aws-cdk/aws-sns/lib/topic.ts b/packages/@aws-cdk/aws-sns/lib/topic.ts index ec423cf23964a..1f9c1d38fee3c 100644 --- a/packages/@aws-cdk/aws-sns/lib/topic.ts +++ b/packages/@aws-cdk/aws-sns/lib/topic.ts @@ -1,4 +1,4 @@ -import { Construct, Stack } from '@aws-cdk/cdk'; +import { Construct, Stack } from '@aws-cdk/core'; import { CfnTopic } from './sns.generated'; import { ITopic, TopicBase } from './topic-base'; diff --git a/packages/@aws-cdk/aws-sns/package.json b/packages/@aws-cdk/aws-sns/package.json index 16054cc704953..d261205c20303 100644 --- a/packages/@aws-cdk/aws-sns/package.json +++ b/packages/@aws-cdk/aws-sns/package.json @@ -77,14 +77,14 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-sns/test/integ.sns.ts b/packages/@aws-cdk/aws-sns/test/integ.sns.ts index d6aaa9939ce4d..c5bb1e5e991c4 100644 --- a/packages/@aws-cdk/aws-sns/test/integ.sns.ts +++ b/packages/@aws-cdk/aws-sns/test/integ.sns.ts @@ -1,4 +1,4 @@ -import { App, Stack, StackProps } from '@aws-cdk/cdk'; +import { App, Stack, StackProps } from '@aws-cdk/core'; import { Topic } from '../lib'; class SNSInteg extends Stack { diff --git a/packages/@aws-cdk/aws-sns/test/test.sns.ts b/packages/@aws-cdk/aws-sns/test/test.sns.ts index 852d2e9a9bb38..53a5c9e68d34e 100644 --- a/packages/@aws-cdk/aws-sns/test/test.sns.ts +++ b/packages/@aws-cdk/aws-sns/test/test.sns.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import sns = require('../lib'); diff --git a/packages/@aws-cdk/aws-sns/test/test.subscription.ts b/packages/@aws-cdk/aws-sns/test/test.subscription.ts index 6bf653ce95f35..b9b215dfafd89 100644 --- a/packages/@aws-cdk/aws-sns/test/test.subscription.ts +++ b/packages/@aws-cdk/aws-sns/test/test.subscription.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 sns = require('../lib'); diff --git a/packages/@aws-cdk/aws-sqs/lib/policy.ts b/packages/@aws-cdk/aws-sqs/lib/policy.ts index f8f24f76d2e85..0d7517d9c2de5 100644 --- a/packages/@aws-cdk/aws-sqs/lib/policy.ts +++ b/packages/@aws-cdk/aws-sqs/lib/policy.ts @@ -1,5 +1,5 @@ import { PolicyDocument } from '@aws-cdk/aws-iam'; -import { Construct, Resource } from '@aws-cdk/cdk'; +import { Construct, Resource } from '@aws-cdk/core'; import { IQueue } from './queue-base'; import { CfnQueuePolicy } from './sqs.generated'; diff --git a/packages/@aws-cdk/aws-sqs/lib/queue-base.ts b/packages/@aws-cdk/aws-sqs/lib/queue-base.ts index ae2b134a030b3..b8d158839dd42 100644 --- a/packages/@aws-cdk/aws-sqs/lib/queue-base.ts +++ b/packages/@aws-cdk/aws-sqs/lib/queue-base.ts @@ -1,6 +1,6 @@ import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { IResource, Resource } from '@aws-cdk/cdk'; +import { IResource, Resource } from '@aws-cdk/core'; import { QueuePolicy } from './policy'; export interface IQueue extends IResource { diff --git a/packages/@aws-cdk/aws-sqs/lib/queue.ts b/packages/@aws-cdk/aws-sqs/lib/queue.ts index c77a9aafce6a6..9247c156ef188 100644 --- a/packages/@aws-cdk/aws-sqs/lib/queue.ts +++ b/packages/@aws-cdk/aws-sqs/lib/queue.ts @@ -1,5 +1,5 @@ import kms = require('@aws-cdk/aws-kms'); -import { Construct, Duration, Stack, Token } from '@aws-cdk/cdk'; +import { Construct, Duration, Stack, Token } from '@aws-cdk/core'; import { IQueue, QueueAttributes, QueueBase } from './queue-base'; import { CfnQueue } from './sqs.generated'; import { validateProps } from './validate-props'; diff --git a/packages/@aws-cdk/aws-sqs/package.json b/packages/@aws-cdk/aws-sqs/package.json index 5b0e9ec663950..4c4e45f57d40b 100644 --- a/packages/@aws-cdk/aws-sqs/package.json +++ b/packages/@aws-cdk/aws-sqs/package.json @@ -75,14 +75,14 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", "@aws-cdk/aws-kms": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts b/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts index 354d8acf922cb..c17b3f423dbea 100644 --- a/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts +++ b/packages/@aws-cdk/aws-sqs/test/integ.sqs.ts @@ -1,4 +1,4 @@ -import { App, CfnOutput, Stack } from '@aws-cdk/cdk'; +import { App, CfnOutput, Stack } from '@aws-cdk/core'; import { Queue } from '../lib'; const app = new App(); diff --git a/packages/@aws-cdk/aws-sqs/test/test.sqs.ts b/packages/@aws-cdk/aws-sqs/test/test.sqs.ts index 90650b51226d5..dc1a4520708d1 100644 --- a/packages/@aws-cdk/aws-sqs/test/test.sqs.ts +++ b/packages/@aws-cdk/aws-sqs/test/test.sqs.ts @@ -1,7 +1,7 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); -import { Duration, Stack } from '@aws-cdk/cdk'; +import { Duration, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import sqs = require('../lib'); import { Queue } from '../lib'; diff --git a/packages/@aws-cdk/aws-ssm/lib/parameter.ts b/packages/@aws-cdk/aws-ssm/lib/parameter.ts index 08edcaf96a14e..b391fdf2ff13e 100644 --- a/packages/@aws-cdk/aws-ssm/lib/parameter.ts +++ b/packages/@aws-cdk/aws-ssm/lib/parameter.ts @@ -2,7 +2,7 @@ import iam = require('@aws-cdk/aws-iam'); import { CfnDynamicReference, CfnDynamicReferenceService, CfnParameter, Construct, ContextProvider, Fn, IConstruct, IResource, Resource, Stack, Token -} from '@aws-cdk/cdk'; +} from '@aws-cdk/core'; import cxapi = require('@aws-cdk/cx-api'); import ssm = require('./ssm.generated'); diff --git a/packages/@aws-cdk/aws-ssm/package.json b/packages/@aws-cdk/aws-ssm/package.json index 1ee2da44c6fcb..a47de960164fc 100644 --- a/packages/@aws-cdk/aws-ssm/package.json +++ b/packages/@aws-cdk/aws-ssm/package.json @@ -72,13 +72,13 @@ "dependencies": { "@aws-cdk/cx-api": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/cx-api": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-ssm/test/integ.parameter-store-string.lit.ts b/packages/@aws-cdk/aws-ssm/test/integ.parameter-store-string.lit.ts index 9066582ff5513..d8cd98b8b4285 100644 --- a/packages/@aws-cdk/aws-ssm/test/integ.parameter-store-string.lit.ts +++ b/packages/@aws-cdk/aws-ssm/test/integ.parameter-store-string.lit.ts @@ -1,5 +1,5 @@ /// !cdk-integ * -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ssm = require('../lib'); class CreatingStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-ssm/test/integ.parameter.lit.ts b/packages/@aws-cdk/aws-ssm/test/integ.parameter.lit.ts index 1e8c1a8ae3a6b..448a30623bd74 100644 --- a/packages/@aws-cdk/aws-ssm/test/integ.parameter.lit.ts +++ b/packages/@aws-cdk/aws-ssm/test/integ.parameter.lit.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import ssm = require('../lib'); const app = new cdk.App(); diff --git a/packages/@aws-cdk/aws-ssm/test/test.parameter-store-string.ts b/packages/@aws-cdk/aws-ssm/test/test.parameter-store-string.ts index 50aba31e32e6b..cb7ffd7997e8a 100644 --- a/packages/@aws-cdk/aws-ssm/test/test.parameter-store-string.ts +++ b/packages/@aws-cdk/aws-ssm/test/test.parameter-store-string.ts @@ -1,5 +1,5 @@ import { expect } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import ssm = require('../lib'); diff --git a/packages/@aws-cdk/aws-ssm/test/test.parameter.ts b/packages/@aws-cdk/aws-ssm/test/test.parameter.ts index 95fcfa71fa285..8d3416010b87c 100644 --- a/packages/@aws-cdk/aws-ssm/test/test.parameter.ts +++ b/packages/@aws-cdk/aws-ssm/test/test.parameter.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; -import cdk = require('@aws-cdk/cdk'); -import { App, Stack } from '@aws-cdk/cdk'; +import cdk = require('@aws-cdk/core'); +import { App, Stack } from '@aws-cdk/core'; import { Test } from 'nodeunit'; import ssm = require('../lib'); diff --git a/packages/@aws-cdk/aws-ssm/test/test.ssm-document.ts b/packages/@aws-cdk/aws-ssm/test/test.ssm-document.ts index ccd4522a11e76..f8cd4283c355a 100644 --- a/packages/@aws-cdk/aws-ssm/test/test.ssm-document.ts +++ b/packages/@aws-cdk/aws-ssm/test/test.ssm-document.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 ssm = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/invoke-activity.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/invoke-activity.ts index 910ca332e9f7e..9209b9a4c64da 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/invoke-activity.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/invoke-activity.ts @@ -1,5 +1,5 @@ import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; /** * Properties for FunctionTask diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/run-ecs-task-base.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/run-ecs-task-base.ts index 4b8250de5d892..e15f057c7cbdc 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/run-ecs-task-base.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/run-ecs-task-base.ts @@ -2,8 +2,8 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import iam = require('@aws-cdk/aws-iam'); import sfn = require('@aws-cdk/aws-stepfunctions'); -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 { ContainerOverride } from './run-ecs-task-base-types'; /** diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-task-base-types.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-task-base-types.ts index 9648b4bac4928..7f07ec26f2259 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-task-base-types.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-task-base-types.ts @@ -1,6 +1,6 @@ import ec2 = require('@aws-cdk/aws-ec2'); import kms = require('@aws-cdk/aws-kms'); -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; // // Create Training Job types diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-train-task.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-train-task.ts index 4b1f38c96b7c5..9cdb1af7c9e9b 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-train-task.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-train-task.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Construct, Duration, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, Stack } from '@aws-cdk/core'; import { AlgorithmSpecification, Channel, InputMode, OutputDataConfig, ResourceConfig, S3DataType, StoppingCondition, VpcConfig, } from './sagemaker-task-base-types'; diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-transform-task.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-transform-task.ts index 8a01c6f88a2e2..ad3663d2687c5 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-transform-task.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/sagemaker-transform-task.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Construct, Stack } from '@aws-cdk/cdk'; +import { Construct, Stack } from '@aws-cdk/core'; import { BatchStrategy, S3DataType, TransformInput, TransformOutput, TransformResources } from './sagemaker-task-base-types'; /** diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/send-to-queue.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/send-to-queue.ts index 7bda7b2854e02..015a8b783aecb 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/lib/send-to-queue.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/lib/send-to-queue.ts @@ -1,7 +1,7 @@ import iam = require('@aws-cdk/aws-iam'); import sqs = require('@aws-cdk/aws-sqs'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; /** * Properties for SendMessageTask diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/package.json b/packages/@aws-cdk/aws-stepfunctions-tasks/package.json index 0a8d5f5abc3ee..7e2ab39d00db4 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/package.json +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/package.json @@ -87,7 +87,7 @@ "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", "@aws-cdk/aws-stepfunctions": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { @@ -100,7 +100,7 @@ "@aws-cdk/aws-sns": "^0.35.0", "@aws-cdk/aws-sqs": "^0.35.0", "@aws-cdk/aws-stepfunctions": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs-tasks.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs-tasks.test.ts index 565fcc0b4b112..d6efeb24c59c6 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs-tasks.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs-tasks.test.ts @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest'; import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import tasks = require('../lib'); let stack: Stack; diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.ts index 043a638a2cc95..b512fd605c302 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import tasks = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.ts index 575ac379b76ab..01501a7f3d5e4 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.ts @@ -1,7 +1,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import ecs = require('@aws-cdk/aws-ecs'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import tasks = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.invoke-function.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.invoke-function.ts index 2d0cb5eeaa659..144ee8443058f 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.invoke-function.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.invoke-function.ts @@ -1,5 +1,5 @@ import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import path = require('path'); import { Code, Function, Runtime } from '../../aws-lambda/lib'; import tasks = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.job-poller.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.job-poller.ts index 5f7f9db9d731f..284745563204a 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.job-poller.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.job-poller.ts @@ -1,5 +1,5 @@ import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require( '@aws-cdk/cdk'); +import cdk = require( '@aws-cdk/core'); import tasks = require('../lib'); class JobPollerStack extends cdk.Stack { diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-activity.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-activity.test.ts index 89976aad4ec92..0e9bdab8d7f3d 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-activity.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-activity.test.ts @@ -1,6 +1,6 @@ import '@aws-cdk/assert/jest'; import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import tasks = require('../lib'); test('Activity can be used in a Task', () => { diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-function.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-function.test.ts index d9b3c8664af1d..a3a3d6b7d872e 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-function.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/invoke-function.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import lambda = require('@aws-cdk/aws-lambda'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import tasks = require('../lib'); let stack: Stack; diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/publish-to-topic.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/publish-to-topic.test.ts index ca349bc0a7732..6108f341bdd24 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/publish-to-topic.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/publish-to-topic.test.ts @@ -1,6 +1,6 @@ import sns = require('@aws-cdk/aws-sns'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import tasks = require('../lib'); test('Publish literal message to SNS topic', () => { diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/run-lambda-task.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/run-lambda-task.test.ts index 090c335160b6d..c190b14ec3872 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/run-lambda-task.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/run-lambda-task.test.ts @@ -1,7 +1,7 @@ import '@aws-cdk/assert/jest'; import lambda = require('@aws-cdk/aws-lambda'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import { Stack } from '@aws-cdk/cdk'; +import { Stack } from '@aws-cdk/core'; import tasks = require('../lib'); let stack: Stack; diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-training-job.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-training-job.test.ts index ddff91b8b4bc5..58c557782c57d 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-training-job.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-training-job.test.ts @@ -3,7 +3,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import tasks = require('../lib'); let stack: cdk.Stack; diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-transform-job.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-transform-job.test.ts index d61eec4cdebc4..6fd362d026c40 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-transform-job.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/sagemaker-transform-job.test.ts @@ -3,7 +3,7 @@ import ec2 = require('@aws-cdk/aws-ec2'); import iam = require('@aws-cdk/aws-iam'); import kms = require('@aws-cdk/aws-kms'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import tasks = require('../lib'); import { BatchStrategy, S3DataType } from '../lib'; diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/send-to-queue.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/send-to-queue.test.ts index fc0e03d0aee13..a13439ed2acc2 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/send-to-queue.test.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/send-to-queue.test.ts @@ -1,6 +1,6 @@ import sqs = require('@aws-cdk/aws-sqs'); import sfn = require('@aws-cdk/aws-stepfunctions'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import tasks = require('../lib'); let stack: cdk.Stack; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/activity.ts b/packages/@aws-cdk/aws-stepfunctions/lib/activity.ts index 763a95746c768..36b999ca987ff 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/activity.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/activity.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import { Construct, IResource, Lazy, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, IResource, Lazy, Resource, Stack } from '@aws-cdk/core'; import { CfnActivity } from './stepfunctions.generated'; export interface ActivityProps { diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/fields.ts b/packages/@aws-cdk/aws-stepfunctions/lib/fields.ts index c6d1890e2512f..db2952ad43fae 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/fields.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/fields.ts @@ -1,4 +1,4 @@ -import { Token } from "@aws-cdk/cdk"; +import { Token } from "@aws-cdk/core"; import { findReferencedPaths, JsonPathToken, renderObject } from "./json-path"; /** diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/json-path.ts b/packages/@aws-cdk/aws-stepfunctions/lib/json-path.ts index e9f07fa2f7a4a..717aa4bd06262 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/json-path.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/json-path.ts @@ -1,4 +1,4 @@ -import { captureStackTrace, IResolvable, IResolveContext, Token, Tokenization } from '@aws-cdk/cdk'; +import { captureStackTrace, IResolvable, IResolveContext, Token, Tokenization } from '@aws-cdk/core'; const JSON_PATH_TOKEN_SYMBOL = Symbol.for('@aws-cdk/aws-stepfunctions.JsonPathToken'); diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/state-graph.ts b/packages/@aws-cdk/aws-stepfunctions/lib/state-graph.ts index 00f13f69da502..278cb69ecd7a7 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/state-graph.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/state-graph.ts @@ -1,5 +1,5 @@ import iam = require('@aws-cdk/aws-iam'); -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; import { State } from "./states/state"; /** diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/state-machine-fragment.ts b/packages/@aws-cdk/aws-stepfunctions/lib/state-machine-fragment.ts index 5998a53597c9e..5cd0dd5606154 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/state-machine-fragment.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/state-machine-fragment.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Chain } from './chain'; import { Parallel, ParallelProps } from './states/parallel'; import { State } from './states/state'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts b/packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts index 4bbeac871a39e..019004bc36435 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import iam = require('@aws-cdk/aws-iam'); -import { Construct, Duration, IResource, Resource, Stack } from '@aws-cdk/cdk'; +import { Construct, Duration, IResource, Resource, Stack } from '@aws-cdk/core'; import { StateGraph } from './state-graph'; import { CfnStateMachine } from './stepfunctions.generated'; import { IChainable } from './types'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/choice.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/choice.ts index 51766af2ecb6c..2f74f826487c2 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/choice.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/choice.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Chain } from '../chain'; import { Condition } from '../condition'; import { IChainable, INextable } from '../types'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/fail.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/fail.ts index 254a03e69d9cc..957a1e2af9b0d 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/fail.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/fail.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { INextable } from '../types'; import { State, StateType } from './state'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/parallel.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/parallel.ts index a9a25237b0195..30c6c465b5cf7 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/parallel.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/parallel.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Chain } from '../chain'; import { StateGraph } from '../state-graph'; import { CatchProps, IChainable, INextable, RetryProps } from '../types'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/pass.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/pass.ts index ab02ed944d11a..8bdd1abdbbe18 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/pass.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/pass.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import {Chain} from '../chain'; import {IChainable, INextable} from '../types'; import {renderJsonPath, State, StateType} from './state'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/state.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/state.ts index ed87f1002fab7..e683ecfe83819 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/state.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/state.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Condition } from '../condition'; import { StateGraph } from '../state-graph'; import { CatchProps, DISCARD, Errors, IChainable, INextable, RetryProps } from '../types'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/succeed.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/succeed.ts index 995b5e628f4d0..49ec414002f5f 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/succeed.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/succeed.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { INextable } from '../types'; import { State, StateType } from './state'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/task.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/task.ts index e01439251be78..53f80128251f4 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/task.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/task.ts @@ -1,5 +1,5 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Chain } from '../chain'; import { FieldUtils } from '../fields'; import { StateGraph } from '../state-graph'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/states/wait.ts b/packages/@aws-cdk/aws-stepfunctions/lib/states/wait.ts index 73f9e983244fd..61a22bac39a3c 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/states/wait.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/states/wait.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Chain } from '../chain'; import { IChainable, INextable } from '../types'; import { State, StateType } from './state'; diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/step-functions-task.ts b/packages/@aws-cdk/aws-stepfunctions/lib/step-functions-task.ts index a8dabc6658f54..3b2a72f672377 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/step-functions-task.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/step-functions-task.ts @@ -1,6 +1,6 @@ import cloudwatch = require('@aws-cdk/aws-cloudwatch'); import iam = require('@aws-cdk/aws-iam'); -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; import { Task } from './states/task'; /** diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/types.ts b/packages/@aws-cdk/aws-stepfunctions/lib/types.ts index 5116c0382db38..a2a3d31dd1422 100644 --- a/packages/@aws-cdk/aws-stepfunctions/lib/types.ts +++ b/packages/@aws-cdk/aws-stepfunctions/lib/types.ts @@ -1,4 +1,4 @@ -import { Duration } from '@aws-cdk/cdk'; +import { Duration } from '@aws-cdk/core'; import { Chain } from './chain'; import { State } from './states/state'; diff --git a/packages/@aws-cdk/aws-stepfunctions/package.json b/packages/@aws-cdk/aws-stepfunctions/package.json index a357bb7ef1cd0..135c0b527497e 100644 --- a/packages/@aws-cdk/aws-stepfunctions/package.json +++ b/packages/@aws-cdk/aws-stepfunctions/package.json @@ -73,14 +73,14 @@ "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { "@aws-cdk/aws-cloudwatch": "^0.35.0", "@aws-cdk/aws-events": "^0.35.0", "@aws-cdk/aws-iam": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-stepfunctions/test/test.activity.ts b/packages/@aws-cdk/aws-stepfunctions/test/test.activity.ts index f0775cc2e4168..db42e3cb5ae5e 100644 --- a/packages/@aws-cdk/aws-stepfunctions/test/test.activity.ts +++ b/packages/@aws-cdk/aws-stepfunctions/test/test.activity.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 stepfunctions = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions/test/test.fail.ts b/packages/@aws-cdk/aws-stepfunctions/test/test.fail.ts index 4dfb061328392..ab149ae139b77 100644 --- a/packages/@aws-cdk/aws-stepfunctions/test/test.fail.ts +++ b/packages/@aws-cdk/aws-stepfunctions/test/test.fail.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import stepfunctions = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions/test/test.state-machine-resources.ts b/packages/@aws-cdk/aws-stepfunctions/test/test.state-machine-resources.ts index 588aa8c46f2c3..889364276e327 100644 --- a/packages/@aws-cdk/aws-stepfunctions/test/test.state-machine-resources.ts +++ b/packages/@aws-cdk/aws-stepfunctions/test/test.state-machine-resources.ts @@ -1,6 +1,6 @@ import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import stepfunctions = require('../lib'); diff --git a/packages/@aws-cdk/aws-stepfunctions/test/test.states-language.ts b/packages/@aws-cdk/aws-stepfunctions/test/test.states-language.ts index a4c2d50e5c45b..ceed07fa42dbf 100644 --- a/packages/@aws-cdk/aws-stepfunctions/test/test.states-language.ts +++ b/packages/@aws-cdk/aws-stepfunctions/test/test.states-language.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { Test } from 'nodeunit'; import stepfunctions = require('../lib'); import { IStepFunctionsTask } from '../lib'; diff --git a/packages/@aws-cdk/aws-transfer/package.json b/packages/@aws-cdk/aws-transfer/package.json index 568222ce7611d..9926781d64c17 100644 --- a/packages/@aws-cdk/aws-transfer/package.json +++ b/packages/@aws-cdk/aws-transfer/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" diff --git a/packages/@aws-cdk/aws-waf/package.json b/packages/@aws-cdk/aws-waf/package.json index d00a297f20585..3832092a1a63f 100644 --- a/packages/@aws-cdk/aws-waf/package.json +++ b/packages/@aws-cdk/aws-waf/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-wafregional/package.json b/packages/@aws-cdk/aws-wafregional/package.json index b9a3c2bd5b9dd..f067996a4e82a 100644 --- a/packages/@aws-cdk/aws-wafregional/package.json +++ b/packages/@aws-cdk/aws-wafregional/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/aws-workspaces/package.json b/packages/@aws-cdk/aws-workspaces/package.json index bc4169a749946..dc16680fd9da9 100644 --- a/packages/@aws-cdk/aws-workspaces/package.json +++ b/packages/@aws-cdk/aws-workspaces/package.json @@ -69,11 +69,11 @@ "pkglint": "^0.35.0" }, "dependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "homepage": "https://github.com/awslabs/aws-cdk", "peerDependencies": { - "@aws-cdk/cdk": "^0.35.0" + "@aws-cdk/core": "^0.35.0" }, "engines": { "node": ">= 8.10.0" diff --git a/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts b/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts index 2f9c8fe859b85..0ea29a3691cf1 100644 --- a/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts +++ b/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts @@ -168,10 +168,10 @@ async function main() { "pkglint": `^${version}`, }, dependencies: { - "@aws-cdk/cdk": `^${version}`, + "@aws-cdk/core": `^${version}`, }, peerDependencies: { - "@aws-cdk/cdk": `^${version}`, + "@aws-cdk/core": `^${version}`, }, engines: { node: '>= 8.10.0' diff --git a/packages/@aws-cdk/cdk/.gitignore b/packages/@aws-cdk/core/.gitignore similarity index 100% rename from packages/@aws-cdk/cdk/.gitignore rename to packages/@aws-cdk/core/.gitignore diff --git a/packages/@aws-cdk/cdk/.npmignore b/packages/@aws-cdk/core/.npmignore similarity index 100% rename from packages/@aws-cdk/cdk/.npmignore rename to packages/@aws-cdk/core/.npmignore diff --git a/packages/@aws-cdk/cdk/LICENSE b/packages/@aws-cdk/core/LICENSE similarity index 100% rename from packages/@aws-cdk/cdk/LICENSE rename to packages/@aws-cdk/core/LICENSE diff --git a/packages/@aws-cdk/cdk/NOTICE b/packages/@aws-cdk/core/NOTICE similarity index 100% rename from packages/@aws-cdk/cdk/NOTICE rename to packages/@aws-cdk/core/NOTICE diff --git a/packages/@aws-cdk/cdk/README.md b/packages/@aws-cdk/core/README.md similarity index 99% rename from packages/@aws-cdk/cdk/README.md rename to packages/@aws-cdk/core/README.md index d019878edd46f..ec6276e8a2b56 100644 --- a/packages/@aws-cdk/cdk/README.md +++ b/packages/@aws-cdk/core/README.md @@ -50,7 +50,7 @@ A simple example, if you create a stack and want anything in the stack to receiv tag: ```ts -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); const app = new cdk.App(); const theBestStack = new cdk.Stack(app, 'MarketingSystem'); diff --git a/packages/@aws-cdk/cdk/lib/app.ts b/packages/@aws-cdk/core/lib/app.ts similarity index 98% rename from packages/@aws-cdk/cdk/lib/app.ts rename to packages/@aws-cdk/core/lib/app.ts index dec5fe1720128..8ce6b7275c4dc 100644 --- a/packages/@aws-cdk/cdk/lib/app.ts +++ b/packages/@aws-cdk/core/lib/app.ts @@ -3,7 +3,7 @@ import { CloudAssembly } from '@aws-cdk/cx-api'; import { Construct, ConstructNode } from './construct'; import { collectRuntimeInformation } from './private/runtime-info'; -const APP_SYMBOL = Symbol.for('@aws-cdk/cdk.App'); +const APP_SYMBOL = Symbol.for('@aws-cdk/core.App'); /** * Initialization props for apps. diff --git a/packages/@aws-cdk/cdk/lib/arn.ts b/packages/@aws-cdk/core/lib/arn.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/arn.ts rename to packages/@aws-cdk/core/lib/arn.ts diff --git a/packages/@aws-cdk/cdk/lib/aspect.ts b/packages/@aws-cdk/core/lib/aspect.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/aspect.ts rename to packages/@aws-cdk/core/lib/aspect.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-condition.ts b/packages/@aws-cdk/core/lib/cfn-condition.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-condition.ts rename to packages/@aws-cdk/core/lib/cfn-condition.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-dynamic-reference.ts b/packages/@aws-cdk/core/lib/cfn-dynamic-reference.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-dynamic-reference.ts rename to packages/@aws-cdk/core/lib/cfn-dynamic-reference.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-element.ts b/packages/@aws-cdk/core/lib/cfn-element.ts similarity index 98% rename from packages/@aws-cdk/cdk/lib/cfn-element.ts rename to packages/@aws-cdk/core/lib/cfn-element.ts index 4b24d7560e757..c209ed209aa81 100644 --- a/packages/@aws-cdk/cdk/lib/cfn-element.ts +++ b/packages/@aws-cdk/core/lib/cfn-element.ts @@ -3,7 +3,7 @@ import { Construct } from "./construct"; import { Lazy } from "./lazy"; import { Token } from './token'; -const CFN_ELEMENT_SYMBOL = Symbol.for('@aws-cdk/cdk.CfnElement'); +const CFN_ELEMENT_SYMBOL = Symbol.for('@aws-cdk/core.CfnElement'); /** * An element of a CloudFormation stack. diff --git a/packages/@aws-cdk/cdk/lib/cfn-fn.ts b/packages/@aws-cdk/core/lib/cfn-fn.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-fn.ts rename to packages/@aws-cdk/core/lib/cfn-fn.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-include.ts b/packages/@aws-cdk/core/lib/cfn-include.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-include.ts rename to packages/@aws-cdk/core/lib/cfn-include.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-mapping.ts b/packages/@aws-cdk/core/lib/cfn-mapping.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-mapping.ts rename to packages/@aws-cdk/core/lib/cfn-mapping.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-output.ts b/packages/@aws-cdk/core/lib/cfn-output.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-output.ts rename to packages/@aws-cdk/core/lib/cfn-output.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-parameter.ts b/packages/@aws-cdk/core/lib/cfn-parameter.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-parameter.ts rename to packages/@aws-cdk/core/lib/cfn-parameter.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-pseudo.ts b/packages/@aws-cdk/core/lib/cfn-pseudo.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-pseudo.ts rename to packages/@aws-cdk/core/lib/cfn-pseudo.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-resource-policy.ts b/packages/@aws-cdk/core/lib/cfn-resource-policy.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-resource-policy.ts rename to packages/@aws-cdk/core/lib/cfn-resource-policy.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-resource.ts b/packages/@aws-cdk/core/lib/cfn-resource.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-resource.ts rename to packages/@aws-cdk/core/lib/cfn-resource.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-rule.ts b/packages/@aws-cdk/core/lib/cfn-rule.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-rule.ts rename to packages/@aws-cdk/core/lib/cfn-rule.ts diff --git a/packages/@aws-cdk/cdk/lib/cfn-tag.ts b/packages/@aws-cdk/core/lib/cfn-tag.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/cfn-tag.ts rename to packages/@aws-cdk/core/lib/cfn-tag.ts diff --git a/packages/@aws-cdk/cdk/lib/construct.ts b/packages/@aws-cdk/core/lib/construct.ts similarity index 99% rename from packages/@aws-cdk/cdk/lib/construct.ts rename to packages/@aws-cdk/core/lib/construct.ts index 35f1452661ad1..ece3dd4eb4fb1 100644 --- a/packages/@aws-cdk/cdk/lib/construct.ts +++ b/packages/@aws-cdk/core/lib/construct.ts @@ -6,7 +6,7 @@ import { IResolvable } from './resolvable'; import { captureStackTrace } from './stack-trace'; import { Token } from './token'; -const CONSTRUCT_SYMBOL = Symbol.for('@aws-cdk/cdk.Construct'); +const CONSTRUCT_SYMBOL = Symbol.for('@aws-cdk/core.Construct'); /** * Represents a construct. diff --git a/packages/@aws-cdk/cdk/lib/context-provider.ts b/packages/@aws-cdk/core/lib/context-provider.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/context-provider.ts rename to packages/@aws-cdk/core/lib/context-provider.ts diff --git a/packages/@aws-cdk/cdk/lib/dependency.ts b/packages/@aws-cdk/core/lib/dependency.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/dependency.ts rename to packages/@aws-cdk/core/lib/dependency.ts diff --git a/packages/@aws-cdk/cdk/lib/duration.ts b/packages/@aws-cdk/core/lib/duration.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/duration.ts rename to packages/@aws-cdk/core/lib/duration.ts diff --git a/packages/@aws-cdk/cdk/lib/environment.ts b/packages/@aws-cdk/core/lib/environment.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/environment.ts rename to packages/@aws-cdk/core/lib/environment.ts diff --git a/packages/@aws-cdk/cdk/lib/index.ts b/packages/@aws-cdk/core/lib/index.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/index.ts rename to packages/@aws-cdk/core/lib/index.ts diff --git a/packages/@aws-cdk/cdk/lib/lazy.ts b/packages/@aws-cdk/core/lib/lazy.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/lazy.ts rename to packages/@aws-cdk/core/lib/lazy.ts diff --git a/packages/@aws-cdk/cdk/lib/physical-name.ts b/packages/@aws-cdk/core/lib/physical-name.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/physical-name.ts rename to packages/@aws-cdk/core/lib/physical-name.ts diff --git a/packages/@aws-cdk/cdk/lib/private/cfn-reference.ts b/packages/@aws-cdk/core/lib/private/cfn-reference.ts similarity index 99% rename from packages/@aws-cdk/cdk/lib/private/cfn-reference.ts rename to packages/@aws-cdk/core/lib/private/cfn-reference.ts index 24aca74187b74..1392cfd4ab55c 100644 --- a/packages/@aws-cdk/cdk/lib/private/cfn-reference.ts +++ b/packages/@aws-cdk/core/lib/private/cfn-reference.ts @@ -1,7 +1,7 @@ import { Reference } from "../reference"; import { makeUniqueId } from './uniqueid'; -const CFN_REFERENCE_SYMBOL = Symbol.for('@aws-cdk/cdk.CfnReference'); +const CFN_REFERENCE_SYMBOL = Symbol.for('@aws-cdk/core.CfnReference'); /** * A Token that represents a CloudFormation reference to another resource diff --git a/packages/@aws-cdk/cdk/lib/private/cloudformation-lang.ts b/packages/@aws-cdk/core/lib/private/cloudformation-lang.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/cloudformation-lang.ts rename to packages/@aws-cdk/core/lib/private/cloudformation-lang.ts diff --git a/packages/@aws-cdk/cdk/lib/private/encoding.ts b/packages/@aws-cdk/core/lib/private/encoding.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/encoding.ts rename to packages/@aws-cdk/core/lib/private/encoding.ts diff --git a/packages/@aws-cdk/cdk/lib/private/intrinsic.ts b/packages/@aws-cdk/core/lib/private/intrinsic.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/intrinsic.ts rename to packages/@aws-cdk/core/lib/private/intrinsic.ts diff --git a/packages/@aws-cdk/cdk/lib/private/logical-id.ts b/packages/@aws-cdk/core/lib/private/logical-id.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/logical-id.ts rename to packages/@aws-cdk/core/lib/private/logical-id.ts diff --git a/packages/@aws-cdk/cdk/lib/private/node-version.ts b/packages/@aws-cdk/core/lib/private/node-version.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/node-version.ts rename to packages/@aws-cdk/core/lib/private/node-version.ts diff --git a/packages/@aws-cdk/cdk/lib/private/physical-name-generator.ts b/packages/@aws-cdk/core/lib/private/physical-name-generator.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/physical-name-generator.ts rename to packages/@aws-cdk/core/lib/private/physical-name-generator.ts diff --git a/packages/@aws-cdk/cdk/lib/private/resolve.ts b/packages/@aws-cdk/core/lib/private/resolve.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/resolve.ts rename to packages/@aws-cdk/core/lib/private/resolve.ts diff --git a/packages/@aws-cdk/cdk/lib/private/runtime-info.ts b/packages/@aws-cdk/core/lib/private/runtime-info.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/runtime-info.ts rename to packages/@aws-cdk/core/lib/private/runtime-info.ts diff --git a/packages/@aws-cdk/cdk/lib/private/token-map.ts b/packages/@aws-cdk/core/lib/private/token-map.ts similarity index 96% rename from packages/@aws-cdk/cdk/lib/private/token-map.ts rename to packages/@aws-cdk/core/lib/private/token-map.ts index 5e006b55b9dae..17e1ee33cebfa 100644 --- a/packages/@aws-cdk/cdk/lib/private/token-map.ts +++ b/packages/@aws-cdk/core/lib/private/token-map.ts @@ -6,9 +6,9 @@ import { BEGIN_LIST_TOKEN_MARKER, BEGIN_STRING_TOKEN_MARKER, createTokenDouble, const glob = global as any; -const STRING_SYMBOL = Symbol.for('@aws-cdk/cdk.TokenMap.STRING'); -const LIST_SYMBOL = Symbol.for('@aws-cdk/cdk.TokenMap.LIST'); -const NUMBER_SYMBOL = Symbol.for('@aws-cdk/cdk.TokenMap.NUMBER'); +const STRING_SYMBOL = Symbol.for('@aws-cdk/core.TokenMap.STRING'); +const LIST_SYMBOL = Symbol.for('@aws-cdk/core.TokenMap.LIST'); +const NUMBER_SYMBOL = Symbol.for('@aws-cdk/core.TokenMap.NUMBER'); /** * Central place where we keep a mapping from Tokens to their String representation diff --git a/packages/@aws-cdk/cdk/lib/private/uniqueid.ts b/packages/@aws-cdk/core/lib/private/uniqueid.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/private/uniqueid.ts rename to packages/@aws-cdk/core/lib/private/uniqueid.ts diff --git a/packages/@aws-cdk/cdk/lib/reference.ts b/packages/@aws-cdk/core/lib/reference.ts similarity index 91% rename from packages/@aws-cdk/cdk/lib/reference.ts rename to packages/@aws-cdk/core/lib/reference.ts index 52c9cf989c946..cdc3417243aa7 100644 --- a/packages/@aws-cdk/cdk/lib/reference.ts +++ b/packages/@aws-cdk/core/lib/reference.ts @@ -1,6 +1,6 @@ import { Intrinsic } from "./private/intrinsic"; -const REFERENCE_SYMBOL = Symbol.for('@aws-cdk/cdk.Reference'); +const REFERENCE_SYMBOL = Symbol.for('@aws-cdk/core.Reference'); /** * An intrinsic Token that represents a reference to a construct. diff --git a/packages/@aws-cdk/cdk/lib/removal-policy.ts b/packages/@aws-cdk/core/lib/removal-policy.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/removal-policy.ts rename to packages/@aws-cdk/core/lib/removal-policy.ts diff --git a/packages/@aws-cdk/cdk/lib/resolvable.ts b/packages/@aws-cdk/core/lib/resolvable.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/resolvable.ts rename to packages/@aws-cdk/core/lib/resolvable.ts diff --git a/packages/@aws-cdk/cdk/lib/resource.ts b/packages/@aws-cdk/core/lib/resource.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/resource.ts rename to packages/@aws-cdk/core/lib/resource.ts diff --git a/packages/@aws-cdk/cdk/lib/runtime.ts b/packages/@aws-cdk/core/lib/runtime.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/runtime.ts rename to packages/@aws-cdk/core/lib/runtime.ts diff --git a/packages/@aws-cdk/cdk/lib/secret-value.ts b/packages/@aws-cdk/core/lib/secret-value.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/secret-value.ts rename to packages/@aws-cdk/core/lib/secret-value.ts diff --git a/packages/@aws-cdk/cdk/lib/stack-trace.ts b/packages/@aws-cdk/core/lib/stack-trace.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/stack-trace.ts rename to packages/@aws-cdk/core/lib/stack-trace.ts diff --git a/packages/@aws-cdk/cdk/lib/stack.ts b/packages/@aws-cdk/core/lib/stack.ts similarity index 99% rename from packages/@aws-cdk/cdk/lib/stack.ts rename to packages/@aws-cdk/core/lib/stack.ts index ce507463cf8e7..a89427d942746 100644 --- a/packages/@aws-cdk/cdk/lib/stack.ts +++ b/packages/@aws-cdk/core/lib/stack.ts @@ -10,7 +10,7 @@ import { LogicalIDs } from './private/logical-id'; import { resolve } from './private/resolve'; import { makeUniqueId } from './private/uniqueid'; -const STACK_SYMBOL = Symbol.for('@aws-cdk/cdk.Stack'); +const STACK_SYMBOL = Symbol.for('@aws-cdk/core.Stack'); const VALID_STACK_NAME_REGEX = /^[A-Za-z][A-Za-z0-9-]*$/; export interface StackProps { diff --git a/packages/@aws-cdk/cdk/lib/string-fragments.ts b/packages/@aws-cdk/core/lib/string-fragments.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/string-fragments.ts rename to packages/@aws-cdk/core/lib/string-fragments.ts diff --git a/packages/@aws-cdk/cdk/lib/tag-aspect.ts b/packages/@aws-cdk/core/lib/tag-aspect.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/tag-aspect.ts rename to packages/@aws-cdk/core/lib/tag-aspect.ts diff --git a/packages/@aws-cdk/cdk/lib/tag-manager.ts b/packages/@aws-cdk/core/lib/tag-manager.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/tag-manager.ts rename to packages/@aws-cdk/core/lib/tag-manager.ts diff --git a/packages/@aws-cdk/cdk/lib/token.ts b/packages/@aws-cdk/core/lib/token.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/token.ts rename to packages/@aws-cdk/core/lib/token.ts diff --git a/packages/@aws-cdk/cdk/lib/util.ts b/packages/@aws-cdk/core/lib/util.ts similarity index 100% rename from packages/@aws-cdk/cdk/lib/util.ts rename to packages/@aws-cdk/core/lib/util.ts diff --git a/packages/@aws-cdk/cdk/package-lock.json b/packages/@aws-cdk/core/package-lock.json similarity index 98% rename from packages/@aws-cdk/cdk/package-lock.json rename to packages/@aws-cdk/core/package-lock.json index e56015976b7fa..f5839593207f3 100644 --- a/packages/@aws-cdk/cdk/package-lock.json +++ b/packages/@aws-cdk/core/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@aws-cdk/cdk", + "name": "@aws-cdk/core", "version": "0.35.0", "lockfileVersion": 1, "requires": true, diff --git a/packages/@aws-cdk/cdk/package.json b/packages/@aws-cdk/core/package.json similarity index 76% rename from packages/@aws-cdk/cdk/package.json rename to packages/@aws-cdk/core/package.json index 1e59cacd00909..277d13bae747a 100644 --- a/packages/@aws-cdk/cdk/package.json +++ b/packages/@aws-cdk/core/package.json @@ -1,5 +1,5 @@ { - "name": "@aws-cdk/cdk", + "name": "@aws-cdk/core", "version": "0.35.0", "description": "AWS Cloud Development Kit Core Library", "main": "lib/index.js", @@ -11,7 +11,7 @@ "package": "software.amazon.awscdk", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "cdk" + "artifactId": "core" } }, "dotnet": { @@ -21,24 +21,24 @@ "assemblyOriginatorKeyFile": "../../key.snk" }, "python": { - "distName": "aws-cdk.cdk", - "module": "aws_cdk.cdk" + "distName": "aws-cdk.core", + "module": "aws_cdk.core" } } }, "repository": { "type": "git", "url": "https://github.com/awslabs/aws-cdk.git", - "directory": "packages/@aws-cdk/cdk" + "directory": "packages/@aws-cdk/core" }, "awslint": { "exclude": [ - "construct-ctor:@aws-cdk/cdk.App.", - "props-no-cfn-types:@aws-cdk/cdk.CfnOutputProps.condition", - "duration-prop-type:@aws-cdk/cdk.ResourceSignal.timeout", - "props-no-any:@aws-cdk/cdk.CfnParameterProps.default", - "props-no-cfn-types:@aws-cdk/cdk.CfnRuleProps.assertions", - "construct-ctor:@aws-cdk/cdk.Stack..params[1]" + "construct-ctor:@aws-cdk/core.App.", + "props-no-cfn-types:@aws-cdk/core.CfnOutputProps.condition", + "duration-prop-type:@aws-cdk/core.ResourceSignal.timeout", + "props-no-any:@aws-cdk/core.CfnParameterProps.default", + "props-no-cfn-types:@aws-cdk/core.CfnRuleProps.assertions", + "construct-ctor:@aws-cdk/core.Stack..params[1]" ] }, "scripts": { diff --git a/packages/@aws-cdk/cdk/test/evaluate-cfn.ts b/packages/@aws-cdk/core/test/evaluate-cfn.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/evaluate-cfn.ts rename to packages/@aws-cdk/core/test/evaluate-cfn.ts diff --git a/packages/@aws-cdk/cdk/test/test.app.ts b/packages/@aws-cdk/core/test/test.app.ts similarity index 99% rename from packages/@aws-cdk/cdk/test/test.app.ts rename to packages/@aws-cdk/core/test/test.app.ts index 43ecd055a6104..6fcfa1300e1a1 100644 --- a/packages/@aws-cdk/cdk/test/test.app.ts +++ b/packages/@aws-cdk/core/test/test.app.ts @@ -238,7 +238,7 @@ export = { const libs = (response.runtime && response.runtime.libraries) || {}; const version = require('../package.json').version; - test.deepEqual(libs['@aws-cdk/cdk'], version); + test.deepEqual(libs['@aws-cdk/core'], version); test.deepEqual(libs['@aws-cdk/cx-api'], version); test.deepEqual(libs['jsii-runtime'], `node.js/${process.version}`); test.done(); @@ -269,7 +269,7 @@ export = { const version = require('../package.json').version; test.deepEqual(libs, { - '@aws-cdk/cdk': version, + '@aws-cdk/core': version, '@aws-cdk/cx-api': version, 'jsii-runtime': `node.js/${process.version}` }); diff --git a/packages/@aws-cdk/cdk/test/test.arn.ts b/packages/@aws-cdk/core/test/test.arn.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.arn.ts rename to packages/@aws-cdk/core/test/test.arn.ts diff --git a/packages/@aws-cdk/cdk/test/test.aspect.ts b/packages/@aws-cdk/core/test/test.aspect.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.aspect.ts rename to packages/@aws-cdk/core/test/test.aspect.ts diff --git a/packages/@aws-cdk/cdk/test/test.cloudformation-json.ts b/packages/@aws-cdk/core/test/test.cloudformation-json.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.cloudformation-json.ts rename to packages/@aws-cdk/core/test/test.cloudformation-json.ts diff --git a/packages/@aws-cdk/cdk/test/test.condition.ts b/packages/@aws-cdk/core/test/test.condition.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.condition.ts rename to packages/@aws-cdk/core/test/test.condition.ts diff --git a/packages/@aws-cdk/cdk/test/test.construct.ts b/packages/@aws-cdk/core/test/test.construct.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.construct.ts rename to packages/@aws-cdk/core/test/test.construct.ts diff --git a/packages/@aws-cdk/cdk/test/test.context.ts b/packages/@aws-cdk/core/test/test.context.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.context.ts rename to packages/@aws-cdk/core/test/test.context.ts diff --git a/packages/@aws-cdk/cdk/test/test.cross-environment-token.ts b/packages/@aws-cdk/core/test/test.cross-environment-token.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.cross-environment-token.ts rename to packages/@aws-cdk/core/test/test.cross-environment-token.ts diff --git a/packages/@aws-cdk/cdk/test/test.duration.ts b/packages/@aws-cdk/core/test/test.duration.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.duration.ts rename to packages/@aws-cdk/core/test/test.duration.ts diff --git a/packages/@aws-cdk/cdk/test/test.dynamic-reference.ts b/packages/@aws-cdk/core/test/test.dynamic-reference.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.dynamic-reference.ts rename to packages/@aws-cdk/core/test/test.dynamic-reference.ts diff --git a/packages/@aws-cdk/cdk/test/test.environment.ts b/packages/@aws-cdk/core/test/test.environment.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.environment.ts rename to packages/@aws-cdk/core/test/test.environment.ts diff --git a/packages/@aws-cdk/cdk/test/test.fn.ts b/packages/@aws-cdk/core/test/test.fn.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.fn.ts rename to packages/@aws-cdk/core/test/test.fn.ts diff --git a/packages/@aws-cdk/cdk/test/test.include.ts b/packages/@aws-cdk/core/test/test.include.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.include.ts rename to packages/@aws-cdk/core/test/test.include.ts diff --git a/packages/@aws-cdk/cdk/test/test.logical-id.ts b/packages/@aws-cdk/core/test/test.logical-id.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.logical-id.ts rename to packages/@aws-cdk/core/test/test.logical-id.ts diff --git a/packages/@aws-cdk/cdk/test/test.mappings.ts b/packages/@aws-cdk/core/test/test.mappings.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.mappings.ts rename to packages/@aws-cdk/core/test/test.mappings.ts diff --git a/packages/@aws-cdk/cdk/test/test.output.ts b/packages/@aws-cdk/core/test/test.output.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.output.ts rename to packages/@aws-cdk/core/test/test.output.ts diff --git a/packages/@aws-cdk/cdk/test/test.parameter.ts b/packages/@aws-cdk/core/test/test.parameter.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.parameter.ts rename to packages/@aws-cdk/core/test/test.parameter.ts diff --git a/packages/@aws-cdk/cdk/test/test.resource.ts b/packages/@aws-cdk/core/test/test.resource.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.resource.ts rename to packages/@aws-cdk/core/test/test.resource.ts diff --git a/packages/@aws-cdk/cdk/test/test.rule.ts b/packages/@aws-cdk/core/test/test.rule.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.rule.ts rename to packages/@aws-cdk/core/test/test.rule.ts diff --git a/packages/@aws-cdk/cdk/test/test.secret-value.ts b/packages/@aws-cdk/core/test/test.secret-value.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.secret-value.ts rename to packages/@aws-cdk/core/test/test.secret-value.ts diff --git a/packages/@aws-cdk/cdk/test/test.stack.ts b/packages/@aws-cdk/core/test/test.stack.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.stack.ts rename to packages/@aws-cdk/core/test/test.stack.ts diff --git a/packages/@aws-cdk/cdk/test/test.synthesis.ts b/packages/@aws-cdk/core/test/test.synthesis.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.synthesis.ts rename to packages/@aws-cdk/core/test/test.synthesis.ts diff --git a/packages/@aws-cdk/cdk/test/test.tag-aspect.ts b/packages/@aws-cdk/core/test/test.tag-aspect.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.tag-aspect.ts rename to packages/@aws-cdk/core/test/test.tag-aspect.ts diff --git a/packages/@aws-cdk/cdk/test/test.tag-manager.ts b/packages/@aws-cdk/core/test/test.tag-manager.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.tag-manager.ts rename to packages/@aws-cdk/core/test/test.tag-manager.ts diff --git a/packages/@aws-cdk/cdk/test/test.tokens.ts b/packages/@aws-cdk/core/test/test.tokens.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.tokens.ts rename to packages/@aws-cdk/core/test/test.tokens.ts diff --git a/packages/@aws-cdk/cdk/test/test.util.ts b/packages/@aws-cdk/core/test/test.util.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/test.util.ts rename to packages/@aws-cdk/core/test/test.util.ts diff --git a/packages/@aws-cdk/cdk/test/util.ts b/packages/@aws-cdk/core/test/util.ts similarity index 100% rename from packages/@aws-cdk/cdk/test/util.ts rename to packages/@aws-cdk/core/test/util.ts diff --git a/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml b/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml index 3b510ab062d30..36195a9c8873c 100644 --- a/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml +++ b/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml @@ -38,7 +38,7 @@ software.amazon.awscdk - cdk + core %cdk-version% diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js index d5a4bdd629a79..af77e06727f15 100644 --- a/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js +++ b/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js @@ -2,7 +2,7 @@ // @ts-ignore: Cannot find declaration file require('source-map-support/register'); -const cdk = require('@aws-cdk/cdk'); +const cdk = require('@aws-cdk/core'); const { %name.PascalCased%Stack } = require('../lib/%name%-stack'); const app = new cdk.App(); diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js b/packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js index 73d6926e7cf37..2c52c5f65244c 100644 --- a/packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js +++ b/packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js @@ -1,4 +1,4 @@ -const cdk = require('@aws-cdk/cdk'); +const cdk = require('@aws-cdk/core'); class %name.PascalCased%Stack extends cdk.Stack { /** diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/package.template.json b/packages/aws-cdk/lib/init-templates/app/javascript/package.template.json index d8e685942f8e1..e34d0a281878f 100644 --- a/packages/aws-cdk/lib/init-templates/app/javascript/package.template.json +++ b/packages/aws-cdk/lib/init-templates/app/javascript/package.template.json @@ -15,7 +15,7 @@ "aws-cdk": "^%cdk-version%" }, "dependencies": { - "@aws-cdk/cdk": "^%cdk-version%", + "@aws-cdk/core": "^%cdk-version%", "source-map-support": "^0.5.9" } } diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 46f1808e14701..00b9683731702 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -1,9 +1,9 @@ -from aws_cdk import cdk +from aws_cdk import core -class %name.PascalCased%Stack(cdk.Stack): +class %name.PascalCased%Stack(core.Stack): - def __init__(self, app: cdk.App, id: str, **kwargs) -> None: + def __init__(self, app: core.App, id: str, **kwargs) -> None: super().__init__(app, id) # The code that defines your stack goes here diff --git a/packages/aws-cdk/lib/init-templates/app/python/app.template.py b/packages/aws-cdk/lib/init-templates/app/python/app.template.py index 809e0f20b9208..cb97ca720ef95 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/app.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/app.template.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -from aws_cdk import cdk +from aws_cdk import core from %name.PythonModule%.%name.PythonModule%_stack import %name.PascalCased%Stack -app = cdk.App() +app = core.App() %name.PascalCased%Stack(app, "%name%-cdk-1") app.run() diff --git a/packages/aws-cdk/lib/init-templates/app/python/setup.template.py b/packages/aws-cdk/lib/init-templates/app/python/setup.template.py index d43176bdf3b08..e4ce61aac4263 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/setup.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/setup.template.py @@ -19,7 +19,7 @@ packages=setuptools.find_packages(where="%name.PythonModule%"), install_requires=[ - "aws-cdk.cdk", + "aws-cdk.core", ], python_requires=">=3.6", diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts index 242e02b5b9a95..41ac9fe4893ff 100644 --- a/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts +++ b/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import 'source-map-support/register'; -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { %name.PascalCased%Stack } from '../lib/%name%-stack'; const app = new cdk.App(); diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts b/packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts index da57432fde36c..621fe5f539bde 100644 --- a/packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts +++ b/packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export class %name.PascalCased%Stack extends cdk.Stack { constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) { diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/package.template.json b/packages/aws-cdk/lib/init-templates/app/typescript/package.template.json index 5219b55bad307..b85fb951b5228 100644 --- a/packages/aws-cdk/lib/init-templates/app/typescript/package.template.json +++ b/packages/aws-cdk/lib/init-templates/app/typescript/package.template.json @@ -16,7 +16,7 @@ "aws-cdk": "^%cdk-version%" }, "dependencies": { - "@aws-cdk/cdk": "^%cdk-version%", + "@aws-cdk/core": "^%cdk-version%", "source-map-support": "^0.5.9" } } diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts b/packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts index add5fdfdf9c6f..f13779bf2d95e 100644 --- a/packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts +++ b/packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts @@ -1,7 +1,7 @@ import sns = require('@aws-cdk/aws-sns'); import subs = require('@aws-cdk/aws-sns-subscriptions'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export interface %name.PascalCased%Props { /** diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/package.template.json b/packages/aws-cdk/lib/init-templates/lib/typescript/package.template.json index dba896f937126..7d540375c6ea9 100644 --- a/packages/aws-cdk/lib/init-templates/lib/typescript/package.template.json +++ b/packages/aws-cdk/lib/init-templates/lib/typescript/package.template.json @@ -14,12 +14,12 @@ "typescript": "^3.3.3333" }, "peerDependencies": { - "@aws-cdk/cdk": "^%cdk-version%" + "@aws-cdk/core": "^%cdk-version%" }, "dependencies": { "@aws-cdk/aws-sns": "^%cdk-version%", "@aws-cdk/aws-sns-subscriptions": "^%cdk-version%", "@aws-cdk/aws-sqs": "^%cdk-version%", - "@aws-cdk/cdk": "^%cdk-version%" + "@aws-cdk/core": "^%cdk-version%" } } diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js index acdd6c5c26029..7b10196e54f23 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js +++ b/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js @@ -1,5 +1,5 @@ #!/usr/bin/env node -const cdk = require('@aws-cdk/cdk'); +const cdk = require('@aws-cdk/core'); const { %name.PascalCased%Stack } = require('../lib/%name%-stack'); const app = new cdk.App(); diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js index b68043760f5a2..f309bda6b27bc 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js +++ b/packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js @@ -1,7 +1,7 @@ const sns = require('@aws-cdk/aws-sns'); const subs = require('@aws-cdk/aws-sns-subscribers'); const sqs = require('@aws-cdk/aws-sqs'); -const cdk = require('@aws-cdk/cdk'); +const cdk = require('@aws-cdk/core'); class %name.PascalCased%Stack extends cdk.Stack { /** diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/package.template.json b/packages/aws-cdk/lib/init-templates/sample-app/javascript/package.template.json index e24105da9f66b..bc9a664fa5d56 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/javascript/package.template.json +++ b/packages/aws-cdk/lib/init-templates/sample-app/javascript/package.template.json @@ -18,6 +18,6 @@ "@aws-cdk/aws-sns": "^%cdk-version%", "@aws-cdk/aws-sns-subscriptions": "^%cdk-version%", "@aws-cdk/aws-sqs": "^%cdk-version%", - "@aws-cdk/cdk": "^%cdk-version%" + "@aws-cdk/core": "^%cdk-version%" } } diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts index 320a280088f96..31c342707fc28 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import { %name.PascalCased%Stack } from '../lib/%name%-stack'; const app = new cdk.App(); diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts index bd839fe77b9ce..42c237167ddd2 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts @@ -1,7 +1,7 @@ import sns = require('@aws-cdk/aws-sns'); const subs = require('@aws-cdk/aws-sns-subscriptions'); import sqs = require('@aws-cdk/aws-sqs'); -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); export class %name.PascalCased%Stack extends cdk.Stack { constructor(scope: cdk.App, id: string, props?: cdk.StackProps) { diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.template.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.template.json index c8edc95014997..dce1fdadd186a 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.template.json +++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.template.json @@ -19,6 +19,6 @@ "@aws-cdk/aws-sns": "^%cdk-version%", "@aws-cdk/aws-sns-subscriptions": "^%cdk-version%", "@aws-cdk/aws-sqs": "^%cdk-version%", - "@aws-cdk/cdk": "^%cdk-version%" + "@aws-cdk/core": "^%cdk-version%" } } diff --git a/packages/cdk-dasm/lib/dasm.ts b/packages/cdk-dasm/lib/dasm.ts index 52f759c561746..90abd35b97a77 100644 --- a/packages/cdk-dasm/lib/dasm.ts +++ b/packages/cdk-dasm/lib/dasm.ts @@ -53,7 +53,7 @@ export async function dasmTypeScript(template: Template, options: DisassemblerOp // imports // - code.line(`import { Stack, StackProps, Construct, Fn } from '@aws-cdk/cdk';`); + code.line(`import { Stack, StackProps, Construct, Fn } from '@aws-cdk/core';`); for (const def of definitions) { const importName = `@aws-cdk/aws-${def.namespace}`; diff --git a/packages/cdk-dasm/test/__snapshots__/dasm.test.js.snap b/packages/cdk-dasm/test/__snapshots__/dasm.test.js.snap index faaaa0dcc7f12..de3eca2ee5541 100644 --- a/packages/cdk-dasm/test/__snapshots__/dasm.test.js.snap +++ b/packages/cdk-dasm/test/__snapshots__/dasm.test.js.snap @@ -3,7 +3,7 @@ exports[`basic test 1`] = ` "// generated by cdk-dasm -import { Stack, StackProps, Construct, Fn } from '@aws-cdk/cdk'; +import { Stack, StackProps, Construct, Fn } from '@aws-cdk/core'; import sns = require('@aws-cdk/aws-sns'); export class MyStack extends Stack { @@ -20,7 +20,7 @@ export class MyStack extends Stack { exports[`bucket-and-key 1`] = ` "// generated by cdk-dasm -import { Stack, StackProps, Construct, Fn } from '@aws-cdk/cdk'; +import { Stack, StackProps, Construct, Fn } from '@aws-cdk/core'; import kms = require('@aws-cdk/aws-kms'); import s3 = require('@aws-cdk/aws-s3'); import cdk = require('@aws-cdk/aws-cdk'); @@ -90,7 +90,7 @@ export class MyStack extends Stack { }, }); new cdk.CfnMetadata(this, 'CDKMetadata', { - modules: \\"aws-cdk=0.28.0,@aws-cdk/aws-events=0.28.0,@aws-cdk/aws-iam=0.28.0,@aws-cdk/aws-kms=0.28.0,@aws-cdk/aws-s3=0.28.0,@aws-cdk/aws-s3-notifications=0.28.0,@aws-cdk/cdk=0.28.0,@aws-cdk/cx-api=0.28.0,@aws-cdk/region-info=0.28.0,jsii-runtime=node.js/v10.13.0\\", + modules: \\"aws-cdk=0.28.0,@aws-cdk/aws-events=0.28.0,@aws-cdk/aws-iam=0.28.0,@aws-cdk/aws-kms=0.28.0,@aws-cdk/aws-s3=0.28.0,@aws-cdk/aws-s3-notifications=0.28.0,@aws-cdk/core=0.28.0,@aws-cdk/cx-api=0.28.0,@aws-cdk/region-info=0.28.0,jsii-runtime=node.js/v10.13.0\\", }); } } @@ -100,7 +100,7 @@ export class MyStack extends Stack { exports[`no props 1`] = ` "// generated by cdk-dasm -import { Stack, StackProps, Construct, Fn } from '@aws-cdk/cdk'; +import { Stack, StackProps, Construct, Fn } from '@aws-cdk/core'; import s3 = require('@aws-cdk/aws-s3'); export class MyStack extends Stack { diff --git a/packages/cdk-dasm/test/bucket-key.json b/packages/cdk-dasm/test/bucket-key.json index 7247403220870..09446c601edf0 100644 --- a/packages/cdk-dasm/test/bucket-key.json +++ b/packages/cdk-dasm/test/bucket-key.json @@ -78,7 +78,7 @@ "CDKMetadata": { "Type": "AWS::CDK::Metadata", "Properties": { - "Modules": "aws-cdk=0.28.0,@aws-cdk/aws-events=0.28.0,@aws-cdk/aws-iam=0.28.0,@aws-cdk/aws-kms=0.28.0,@aws-cdk/aws-s3=0.28.0,@aws-cdk/aws-s3-notifications=0.28.0,@aws-cdk/cdk=0.28.0,@aws-cdk/cx-api=0.28.0,@aws-cdk/region-info=0.28.0,jsii-runtime=node.js/v10.13.0" + "Modules": "aws-cdk=0.28.0,@aws-cdk/aws-events=0.28.0,@aws-cdk/aws-iam=0.28.0,@aws-cdk/aws-kms=0.28.0,@aws-cdk/aws-s3=0.28.0,@aws-cdk/aws-s3-notifications=0.28.0,@aws-cdk/core=0.28.0,@aws-cdk/cx-api=0.28.0,@aws-cdk/region-info=0.28.0,jsii-runtime=node.js/v10.13.0" } } } diff --git a/packages/decdk/bin/decdk.ts b/packages/decdk/bin/decdk.ts index 3fc504beceb10..8f68748d772a5 100644 --- a/packages/decdk/bin/decdk.ts +++ b/packages/decdk/bin/decdk.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import colors = require('colors/safe'); import { DeclarativeStack, loadTypeSystem, readTemplate, stackNameFromFileName } from '../lib'; diff --git a/packages/decdk/lib/cdk-schema.ts b/packages/decdk/lib/cdk-schema.ts index 0341731697e2f..848f82185716a 100644 --- a/packages/decdk/lib/cdk-schema.ts +++ b/packages/decdk/lib/cdk-schema.ts @@ -22,7 +22,7 @@ export function renderFullSchema(typeSystem: jsiiReflect.TypeSystem, options: Re // Find all constructs for which the props interface // (transitively) only consists of JSON primitives or interfaces // that consist of JSON primitives - const constructType = typeSystem.findClass('@aws-cdk/cdk.Construct'); + const constructType = typeSystem.findClass('@aws-cdk/core.Construct'); const constructs = typeSystem.classes.filter(c => c.extends(constructType)); const deconstructs = constructs @@ -100,7 +100,7 @@ export function schemaForResource(construct: ConstructAndProps, ctx: SchemaConte } function isCfnResource(klass: jsiiReflect.ClassType) { - const resource = klass.system.findClass('@aws-cdk/cdk.CfnResource'); + const resource = klass.system.findClass('@aws-cdk/core.CfnResource'); return klass.extends(resource); } diff --git a/packages/decdk/lib/declarative-stack.ts b/packages/decdk/lib/declarative-stack.ts index c1ec3a1637131..ed9fc8d27a70b 100644 --- a/packages/decdk/lib/declarative-stack.ts +++ b/packages/decdk/lib/declarative-stack.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import reflect = require('jsii-reflect'); import jsonschema = require('jsonschema'); import { renderFullSchema } from './cdk-schema'; diff --git a/packages/decdk/lib/jsii2schema.ts b/packages/decdk/lib/jsii2schema.ts index 2477576d8c31f..6e5a6822eb22f 100644 --- a/packages/decdk/lib/jsii2schema.ts +++ b/packages/decdk/lib/jsii2schema.ts @@ -559,13 +559,13 @@ export function isConstruct(typeOrTypeRef: jsiiReflect.TypeReference | jsiiRefle // if it is an interface, it should extend cdk.IConstruct if (type instanceof jsiiReflect.InterfaceType) { - const constructIface = type.system.findFqn('@aws-cdk/cdk.IConstruct'); + const constructIface = type.system.findFqn('@aws-cdk/core.IConstruct'); return type.extends(constructIface); } // if it is a class, it should extend cdk.Construct if (type instanceof jsiiReflect.ClassType) { - const constructClass = type.system.findFqn('@aws-cdk/cdk.Construct'); + const constructClass = type.system.findFqn('@aws-cdk/core.Construct'); return type.extends(constructClass); } diff --git a/packages/decdk/package.json b/packages/decdk/package.json index b1c8b5586ef67..ce7e6700ed2d9 100644 --- a/packages/decdk/package.json +++ b/packages/decdk/package.json @@ -135,7 +135,7 @@ "@aws-cdk/aws-waf": "^0.35.0", "@aws-cdk/aws-wafregional": "^0.35.0", "@aws-cdk/aws-workspaces": "^0.35.0", - "@aws-cdk/cdk": "^0.35.0", + "@aws-cdk/core": "^0.35.0", "@aws-cdk/cfnspec": "^0.35.0", "@aws-cdk/cx-api": "^0.35.0", "@aws-cdk/region-info": "^0.35.0", diff --git a/packages/decdk/test/schema.test.ts b/packages/decdk/test/schema.test.ts index c4a9c4613a82a..92328f0c3ee4f 100644 --- a/packages/decdk/test/schema.test.ts +++ b/packages/decdk/test/schema.test.ts @@ -20,7 +20,7 @@ beforeAll(async () => { // load the resulting file system await typesys.loadFile(path.join(fixturedir, '.jsii')); - await typesys.load(path.dirname(require.resolve('@aws-cdk/cdk/.jsii'))); + await typesys.load(path.dirname(require.resolve('@aws-cdk/core/.jsii'))); }); test('schemaForInterface: interface with primitives', async () => { diff --git a/packages/decdk/test/synth.test.ts b/packages/decdk/test/synth.test.ts index cbbf19713b839..5efb4c3cf5d7d 100644 --- a/packages/decdk/test/synth.test.ts +++ b/packages/decdk/test/synth.test.ts @@ -1,4 +1,4 @@ -import cdk = require('@aws-cdk/cdk'); +import cdk = require('@aws-cdk/core'); import fs = require('fs'); import reflect = require('jsii-reflect'); import path = require('path'); diff --git a/packages/decdk/tsconfig.json b/packages/decdk/tsconfig.json index 74e957ca65061..86d7b8b4a5c0c 100644 --- a/packages/decdk/tsconfig.json +++ b/packages/decdk/tsconfig.json @@ -22,7 +22,7 @@ "test/enrichments/**" ], "references": [ - { "path": "../@aws-cdk/cdk" }, + { "path": "../@aws-cdk/core" }, { "path": "../@aws-cdk/cx-api" } ] } diff --git a/tools/awslint/lib/rules/core-types.ts b/tools/awslint/lib/rules/core-types.ts index cd622f477623f..f444d5fff52af 100644 --- a/tools/awslint/lib/rules/core-types.ts +++ b/tools/awslint/lib/rules/core-types.ts @@ -2,15 +2,15 @@ import reflect = require("jsii-reflect"); import { TypeSystem } from "jsii-reflect"; import { getDocTag } from "./util"; -const CORE_MODULE = "@aws-cdk/cdk"; +const CORE_MODULE = "@aws-cdk/core"; enum CoreTypesFqn { - CfnResource = "@aws-cdk/cdk.CfnResource", - Construct = "@aws-cdk/cdk.Construct", - ConstructInterface = "@aws-cdk/cdk.IConstruct", - Resource = "@aws-cdk/cdk.Resource", - ResourceInterface = "@aws-cdk/cdk.IResource", - ResolvableInterface = "@aws-cdk/cdk.IResolvable", - PhysicalName = "@aws-cdk/cdk.PhysicalName" + CfnResource = "@aws-cdk/core.CfnResource", + Construct = "@aws-cdk/core.Construct", + ConstructInterface = "@aws-cdk/core.IConstruct", + Resource = "@aws-cdk/core.Resource", + ResourceInterface = "@aws-cdk/core.IResource", + ResolvableInterface = "@aws-cdk/core.IResolvable", + PhysicalName = "@aws-cdk/core.PhysicalName" } export class CoreTypes { diff --git a/tools/awslint/lib/rules/durations.ts b/tools/awslint/lib/rules/durations.ts index 8a58962ab10e5..111f3d8648666 100644 --- a/tools/awslint/lib/rules/durations.ts +++ b/tools/awslint/lib/rules/durations.ts @@ -1,7 +1,7 @@ import { Property } from 'jsii-reflect'; import { Linter } from '../linter'; -const DURATION_FQN = '@aws-cdk/cdk.Duration'; +const DURATION_FQN = '@aws-cdk/core.Duration'; const DURATION_SUFFIX = /(Days|Milli(?:(?:S|s)econd)?s?|Sec(?:ond)?s?)$/; export const durationsLinter = new Linter(assm => { diff --git a/tools/cfn2ts/lib/codegen.ts b/tools/cfn2ts/lib/codegen.ts index ac73b98a02ab9..3038779502897 100644 --- a/tools/cfn2ts/lib/codegen.ts +++ b/tools/cfn2ts/lib/codegen.ts @@ -42,7 +42,7 @@ export default class CodeGenerator { this.code.line(); this.code.line('// tslint:disable:max-line-length | This is generated code - line lengths are difficult to control'); this.code.line(); - this.code.line(`import ${CORE} = require('@aws-cdk/cdk');`); + this.code.line(`import ${CORE} = require('@aws-cdk/core');`); } public async upToDate(outPath: string): Promise { diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts index 35652caedfea5..a5d0cea45c0fc 100644 --- a/tools/pkglint/lib/rules.ts +++ b/tools/pkglint/lib/rules.ts @@ -472,7 +472,7 @@ export class NoAtTypesInDependencies extends ValidationRule { * Computes the module name for various other purposes (java package, ...) */ function cdkModuleName(name: string) { - const isCdkPkg = name === '@aws-cdk/cdk'; + const isCdkPkg = name === '@aws-cdk/core'; name = name.replace(/^aws-cdk-/, ''); name = name.replace(/^@aws-cdk\//, ''); @@ -486,7 +486,7 @@ function cdkModuleName(name: string) { return { javaPackage: `software.amazon.awscdk${isCdkPkg ? '' : `.${name.replace(/^aws-/, 'services-').replace(/-/g, '.')}`}`, mavenArtifactId: - isCdkPkg ? 'cdk' + isCdkPkg ? 'core' : name.startsWith('aws-') || name.startsWith('alexa-') ? name.replace(/^aws-/, '') : `cdk-${name}`, dotnetNamespace: `Amazon.CDK${isCdkPkg ? '' : `.${dotnetSuffix}`}`,