Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,8 @@ const toolkitLib = configureProject(
],
devDeps: [
'@aws-cdk/aws-service-spec',
'@jest/globals',
'@microsoft/api-extractor',
'@smithy/types',
'@types/fs-extra',
'@types/split2',
Expand All @@ -790,8 +792,9 @@ const toolkitLib = configureProject(
'dts-bundle-generator@9.3.1', // use this specific version because newer versions are much slower. This is a temporary arrangement we hope to remove soon anyway.
'esbuild',
'fast-check',
'nock',
'typedoc',
'@microsoft/api-extractor',
'xml-js',
],
// Watch 2 directories at once
releasableCommits: transitiveToolkitPackages('@aws-cdk/toolkit-lib'),
Expand All @@ -806,10 +809,10 @@ const toolkitLib = configureProject(
jestConfig: {
coverageThreshold: {
// this is very sad but we will get better
statements: 60,
branches: 70,
functions: 55,
lines: 60,
statements: 87,
branches: 83,
functions: 82,
lines: 87,
},
testEnvironment: './test/_helpers/jest-bufferedconsole.ts',
setupFilesAfterEnv: ['<rootDir>/test/_helpers/jest-setup-after-env.ts'],
Expand Down Expand Up @@ -896,6 +899,7 @@ toolkitLib.eslint?.addOverride({
files: ['./test/**'],
rules: {
'@cdklabs/no-throw-default-error': 'off',
'@typescript-eslint/unbound-method': 'off',
},
});

Expand Down Expand Up @@ -1122,10 +1126,10 @@ const cli = configureProject(
// We want to improve our test coverage
// DO NOT LOWER THESE VALUES!
// If you need to break glass, open an issue to re-up the values with additional test coverage
statements: 82,
branches: 74,
statements: 81,
branches: 76,
functions: 87,
lines: 82,
lines: 81,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lowered! naughty

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it's weird. It passes in build with the previous value, but not in codecov

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it's weird. It passes in build with the previous value, but not in codecov

},
// We have many tests here that commonly time out
testTimeout: 60_000,
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/toolkit-lib/.eslintrc.json

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

12 changes: 12 additions & 0 deletions packages/@aws-cdk/toolkit-lib/.projen/deps.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/toolkit-lib/.projen/tasks.json

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

8 changes: 4 additions & 4 deletions packages/@aws-cdk/toolkit-lib/jest.config.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/toolkit-lib/package.json

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"version": "tree-0.1",
"tree": {
"id": "App",
"path": "",
"children": {
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "@aws-cdk/core.Construct",
"version": "1.144.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.App",
"version": "1.144.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"version": "tree-0.1",
"tree": {
"id": "App",
"path": "",
"children": {
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.64"
}
}
},
"constructInfo": {
"fqn": "aws-cdk-lib.App",
"version": "2.12.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"version": "tree-0.1",
"tree": {
"id": "App",
"path": "",
"children": {
"integ-idp": {
"id": "integ-idp",
"path": "integ-idp",
"children": {
"identitypool": {
"id": "identitypool",
"path": "integ-idp/identitypool",
"constructInfo": {
"fqn": "@aws-cdk/aws-cognito-identitypool-alpha.IdentityPool",
"version": "2.175.0-alpha.0",
"metadata": ["*", "*"]
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/integ-tests-alpha.IntegTest",
"version": "0.0.0"
}
},
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.4.2"
}
}
},
"constructInfo": {
"fqn": "aws-cdk-lib.App",
"version": "0.0.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
{
"version": "tree-0.1",
"tree": {
"id": "App",
"path": "",
"children": {
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.66"
}
},
"SimulationStack": {
"id": "SimulationStack",
"path": "SimulationStack",
"children": {
"HttpApi": {
"id": "HttpApi",
"path": "SimulationStack/HttpApi",
"children": {
"Resource": {
"id": "Resource",
"path": "SimulationStack/HttpApi/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::ApiGatewayV2::Api",
"aws:cdk:cloudformation:props": {
"name": "HttpApi",
"protocolType": "HTTP"
}
},
"constructInfo": {
"fqn": "aws-cdk-lib.aws_apigatewayv2.CfnApi",
"version": "2.8.0"
}
},
"DefaultStage": {
"id": "DefaultStage",
"path": "SimulationStack/HttpApi/DefaultStage",
"children": {
"Resource": {
"id": "Resource",
"path": "SimulationStack/HttpApi/DefaultStage/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::ApiGatewayV2::Stage",
"aws:cdk:cloudformation:props": {
"apiId": {
"Ref": "HttpApiF5A9A8A7"
},
"stageName": "$default",
"autoDeploy": true
}
},
"constructInfo": {
"fqn": "aws-cdk-lib.aws_apigatewayv2.CfnStage",
"version": "2.8.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/aws-apigatewayv2-alpha.HttpStage",
"version": "2.13.0-alpha.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/aws-apigatewayv2-alpha.HttpApi",
"version": "2.13.0-alpha.0"
}
},
"CDKMetadata": {
"id": "CDKMetadata",
"path": "SimulationStack/CDKMetadata",
"children": {
"Default": {
"id": "Default",
"path": "SimulationStack/CDKMetadata/Default",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnResource",
"version": "2.8.0"
}
},
"Condition": {
"id": "Condition",
"path": "SimulationStack/CDKMetadata/Condition",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnCondition",
"version": "2.8.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.0.66"
}
}
},
"constructInfo": {
"fqn": "aws-cdk-lib.Stack",
"version": "2.8.0"
}
}
},
"constructInfo": {
"fqn": "aws-cdk-lib.App",
"version": "2.8.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"Resources": {
"Func": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "referencetoChildS3BucketParam"
},
"S3Key": {
"Ref": "referencetoChildS3KeyParam"
}
},
"FunctionName": "my-function"
},
"Metadata": {
"aws:asset:path": "old-path"
}
},
"GrandChildStack": {
"Type": "AWS::CloudFormation::Stack",
"Properties": {
"TemplateURL": "https://www.magic-url.com",
"Parameters": {
"referencetoS3BucketParam": {
"Ref": "referencetoGrandChildS3BucketParam"
},
"referencetoS3KeyParam": {
"Ref": "referencetoGrandChildS3KeyParam"
}
}
},
"Metadata": {
"aws:asset:path": "one-lambda-stack-with-asset-parameters.nested.template.json"
}
}
},
"Parameters": {
"referencetoGrandChildS3BucketParam": {
"Type": "String"
},
"referencetoGrandChildS3KeyParam": {
"Type": "String"
},
"referencetoChildS3BucketParam": {
"Type": "String"
},
"referencetoChildS3KeyParam": {
"Type": "String"
}
}
}
Loading
Loading