Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BREAKING CHANGE: remove resource attribute types for string attributes #712

Merged
merged 16 commits into from
Sep 19, 2018
Merged
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ trap "rm -rf $MERKLE_BUILD_CACHE" EXIT

echo "============================================================================================="
echo "building..."
time lerna exec --stream "npm run build"
time lerna run --no-bail --stream build

echo "============================================================================================="
echo "testing..."
lerna run --stream test
lerna run --no-bail --stream test

touch $BUILD_INDICATOR
4 changes: 2 additions & 2 deletions docs/src/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ The following example creates the Aurora database **MyAuroraDatabase**.
new rds.DatabaseCluster(this, 'MyRdsDb', {
defaultDatabaseName: 'MyAuroraDatabase',
masterUser: {
username: new cdk.Token('admin'),
password: new cdk.Token('123456')
username: 'admin',
password: '123456'
},
engine: rds.DatabaseClusterEngine.Aurora,
instanceProps: {
Expand Down
2 changes: 1 addition & 1 deletion examples/cdk-examples-typescript/chat-app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MyStack extends cdk.Stack {
new CognitoChatRoomPool(this, 'UserPool');

const bucket = s3.BucketRef.import(this, 'DougsBucket', {
bucketName: new s3.BucketName('dougs-chat-app')
bucketName: 'dougs-chat-app'
});

new ChatAppFunction(this, 'StartAddBucket', {
Expand Down
5 changes: 2 additions & 3 deletions examples/cdk-examples-typescript/neptune-demo/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ec2 = require('@aws-cdk/aws-ec2');
import neptune = require('@aws-cdk/aws-neptune');
import rds = require('@aws-cdk/aws-rds');
import cdk = require('@aws-cdk/cdk');

class NeptuneDemoStack extends cdk.Stack {
Expand All @@ -19,8 +18,8 @@ class NeptuneDemoStack extends cdk.Stack {
masterUser: {
// This would normally be imported from SSM parmeter store encrypted string,
// but don't want to overcomplicate the example
username: new rds.Username('admin'),
password: new rds.Password('eRSDwst7lpzu'),
username: 'admin',
password: 'eRSDwst7lpzu',
}
});
database.connections.allowDefaultPortFrom(new ec2.AnyIPv4(), 'Allow the world to connect');
Expand Down
16 changes: 8 additions & 8 deletions packages/@aws-cdk/assets/lib/asset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ export class Asset extends cdk.Construct {
/**
* Attribute that represents the name of the bucket this asset exists in.
*/
public readonly s3BucketName: s3.BucketName;
public readonly s3BucketName: string;

/**
* Attribute which represents the S3 object key of this asset.
*/
public readonly s3ObjectKey: s3.ObjectKey;
public readonly s3ObjectKey: string;

/**
* Attribute which represents the S3 URL of this asset.
* @example https://s3.us-west-1.amazonaws.com/bucket/key
*/
public readonly s3Url: s3.S3Url;
public readonly s3Url: string;

/**
* Resolved full-path location of this asset.
Expand All @@ -70,7 +70,7 @@ export class Asset extends cdk.Construct {
/**
* The S3 prefix where all different versions of this asset are stored
*/
private readonly s3Prefix: cdk.Token;
private readonly s3Prefix: string;

constructor(parent: cdk.Construct, id: string, props: GenericAssetProps) {
super(parent, id);
Expand All @@ -94,10 +94,10 @@ export class Asset extends cdk.Construct {
description: `S3 key for asset version "${this.path}"`
});

this.s3BucketName = new s3.BucketName(bucketParam.value);
this.s3Prefix = new cdk.FnSelect(0, new cdk.FnSplit(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.value));
const s3Filename = new cdk.FnSelect(1, new cdk.FnSplit(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.value));
this.s3ObjectKey = new s3.ObjectKey(new cdk.FnConcat(this.s3Prefix, s3Filename));
this.s3BucketName = bucketParam.value.toString();
this.s3Prefix = new cdk.FnSelect(0, new cdk.FnSplit(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.value)).toString();
const s3Filename = new cdk.FnSelect(1, new cdk.FnSplit(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.value)).toString();
this.s3ObjectKey = `${this.s3Prefix}${s3Filename}`;

this.bucket = s3.BucketRef.import(this, 'AssetBucket', {
bucketName: this.s3BucketName
Expand Down
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-apigateway/lib/deployment.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import cdk = require('@aws-cdk/cdk');
import crypto = require('crypto');
import { cloudformation, DeploymentId } from './apigateway.generated';
import { cloudformation } from './apigateway.generated';
import { RestApiRef } from './restapi-ref';

export interface DeploymentProps {
Expand Down Expand Up @@ -55,7 +55,7 @@ export interface DeploymentProps {
* automatically for the `restApi.latestDeployment` deployment.
*/
export class Deployment extends cdk.Construct implements cdk.IDependable {
public readonly deploymentId: DeploymentId;
public readonly deploymentId: string;
public readonly api: RestApiRef;

/**
Expand All @@ -78,7 +78,7 @@ export class Deployment extends cdk.Construct implements cdk.IDependable {
}

this.api = props.api;
this.deploymentId = new DeploymentId(() => this.resource.ref);
this.deploymentId = new cdk.Token(() => this.resource.deploymentId).toString();
eladb marked this conversation as resolved.
Show resolved Hide resolved
this.dependencyElements.push(this.resource);
}

Expand Down Expand Up @@ -142,13 +142,13 @@ class LatestDeploymentResource extends cloudformation.DeploymentResource {
* Returns a lazy reference to this resource (evaluated only upon synthesis).
*/
public get ref() {
eladb marked this conversation as resolved.
Show resolved Hide resolved
return new DeploymentId(() => ({ Ref: this.lazyLogicalId }));
return new cdk.Token(() => ({ Ref: this.lazyLogicalId })).toString();
}

/**
* Does nothing.
*/
public set ref(_v: DeploymentId) {
public set ref(_v: string) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class AwsIntegration extends Integration {
super({
type,
integrationHttpMethod: 'POST',
uri: cdk.Arn.fromComponents({
uri: cdk.ArnUtils.fromComponents({
service: 'apigateway',
account: backend,
resource: apiType,
Expand Down
12 changes: 6 additions & 6 deletions packages/@aws-cdk/aws-apigateway/lib/method.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cdk = require('@aws-cdk/cdk');
import { AuthorizerId, cloudformation, MethodId } from './apigateway.generated';
import { cloudformation } from './apigateway.generated';
import { Integration } from './integration';
import { MockIntegration } from './integrations/mock';
import { IRestApiResource } from './resource';
Expand All @@ -26,7 +26,7 @@ export interface MethodOptions {
* NOTE: in the future this will be replaced with an `AuthorizerRef`
* construct.
*/
authorizerId?: AuthorizerId;
authorizerId?: string;

/**
* Indicates whether the method requires clients to submit a valid API key.
Expand Down Expand Up @@ -65,7 +65,7 @@ export interface MethodProps {
}

export class Method extends cdk.Construct {
public readonly methodId: MethodId;
public readonly methodId: string;
public readonly httpMethod: string;
public readonly resource: IRestApiResource;
public readonly restApi: RestApi;
Expand Down Expand Up @@ -115,7 +115,7 @@ export class Method extends cdk.Construct {
* NOTE: {stage} will refer to the `restApi.deploymentStage`, which will
* automatically set if auto-deploy is enabled.
*/
public get methodArn(): cdk.Arn {
public get methodArn(): string {
if (!this.restApi.deploymentStage) {
throw new Error('There is no stage associated with this restApi. Either use `autoDeploy` or explicitly assign `deploymentStage`');
}
Expand All @@ -128,7 +128,7 @@ export class Method extends cdk.Construct {
* Returns an execute-api ARN for this method's "test-invoke-stage" stage.
* This stage is used by the AWS Console UI when testing the method.
*/
public get testMethodArn(): cdk.Arn {
public get testMethodArn(): string {
return this.restApi.executeApiArn(this.httpMethod, this.resource.resourcePath, 'test-invoke-stage');
}

Expand Down Expand Up @@ -156,7 +156,7 @@ export class Method extends cdk.Construct {
credentials = options.credentialsRole.roleArn;
} else if (options.credentialsPassthrough) {
// arn:aws:iam::*:user/*
credentials = cdk.Arn.fromComponents({ service: 'iam', region: '', account: '*', resource: 'user', sep: '/', resourceName: '*' });
credentials = cdk.ArnUtils.fromComponents({ service: 'iam', region: '', account: '*', resource: 'user', sep: '/', resourceName: '*' });
}

return {
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk/aws-apigateway/lib/resource.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cdk = require('@aws-cdk/cdk');
import { cloudformation, ResourceId } from './apigateway.generated';
import { cloudformation } from './apigateway.generated';
import { Integration } from './integration';
import { Method, MethodOptions } from './method';
import { RestApi } from './restapi';
Expand All @@ -18,7 +18,7 @@ export interface IRestApiResource {
/**
* The ID of the resource.
*/
readonly resourceId: ResourceId;
readonly resourceId: string;

/**
* The full path of this resuorce.
Expand Down Expand Up @@ -85,7 +85,7 @@ export interface ResourceProps extends ResourceOptions {

export class Resource extends cdk.Construct implements IRestApiResource {
public readonly resourceApi: RestApi;
public readonly resourceId: ResourceId;
public readonly resourceId: string;
public readonly resourcePath: string;
public readonly defaultIntegration?: Integration;
public readonly defaultMethodOptions?: MethodOptions;
Expand All @@ -102,7 +102,7 @@ export class Resource extends cdk.Construct implements IRestApiResource {
};
const resource = new cloudformation.Resource(this, 'Resource', resourceProps);

this.resourceId = resource.ref;
this.resourceId = resource.resourceId;
this.resourceApi = props.parent.resourceApi;

// render resource path (special case for root)
Expand Down
9 changes: 4 additions & 5 deletions packages/@aws-cdk/aws-apigateway/lib/restapi-ref.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import cdk = require('@aws-cdk/cdk');
import { RestApiId } from './apigateway.generated';

export interface RestApiRefProps {
/**
* The REST API ID of an existing REST API resource.
*/
restApiId: RestApiId;
restApiId: string;
}

export abstract class RestApiRef extends cdk.Construct {
Expand All @@ -23,21 +22,21 @@ export abstract class RestApiRef extends cdk.Construct {
/**
* The ID of this API Gateway RestApi.
*/
public readonly abstract restApiId: RestApiId;
public readonly abstract restApiId: string;

/**
* Exports a REST API resource from this stack.
* @returns REST API props that can be imported to another stack.
*/
public export(): RestApiRefProps {
return {
restApiId: new RestApiId(new cdk.Output(this, 'RestApiId', { value: this.restApiId }).makeImportValue()),
restApiId: new cdk.Output(this, 'RestApiId', { value: this.restApiId }).makeImportValue().toString()
};
}
}

class ImportedRestApi extends RestApiRef {
public restApiId: RestApiId;
public restApiId: string;

constructor(parent: cdk.Construct, id: string, props: RestApiRefProps) {
super(parent, id);
Expand Down
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-apigateway/lib/restapi.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import iam = require('@aws-cdk/aws-iam');
import cdk = require('@aws-cdk/cdk');
import { cloudformation, ResourceId, RestApiId } from './apigateway.generated';
import { cloudformation } from './apigateway.generated';
import { Deployment } from './deployment';
import { Integration } from './integration';
import { Method, MethodOptions } from './method';
Expand Down Expand Up @@ -139,7 +139,7 @@ export class RestApi extends RestApiRef implements cdk.IDependable {
/**
* The ID of this API Gateway RestApi.
*/
public readonly restApiId: RestApiId;
public readonly restApiId: string;

/**
* API Gateway deployment that represents the latest changes of the API.
Expand Down Expand Up @@ -216,7 +216,7 @@ export class RestApi extends RestApiRef implements cdk.IDependable {
defaultIntegration: props.defaultIntegration,
defaultMethodOptions: props.defaultMethodOptions,
resourceApi: this,
resourceId: new ResourceId(resource.restApiRootResourceId),
resourceId: resource.restApiRootResourceId,
resourcePath: '/'
};
}
Expand Down Expand Up @@ -258,7 +258,7 @@ export class RestApi extends RestApiRef implements cdk.IDependable {
method = '*';
}

return cdk.Arn.fromComponents({
return cdk.ArnUtils.fromComponents({
service: 'execute-api',
resource: this.restApiId,
sep: '/',
Expand Down Expand Up @@ -315,7 +315,7 @@ export class RestApi extends RestApiRef implements cdk.IDependable {
private configureCloudWatchRole(apiResource: cloudformation.RestApiResource) {
const role = new iam.Role(this, 'CloudWatchRole', {
assumedBy: new cdk.ServicePrincipal('apigateway.amazonaws.com'),
managedPolicyArns: [ cdk.Arn.fromComponents({
managedPolicyArns: [ cdk.ArnUtils.fromComponents({
service: 'iam',
region: '',
account: 'aws',
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigateway/lib/stage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cdk = require('@aws-cdk/cdk');
import { cloudformation, StageName } from './apigateway.generated';
import { cloudformation } from './apigateway.generated';
import { Deployment } from './deployment';
import { RestApiRef } from './restapi-ref';
import { parseMethodOptionsPath } from './util';
Expand Down Expand Up @@ -127,7 +127,7 @@ export interface MethodDeploymentOptions {
}

export class Stage extends cdk.Construct implements cdk.IDependable {
public readonly stageName: StageName;
public readonly stageName: string;
public readonly dependencyElements = new Array<cdk.IDependable>();

private readonly restApi: RestApiRef;
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk/aws-apigateway/test/test.restapi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export = {

// WHEN
const imported = apigateway.RestApi.import(stack, 'imported-api', {
restApiId: new apigateway.RestApiId('api-rxt4498f')
restApiId: 'api-rxt4498f'
});
const exported = imported.export();

Expand Down Expand Up @@ -528,7 +528,7 @@ export = {
// GIVEN
const stack = new cdk.Stack();
const cloneFrom = apigateway.RestApi.import(stack, 'RestApi', {
restApiId: new apigateway.RestApiId('foobar')
restApiId: 'foobar'
});

// WHEN
Expand Down Expand Up @@ -580,7 +580,7 @@ export = {
const api = new apigateway.RestApi(stack, 'myapi', {
defaultIntegration: rootInteg,
defaultMethodOptions: {
authorizerId: new apigateway.AuthorizerId('AUTHID'),
authorizerId: 'AUTHID',
authorizationType: apigateway.AuthorizationType.IAM,
}
});
Expand All @@ -599,7 +599,7 @@ export = {
const child2 = api.root.addResource('child2', {
defaultIntegration: new apigateway.MockIntegration(),
defaultMethodOptions: {
authorizerId: new apigateway.AuthorizerId('AUTHID2'),
authorizerId: 'AUTHID2',
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class AutoScalingGroup extends cdk.Construct implements elb.ILoadBalancer
private readonly autoScalingGroup: cloudformation.AutoScalingGroupResource;
private readonly securityGroup: ec2.SecurityGroupRef;
private readonly securityGroups: ec2.SecurityGroupRef[] = [];
private readonly loadBalancerNames: cdk.Token[] = [];
private readonly loadBalancerNames: string[] = [];

constructor(parent: cdk.Construct, name: string, props: AutoScalingGroupProps) {
super(parent, name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,16 +360,16 @@ export = {

function mockVpc(stack: cdk.Stack) {
return ec2.VpcNetwork.import(stack, 'MyVpc', {
vpcId: new ec2.VPCId('my-vpc'),
vpcId: 'my-vpc',
availabilityZones: [ 'az1' ],
publicSubnetIds: [ new ec2.SubnetId('pub1') ],
privateSubnetIds: [ new ec2.SubnetId('pri1') ],
publicSubnetIds: [ 'pub1' ],
privateSubnetIds: [ 'pri1' ],
isolatedSubnetIds: [],
});
}

function mockSecurityGroup(stack: cdk.Stack) {
return ec2.SecurityGroupRef.import(stack, 'MySG', {
securityGroupId: new ec2.SecurityGroupId('most-secure'),
securityGroupId: 'most-secure',
});
}
Loading