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

fix(cloudformation-diff): move aws-sdk to dependency for cfn-diff to get CFN types resolved in exports #28768

Merged
merged 21 commits into from
Mar 16, 2024
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1cb3ee7
move aws-sdk to dependency for cfn-diff
frankpengau Jan 19, 2024
7067ad8
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
frankpengau Feb 3, 2024
26a7381
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
paulhcsun Feb 23, 2024
fa9aa7b
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
paulhcsun Feb 29, 2024
bbc0889
Update yarn lock
paulhcsun Feb 29, 2024
2f87fec
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
paulhcsun Feb 29, 2024
41608a1
fix conflicts
frankpengau Mar 14, 2024
6e77762
resolve upstream changes causing conflicts
frankpengau Mar 14, 2024
c84b7ec
Merge remote-tracking branch 'origin/main' into frankpengau/cfn-diff-…
frankpengau Mar 14, 2024
841fc9e
yarn lock fix
frankpengau Mar 14, 2024
841a9df
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
frankpengau Mar 14, 2024
02413c2
ran yarn pkglint from root
frankpengau Mar 14, 2024
2afd3ce
Revert "ran yarn pkglint from root"
frankpengau Mar 14, 2024
ef63c51
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
frankpengau Mar 14, 2024
883c5ab
new fresh yarn install lock to see if it will resolve issue
frankpengau Mar 14, 2024
086e100
revert yarn.lock to same as origin/main
frankpengau Mar 15, 2024
f6a48fb
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
frankpengau Mar 15, 2024
866a4e8
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
frankpengau Mar 15, 2024
66d7595
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
paulhcsun Mar 15, 2024
a83824b
Merge branch 'main' into frankpengau/cfn-diff-missing-aws-sdk
paulhcsun Mar 15, 2024
2ca5f26
Update packages/@aws-cdk/cloudformation-diff/package.json
paulhcsun Mar 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.53",
"@aws-cdk/service-spec-types": "^0.0.53",
"aws-sdk": "2.1576.0",
"chalk": "^4",
"diff": "^5.2.0",
"fast-deep-equal": "^3.1.3",
Expand All @@ -38,7 +39,6 @@
"@types/string-width": "^4.0.1",
"fast-check": "^3.16.0",
"jest": "^29.7.0",
"aws-sdk": "2.1576.0",
"ts-jest": "^29.1.2"
},
"repository": {
Expand Down