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.

Sign up for GitHub

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

Jump to bottom

chore: npm-check-updates && yarn upgrade #26283

Merged
merged 38 commits into from
Jul 19, 2023
Merged

chore: npm-check-updates && yarn upgrade #26283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6ddf1db
chore: npm-check-updates && yarn upgrade
aws-cdk-automation Jul 12, 2023
7b5ce36
snapshots
iliapolo Jul 13, 2023
61d038e
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 13, 2023
b79bfc7
snapshots
iliapolo Jul 13, 2023
09b38de
fix solution stack name
iliapolo Jul 13, 2023
ef2e8c7
print failed tests
iliapolo Jul 13, 2023
b8a0b5c
bundle to node 18
iliapolo Jul 13, 2023
47a9767
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 15, 2023
b289ee2
yarn lock
iliapolo Jul 15, 2023
fc30629
rearrange logging
iliapolo Jul 15, 2023
3881b76
attributions
iliapolo Jul 15, 2023
341e9c5
sdk-api
iliapolo Jul 15, 2023
21df62a
attributions
iliapolo Jul 15, 2023
ff1c36f
snapshots
iliapolo Jul 16, 2023
3fa456e
snapshots
iliapolo Jul 16, 2023
3976c0c
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 16, 2023
6b345ac
snapshots
iliapolo Jul 16, 2023
1d45db6
update schema
iliapolo Jul 16, 2023
b34d5bd
snapshots
iliapolo Jul 17, 2023
4254a30
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 17, 2023
a1e83a6
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 17, 2023
38884f4
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 18, 2023
cdee61e
snapshots
iliapolo Jul 18, 2023
f8dffb3
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 18, 2023
03c5b52
snapshots
iliapolo Jul 18, 2023
1b1a35a
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 18, 2023
a47eaa7
snapshots
iliapolo Jul 18, 2023
5cc6fd0
snapshots
iliapolo Jul 18, 2023
4f2a224
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 18, 2023
1635e72
remove error
iliapolo Jul 18, 2023
d742401
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 19, 2023
27c7b5e
regen lock file
iliapolo Jul 19, 2023
2ba0402
snapshots
iliapolo Jul 19, 2023
ed49b36
revert tests.txt
iliapolo Jul 19, 2023
c7740bf
fix unit tests
iliapolo Jul 19, 2023
b20b05b
revert typescript-json-schema upgrade
iliapolo Jul 19, 2023
2a82043
revert major version of integ schema
iliapolo Jul 19, 2023
5aac941
Merge branch 'main' into automation/yarn-upgrade
iliapolo Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nx/workspace": "^16.3.2",
"@nx/workspace": "^16.5.1",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
Expand All @@ -24,17 +24,17 @@
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.82.0",
"jsii-pacmak": "1.82.0",
"jsii-reflect": "1.82.0",
"jsii-rosetta": "~5.0.8",
"jsii-diff": "1.84.0",
"jsii-pacmak": "1.84.0",
"jsii-reflect": "1.84.0",
"jsii-rosetta": "~5.1.6",
"lerna": "^7.0.1",
"nx": "^16.3.2",
"nx": "^16.5.1",
"patch-package": "^6.5.1",
"semver": "^7.5.2",
"semver": "^7.5.4",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
"typescript": "~5.1.3"
"typescript": "~5.1.6"
},
"resolutions": {
"colors": "1.4.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/cli-integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1379.0",
"aws-sdk": "^2.1414.0",
"axios": "^0.27.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
"jest": "^29.5.0",
"jest": "^29.6.1",
"jest-junit": "^14.0.1",
"make-runnable": "^1.4.1",
"npm": "^8.19.4",
"p-queue": "^6.6.2",
"semver": "^7.5.1",
"semver": "^7.5.4",
"ts-mock-imports": "^1.3.8",
"yaml": "1.10.2",
"yargs": "^17.7.2"
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk-testing/framework-integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
},
"dependencies": {
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.195",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1379.0",
"aws-sdk": "^2.1414.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "^2.7.68",
"cdk8s-plus-24": "2.7.31",
"cdk8s": "^2.7.102",
"cdk8s-plus-24": "2.8.85",
"constructs": "^10.0.0"
},
"repository": {
Expand Down
10 changes: 5 additions & 5 deletions ...ic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
}
}
},
"292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc": {
"e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642": {
"source": {
"path": "asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip",
"path": "asset.e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip",
"objectKey": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down Expand Up @@ -53,15 +53,15 @@
}
}
},
"2e074e7f676d73405cc42f0871d7a7cc4a2e7595d47ca65fb40ad4a7de6546b9": {
"ae905796f14ca862d4e6f19382d8b2aae475b34b7c2395bd8fea7789d31809c6": {
"source": {
"path": "aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "2e074e7f676d73405cc42f0871d7a7cc4a2e7595d47ca65fb40ad4a7de6546b9.json",
"objectKey": "ae905796f14ca862d4e6f19382d8b2aae475b34b7c2395bd8fea7789d31809c6.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip"
"S3Key": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip"
},
"Description": "/opt/awscli/aws"
}
Expand Down Expand Up @@ -440,7 +440,7 @@
"Value": "AWSServiceRoleForElasticBeanstalkManagedUpdates"
}
],
"SolutionStackName": "64bit Amazon Linux 2 v5.8.1 running Node.js 16"
"SolutionStackName": "64bit Amazon Linux 2 v5.8.3 running Node.js 16"
},
"DependsOn": [
"beastalkapp",
Expand Down
12 changes: 9 additions & 3 deletions ...depipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2e074e7f676d73405cc42f0871d7a7cc4a2e7595d47ca65fb40ad4a7de6546b9.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ae905796f14ca862d4e6f19382d8b2aae475b34b7c2395bd8fea7789d31809c6.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -66,7 +66,10 @@
"/aws-cdk-codepipeline-elastic-beanstalk-deploy/DeployApp/AwsCliLayer/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "DeployAppAwsCliLayerAEF99B2F"
"data": "DeployAppAwsCliLayerAEF99B2F",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
]
}
],
"/aws-cdk-codepipeline-elastic-beanstalk-deploy/DeployApp/CustomResource/Default": [
Expand Down Expand Up @@ -120,7 +123,10 @@
"/aws-cdk-codepipeline-elastic-beanstalk-deploy/beanstlk-env": [
{
"type": "aws:cdk:logicalId",
"data": "beanstlkenv"
"data": "beanstlkenv",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
]
}
],
"/aws-cdk-codepipeline-elastic-beanstalk-deploy/Pipeline/Role/Resource": [
Expand Down
16 changes: 8 additions & 8 deletions ...s-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip"
"s3Key": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip"
},
"description": "/opt/awscli/aws"
}
Expand Down Expand Up @@ -692,7 +692,7 @@
"value": "AWSServiceRoleForElasticBeanstalkManagedUpdates"
}
],
"solutionStackName": "64bit Amazon Linux 2 v5.8.1 running Node.js 16"
"solutionStackName": "64bit Amazon Linux 2 v5.8.3 running Node.js 16"
}
},
"constructInfo": {
Expand Down Expand Up @@ -1113,13 +1113,13 @@
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
},
"Deploy": {
Expand Down Expand Up @@ -1269,13 +1269,13 @@
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
}
},
Expand Down Expand Up @@ -1319,7 +1319,7 @@
"path": "codepipeline-elastic-beanstalk-deploy/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
},
"DeployAssert": {
Expand Down Expand Up @@ -1365,7 +1365,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...ework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const beanstalkApp = new elasticbeanstalk.CfnApplication(stack, 'beastalk-app',
const beanstalkEnv = new elasticbeanstalk.CfnEnvironment(stack, 'beanstlk-env', {
applicationName: beanstalkApp.applicationName!,
environmentName: 'codepipeline-test-env',
solutionStackName: '64bit Amazon Linux 2 v5.8.1 running Node.js 16',
solutionStackName: '64bit Amazon Linux 2 v5.8.3 running Node.js 16',
optionSettings: [
{
namespace: 'aws:autoscaling:launchconfiguration',
Expand Down
Binary file renamed ...009afd534a342c17877fd1b931fb8d8a62abc.zip → ...65e6715e2ebb62f79ec53aa75a1af9298f642.zip
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions ...-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/aws-ecs-integ.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
}
}
},
"292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc": {
"e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642": {
"source": {
"path": "asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip",
"path": "asset.e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip",
"objectKey": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down Expand Up @@ -66,15 +66,15 @@
}
}
},
"2822e758d5b8cc6412fcacb9006cac67744d6121aec5f69c46502326f0eb6925": {
"2266b416c0e22a52e28f34bd8f4473a302319ef046c0d951d65150fa649b27e2": {
"source": {
"path": "aws-ecs-integ.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "2822e758d5b8cc6412fcacb9006cac67744d6121aec5f69c46502326f0eb6925.json",
"objectKey": "2266b416c0e22a52e28f34bd8f4473a302319ef046c0d951d65150fa649b27e2.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...nteg/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/aws-ecs-integ.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip"
"S3Key": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip"
},
"Description": "/opt/awscli/aws"
}
Expand Down
16 changes: 5 additions & 11 deletions ...ng/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2822e758d5b8cc6412fcacb9006cac67744d6121aec5f69c46502326f0eb6925.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2266b416c0e22a52e28f34bd8f4473a302319ef046c0d951d65150fa649b27e2.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -324,7 +324,10 @@
"/aws-ecs-integ/EnvFileDeployment/AwsCliLayer/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "EnvFileDeploymentAwsCliLayerA8FC897D"
"data": "EnvFileDeploymentAwsCliLayerA8FC897D",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
]
}
],
"/aws-ecs-integ/EnvFileDeployment/CustomResource/Default": [
Expand Down Expand Up @@ -374,15 +377,6 @@
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
],
"EcsClusterDefaultAutoScalingGroupLaunchTemplateProfile45668F20": [
{
"type": "aws:cdk:logicalId",
"data": "EcsClusterDefaultAutoScalingGroupLaunchTemplateProfile45668F20",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
]
},
"displayName": "aws-ecs-integ"
Expand Down
16 changes: 12 additions & 4 deletions ...esting/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,14 @@
"version": "0.0.0"
}
},
"ImportedInstanceProfile": {
"id": "ImportedInstanceProfile",
"path": "aws-ecs-integ/EcsCluster/DefaultAutoScalingGroup/ImportedInstanceProfile",
"constructInfo": {
"fqn": "aws-cdk-lib.Resource",
"version": "0.0.0"
}
},
"LaunchTemplate": {
"id": "LaunchTemplate",
"path": "aws-ecs-integ/EcsCluster/DefaultAutoScalingGroup/LaunchTemplate",
Expand Down Expand Up @@ -1428,7 +1436,7 @@
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
},
"LifecycleHookDrainHook": {
Expand Down Expand Up @@ -1852,7 +1860,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip"
"s3Key": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip"
},
"description": "/opt/awscli/aws"
}
Expand Down Expand Up @@ -2336,7 +2344,7 @@
"path": "Integ/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
},
"DeployAssert": {
Expand Down Expand Up @@ -2382,7 +2390,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.55"
"version": "10.2.69"
}
}
},
Expand Down
1 change: 0 additions & 1 deletion packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/hello-k8s.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export const resources = [
kind: 'Service',
metadata: { name: 'hello-kubernetes' },
spec: {
type: 'LoadBalancer',
ports: [{ port: 80, targetPort: 8080 }],
selector: { app: 'hello-kubernetes' },
},
Expand Down
Loading