fix: use the more portable CDK executable for cdk overrides#4808
Merged
mergify[bot] merged 3 commits intoaws:mainlinefrom May 1, 2023
Merged
fix: use the more portable CDK executable for cdk overrides#4808mergify[bot] merged 3 commits intoaws:mainlinefrom
mergify[bot] merged 3 commits intoaws:mainlinefrom
Conversation
Lou1415926
force-pushed
the
fix/overrides/windows/exec
branch
from
2d8de08 to
b35ba2a
Compare
|
🍕 Here are the new binary sizes!
|
huanjani
approved these changes
Apr 27, 2023
efekarakus
reviewed
Apr 27, 2023
| // We assume that a node_modules/ dir is present with the CDK downloaded after running "npm install". | ||
| // This way clients don't need to install the CDK toolkit separately. | ||
| cmd := cdk.exec.Command(filepath.Join("node_modules", "aws-cdk", "bin", "cdk"), "synth", "--no-version-reporting") | ||
| cmd := cdk.exec.Command(filepath.Join("node_modules", ".bin", "cdk"), "synth", "--no-version-reporting") |
Contributor
There was a problem hiding this comment.
What does the .bin/cdk file's content look like out of curiosity?
Contributor
Author
There was a problem hiding this comment.
I think it looks the same as aws-cdk/bin/cdk on Unix systems, but on Windows it looked different! After I got home I can check on my little Windows machine.
Putting the DNM label on so that i can post the snippet before it's merged!
Contributor
There was a problem hiding this comment.
(on windows) node_modules/.bin/cdk:
#!/bin/sh
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
*CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
exec "$basedir/node" "$basedir/../aws-cdk/bin/cdk" "$@"
else
exec node "$basedir/../aws-cdk/bin/cdk" "$@"
fi
(on mac) node_modules/.bin/cdk
#!/usr/bin/env node
require('./cdk.js');
Codecov Report
@@ Coverage Diff @@
## mainline #4808 +/- ##
=========================================
Coverage 70.05% 70.05%
=========================================
Files 287 287
Lines 41126 41126
Branches 280 280
=========================================
Hits 28810 28810
Misses 10929 10929
Partials 1387 1387
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The old one points to a script with shebang line, which is ignored by Windows. As a result, when I used cdk overrides on Windows, it ends up not being able to interprete the cdk.js file
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the Apache 2.0 License.