Skip to content

Commit

Permalink
chore: upgrade jsii to 0.10.0 (aws#2311)
Browse files Browse the repository at this point in the history
Upgrade jsii to 0.10.0, updating code to match new APIs.

Biggest benefits of new jsii drop:
- Improved build performance for Java
- Smaller jsii assemblies
- Hopefully unbreaking the master build.
- Fix bug around static calls in Java.
- Additional validation around TypeScript language feature use.
- Additional validation of doc comments.

BREAKING CHANGE: you will not be able to combine jsii libraries written
against previous versions of jsii with this version of the CDK.
  • Loading branch information
rix0rrr authored Apr 17, 2019
1 parent 8705af3 commit 26632fd
Show file tree
Hide file tree
Showing 90 changed files with 407 additions and 295 deletions.
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/package-lock.json

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

4 changes: 3 additions & 1 deletion packages/@aws-cdk/app-delivery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@
"@aws-cdk/aws-codepipeline": "^0.28.0",
"@aws-cdk/aws-codepipeline-actions": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-codebuild": "^0.28.0",
"@aws-cdk/cx-api": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/applet-js/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/package-lock.json

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

5 changes: 4 additions & 1 deletion packages/@aws-cdk/assets-docker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/assets": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-cloudformation": "^0.28.0",
"@aws-cdk/aws-lambda": "^0.28.0",
"@aws-cdk/cx-api": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
"peerDependencies": {
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/cx-api": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
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
Expand Up @@ -157,7 +157,7 @@ export interface RestApiProps extends ResourceOptions {
export class RestApi extends cdk.Construct implements IRestApi {
/**
* Imports an existing REST API resource.
* @param parent Parent construct
* @param scope Parent construct
* @param id Construct ID
* @param props Imported rest API properties
*/
Expand Down

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

3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-applicationautoscaling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"peerDependencies": {
"@aws-cdk/aws-cloudwatch": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-autoscaling-common": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-appmesh/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ dist
.LAST_BUILD
.LAST_PACKAGE
.jsii


# Include .jsii
!.jsii
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-autoscaling-common/package-lock.json

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

3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@
"@aws-cdk/aws-elasticloadbalancingv2": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/aws-sns": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-autoscaling-common": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront/package-lock.json

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

5 changes: 4 additions & 1 deletion packages/@aws-cdk/aws-cloudfront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@
"peerDependencies": {
"@aws-cdk/aws-route53": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-certificatemanager": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/aws-kms": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudtrail/package-lock.json

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

4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloudtrail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@
"peerDependencies": {
"@aws-cdk/aws-kms": "^0.28.0",
"@aws-cdk/aws-logs": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-codebuild/lib/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,8 @@ export class Project extends ProjectBase {
* has permissions to access the S3 Bucket of that Pipeline -
* otherwise, builds in that Pipeline will always fail.
*
* @param parent the parent Construct for this Construct
* @param name the logical name of this Construct
* @param scope the parent Construct for this Construct
* @param id the logical name of this Construct
* @param props the properties of the referenced Project
* @returns a reference to the existing Project
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codebuild/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codecommit/package-lock.json

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

3 changes: 3 additions & 0 deletions packages/@aws-cdk/aws-codedeploy-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,8 @@
"homepage": "https://github.com/awslabs/aws-cdk",
"engines": {
"node": ">= 8.10.0"
},
"peerDependencies": {
"@aws-cdk/cdk": "^0.28.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export class LambdaDeploymentGroup extends cdk.Construct implements ILambdaDeplo

/**
* Associate a function to run after deployment completes.
* @param preHook function to run after deployment completes
* @param postHook function to run after deployment completes
* @throws an error if a post-hook function is already configured
*/
public onPostHook(postHook: lambda.IFunction): void {
Expand All @@ -215,7 +215,7 @@ export class LambdaDeploymentGroup extends cdk.Construct implements ILambdaDeplo
/**
* Grant a principal permission to codedeploy:PutLifecycleEventHookExecutionStatus
* on this deployment group resource.
* @param principal to grant permission to
* @param grantee to grant permission to
*/
public grantPutLifecycleEventHookExecutionStatus(grantee: iam.IGrantable): iam.Grant {
return iam.Grant.addToPrincipal({
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codedeploy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
"@aws-cdk/aws-codedeploy-api": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/aws-lambda": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down

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

3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@
"construct-ctor:@aws-cdk/aws-codepipeline.CrossRegionScaffoldStack.<initializer>.params[0]",
"construct-ctor:@aws-cdk/aws-codepipeline.CrossRegionScaffoldStack.<initializer>.params[1]",
"export:@aws-cdk/aws-codepipeline.IPipeline",
"import-props-interface:@aws-cdk/aws-codepipeline.PipelineImportProps"
"import-props-interface:@aws-cdk/aws-codepipeline.PipelineImportProps",
"resource-attribute:@aws-cdk/aws-codepipeline.IPipeline.pipelineVersion"
]
}
}
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-cognito/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-lambda": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down

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-dynamodb/lib/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ export class Table extends Construct {
/**
* Permits an IAM principal all data read operations from this table:
* BatchGetItem, GetRecords, GetShardIterator, Query, GetItem, Scan.
* @param principal The principal to grant access to
* @param grantee The principal to grant access to
*/
public grantReadData(grantee: iam.IGrantable) {
return this.grant(grantee, ...READ_DATA_ACTIONS);
Expand All @@ -456,7 +456,7 @@ export class Table extends Construct {
/**
* Permits an IAM principal all data write operations to this table:
* BatchWriteItem, PutItem, UpdateItem, DeleteItem.
* @param principal The principal to grant access to
* @param grantee The principal to grant access to
*/
public grantWriteData(grantee: iam.IGrantable) {
return this.grant(grantee, ...WRITE_DATA_ACTIONS);
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-ecs/package-lock.json

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

6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-ecs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@
"@aws-cdk/aws-route53": "^0.28.0",
"@aws-cdk/aws-secretsmanager": "^0.28.0",
"@aws-cdk/aws-servicediscovery": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-cloudformation": "^0.28.0",
"@aws-cdk/aws-lambda": "^0.28.0",
"@aws-cdk/aws-sns": "^0.28.0",
"@aws-cdk/cx-api": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
2 changes: 0 additions & 2 deletions packages/@aws-cdk/aws-eks/lib/cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ export interface ClusterProps {
*
* If you want to create public load balancers, this must include public subnets.
*
* @example
*
* For example, to only select private subnets, supply the following:
*
* ```ts
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"@aws-cdk/aws-ec2": "^0.28.0",
"@aws-cdk/aws-route53": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
},
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
"@aws-cdk/cdk": "^0.28.0"
"@aws-cdk/cdk": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-fsx/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ dist
.LAST_BUILD
.LAST_PACKAGE
.jsii


# Include .jsii
!.jsii
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-greengrass/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ dist
.LAST_BUILD
.LAST_PACKAGE
.jsii


# Include .jsii
!.jsii
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-iam/lib/lazy-role.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class LazyRole extends cdk.Construct implements IRole {
/**
* Adds a permission to the role's default policy document.
* If there is no default policy attached to this role, it will be created.
* @param permission The permission statement to add to the policy document
* @param statement The permission statement to add to the policy document
*/
public addToPolicy(statement: PolicyStatement): boolean {
if (this.role) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-iam/lib/policy-document.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ export class PolicyStatement extends cdk.Token {
* Adds a service principal to this policy statement.
*
* @param service the service name for which a service principal is requested (e.g: `s3.amazonaws.com`).
* @param region the region in which the service principal lives (defaults to the current stack's region).
* @param opts options for adding the service principal (such as specifying a principal in a different region)
*/
public addServicePrincipal(service: string, opts?: ServicePrincipalOpts): this {
return this.addPrincipal(new ServicePrincipal(service, opts));
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-iam/lib/role.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class Role extends Construct implements IRole {
/**
* Adds a permission to the role's default policy document.
* If there is no default policy attached to this role, it will be created.
* @param permission The permission statement to add to the policy document
* @param statement The permission statement to add to the policy document
*/
public addToPolicy(statement: PolicyStatement): boolean {
if (!this.defaultPolicy) {
Expand Down
3 changes: 1 addition & 2 deletions packages/@aws-cdk/aws-kinesis/lib/stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ export class Stream extends StreamBase {
*
* @param scope The parent creating construct (usually `this`).
* @param id The construct's name.
* @param ref A `StreamAttributes` object. Can be obtained from a call to
* `stream.export()`.
* @param props Stream import properties
*/
public static import(scope: cdk.Construct, id: string, props: StreamImportProps): IStream {
return new ImportedStream(scope, id, props);
Expand Down
5 changes: 4 additions & 1 deletion packages/@aws-cdk/aws-lambda-event-sources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@
"@aws-cdk/aws-lambda": "^0.28.0",
"@aws-cdk/aws-s3": "^0.28.0",
"@aws-cdk/aws-sns": "^0.28.0",
"@aws-cdk/aws-sqs": "^0.28.0"
"@aws-cdk/aws-sqs": "^0.28.0",
"@aws-cdk/aws-events": "^0.28.0",
"@aws-cdk/aws-iam": "^0.28.0",
"@aws-cdk/cdk": "^0.28.0"
},
"engines": {
"node": ">= 8.10.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda/lib/function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class Function extends FunctionBase {
*
* Lambda.import(this, 'MyImportedFunction', { lambdaArn: new LambdaArn('arn:aws:...') });
*
* @param parent The parent construct
* @param scope The parent construct
* @param id The name of the lambda construct
* @param props A reference to a Lambda function. Can be created manually (see
* example above) or obtained through a call to `lambda.export()`.
Expand Down
Loading

0 comments on commit 26632fd

Please sign in to comment.