-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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(redshift): enableRebootForParameterChanges fails synth with "cannot find entry file…" #28760
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
db4059d
fix(redshift): enableRebootForParameterChanges fails synth with canno…
paulhcsun 4c3a650
Merge branch 'main' into redshift
paulhcsun 04915cb
Merge branch 'main' into redshift
paulhcsun 7ddef3c
Merge branch 'main' into redshift
paulhcsun 4d6ea45
readme changes + remove comment
paulhcsun 7426a43
Merge branch 'main' into redshift
paulhcsun ca54358
Merge branch 'main' into redshift
mergify[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,3 +27,6 @@ junit.xml | |
test/ | ||
!*.lit.ts | ||
**/*.snapshot | ||
|
||
# include custom-resource-handlers | ||
!custom-resource-handlers/* |
This file contains 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
This file contains 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
38 changes: 38 additions & 0 deletions
38
packages/@aws-cdk/aws-redshift-alpha/scripts/airlift-custom-resource-handlers.sh
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#!/bin/bash | ||
|
||
scriptdir=$(cd $(dirname $0) && pwd) | ||
customresourcedir=$(node -p "path.dirname(require.resolve('@aws-cdk/custom-resource-handlers/package.json'))") | ||
awscdklibdir=${scriptdir}/.. | ||
|
||
function airlift() { | ||
# core needs to be airlifted directly to core to prevent circular dependencies | ||
if [[ $1 != dist/core/nodejs-entrypoint-handler && ($1 = dist/core || $1 = dist/core/*) ]]; | ||
then | ||
mkdir -p $awscdklibdir/core/lib/$1 | ||
cp $customresourcedir/$2 $awscdklibdir/core/lib/$1 | ||
else | ||
mkdir -p $awscdklibdir/custom-resource-handlers/$1 | ||
cp $customresourcedir/$2 $awscdklibdir/custom-resource-handlers/$1 | ||
fi | ||
} | ||
|
||
recurse() { | ||
local dir=$1 | ||
|
||
for file in $dir/*; do | ||
if [ -f $file ]; then | ||
case $file in | ||
$customresourcedir/dist/aws-redshift-alpha/*/index.*) | ||
cr=$(echo $file | rev | cut -d "/" -f 2-4 | rev) | ||
airlift $cr $cr/index.* | ||
;; | ||
esac | ||
fi | ||
|
||
if [ -d $file ]; then | ||
recurse $file | ||
fi | ||
done | ||
} | ||
|
||
recurse $customresourcedir/dist |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,13 +15,16 @@ and included as part of the `aws-cdk-lib` package. | |
|
||
### Experimental: | ||
|
||
- aws-amplify-alpha/asset-deployment-handler | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. wrong custom resource :) |
||
- aws-amplify-alpha/asset-deployment-handler | ||
|
||
These handlers are excluded from `aws-cdk-lib/custom-resource-handlers` and are individually | ||
copied into their respective `-alpha` packages at build time. When an `-alpha` package is | ||
stabilized, part of the stabilization process **must** be to remove `-alpha` from the folder | ||
name, so that it is included in `aws-cdk-lib`. | ||
|
||
`*/generated.ts` files are not supported for alpha modules due to import paths that only work for stable modules in `aws-cdk-lib`. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Explain that they must be added into |
||
|
||
## Nodejs Entrypoint | ||
|
||
This package also includes `nodejs-entrypoint.ts`, which is a wrapper that talks to | ||
|
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this comment still relevant?