Skip to content

Commit

Permalink
refactor(core): rename @aws-cdk/cdk to @aws-cdk/core (#2932)
Browse files Browse the repository at this point in the history
Rename the module @aws-cdk/cdk to @aws-cdk/core since this is a more suitable name for it. 

Language-specific names:
- Python: aws_cdk.core (renamed)
- .NET: Amazon.CDK (not renamed)
- Java: only artifactId changed to `core` but package and groupId are still `software.amazon.awscdk`

This change completely deletes the @aws-cdk/cdk module from the repo as a temporary measure, to ensure there are no lingering references. A subsequent commit will introduce @aws-cdk/cdk as a deprecated package.

Fixed #2733 

BREAKING CHANGE: The `@aws-cdk/cdk` module was renamed to @aws-cdk/core
* **Python:** The `aws_cdk.cdk` module was renamed to `aws_cdk.core`
* **Java:** The artifact `cdk` in groupId `software.amazon.awscdk` was renamed to `core`
  • Loading branch information
Elad Ben-Israel authored Jun 23, 2019
1 parent 8ab84ec commit 4a0272d
Show file tree
Hide file tree
Showing 811 changed files with 924 additions and 924 deletions.
4 changes: 2 additions & 2 deletions packages/@aws-cdk/alexa-ask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/app-delivery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/test/integ.cicd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/jest.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/lib/expect.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/lib/synth-utils.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assert/test/test.assertions.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'source-map-support/register';

import cdk = require('@aws-cdk/cdk');
import cdk = require('@aws-cdk/core');
import cx = require('@aws-cdk/cx-api');
import { Test } from 'nodeunit';

import { Stack } from '@aws-cdk/cdk';
import { Stack } from '@aws-cdk/core';
import { countResources, exist, expect, haveType, MatchStyle, matchTemplate } from '../lib/index';

passingExample('expect <synthStack> at <some path> to have <some type>', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/test/test.synth-utils.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"include": ["**/*.ts" ],
"exclude": ["node_modules"],
"references": [
{ "path": "../cdk" },
{ "path": "../core" },
{ "path": "../cx-api" },
{ "path": "../cfnspec" },
{ "path": "../cloudformation-diff" }
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assets/lib/staging.ts
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assets/test/test.staging.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-amazonmq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-amplify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/api-key.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/deployment.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/lambda-api.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/method.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/resource.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/restapi.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/stage.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts
Original file line number Diff line number Diff line change
@@ -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';

/**
Expand Down
12 changes: 6 additions & 6 deletions packages/@aws-cdk/aws-apigateway/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.api-key.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.deployment.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.http.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.lambda.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.method.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigateway/test/test.resource.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigateway/test/test.restapi.ts
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
Loading

0 comments on commit 4a0272d

Please sign in to comment.