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

fix(core): CustomResourceProvider assets are staged in node_modules #20953

Merged
merged 15 commits into from
Jul 18, 2022
Merged

fix(core): CustomResourceProvider assets are staged in node_modules #20953

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8ccee3d
fix(core): CustomResourceProvider assets are staged in node_modules
otaviomacedo Jul 1, 2022
440050c
Updated pipeline integ tests
otaviomacedo Jul 4, 2022
30763a8
Merge branch 'main' into otaviom/temp-custom-resource-provider
otaviomacedo Jul 4, 2022
e1f5780
Updated yarn.lock
otaviomacedo Jul 4, 2022
72ff242
Updated hashes
otaviomacedo Jul 5, 2022
9b71c18
Merge branch 'main' into otaviom/temp-custom-resource-provider
otaviomacedo Jul 13, 2022
84e4673
Using Filesystem
otaviomacedo Jul 13, 2022
d664410
Copying the entire directory
otaviomacedo Jul 14, 2022
9a6186c
Updated pipeline integ tests
otaviomacedo Jul 15, 2022
718204a
Updated tests
otaviomacedo Jul 18, 2022
b7fd01f
Updated tests
otaviomacedo Jul 18, 2022
d2bbc53
Removed accidental changes
otaviomacedo Jul 18, 2022
26aee0b
Merge branch 'main' into otaviom/temp-custom-resource-provider
otaviomacedo Jul 18, 2022
22564af
Merge branch 'main' into otaviom/temp-custom-resource-provider
otaviomacedo Jul 18, 2022
0c69e63
Merge branch 'main' into otaviom/temp-custom-resource-provider
mergify[bot] Jul 18, 2022
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
10 changes: 6 additions & 4 deletions packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Lazy } from '../lazy';
import { Size } from '../size';
import { Stack } from '../stack';
import { Token } from '../token';
import { FileSystem } from '../fs';

const ENTRYPOINT_FILENAME = '__entrypoint__';
const ENTRYPOINT_NODEJS_SOURCE = path.join(__dirname, 'nodejs-entrypoint.js');
Expand Down Expand Up @@ -200,16 +201,17 @@ export class CustomResourceProvider extends Construct {

const stack = Stack.of(scope);

// copy the entry point to the code directory
fs.copyFileSync(ENTRYPOINT_NODEJS_SOURCE, path.join(props.codeDirectory, `${ENTRYPOINT_FILENAME}.js`));

// verify we have an index file there
if (!fs.existsSync(path.join(props.codeDirectory, 'index.js'))) {
throw new Error(`cannot find ${props.codeDirectory}/index.js`);
}

const stagingDirectory = FileSystem.mkdtemp('cdk-custom-resource');
fs.copyFileSync(path.join(props.codeDirectory, 'index.js'), path.join(stagingDirectory, 'index.js'));
Copy link
Contributor

Choose a reason for hiding this comment

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

Previously we were copying the ENTRYPOINT_FILENAME into the codeDirectory. Now we are copy the ENTRYPOINT_FILENAME and just the index.js file from the codeDirectory into a tmp directory. What happens if some custom resources have more than just an index.js file that needs to be copied?

For example https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/aws-iam/lib/oidc-provider

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're absolutely right! Done.

fs.copyFileSync(ENTRYPOINT_NODEJS_SOURCE, path.join(stagingDirectory, `${ENTRYPOINT_FILENAME}.js`));

const staging = new AssetStaging(this, 'Staging', {
sourcePath: props.codeDirectory,
sourcePath: stagingDirectory,
});

const assetFileName = staging.relativeStagedPath(stack);
Expand Down
11 changes: 8 additions & 3 deletions packages/@aws-cdk/core/test/custom-resource-provider/custom-resource-provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@ describe('custom resource provider', () => {
});

// THEN
expect(fs.existsSync(path.join(TEST_HANDLER, '__entrypoint__.js'))).toEqual(true);
const cfn = toCloudFormation(stack);

// The asset hash constantly changes, so in order to not have to chase it, just look
// it up from the output.
const staging = stack.node.tryFindChild('Custom:MyResourceTypeCustomResourceProvider')?.node.tryFindChild('Staging') as AssetStaging;
const assetHash = staging.assetHash;
const sourcePath = staging.sourcePath;
const paramNames = Object.keys(cfn.Parameters);
const bucketParam = paramNames[0];
const keyParam = paramNames[1];
const hashParam = paramNames[2];

expect(fs.existsSync(path.join(sourcePath, '__entrypoint__.js'))).toEqual(true);

expect(cfn).toEqual({
Resources: {
CustomMyResourceTypeCustomResourceProviderRoleBD5E655F: {
Expand Down Expand Up @@ -139,9 +141,12 @@ describe('custom resource provider', () => {
// Then
const lambda = toCloudFormation(stack).Resources.CustomMyResourceTypeCustomResourceProviderHandler29FBDD2A;
expect(lambda).toHaveProperty('Metadata');
expect(lambda.Metadata).toEqual({
'aws:asset:path': `${__dirname}/mock-provider`,

expect(lambda.Metadata).toMatchObject({
'aws:asset:property': 'Code',

// The asset path should be a temporary folder prefixed with 'cdk-custom-resource'
'aws:asset:path': expect.stringMatching(/^.*\/cdk-custom-resource\w{6}\/?$/),
});

});
Expand Down
4 changes: 1 addition & 3 deletions packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,5 @@ const app = new App({
'@aws-cdk/core:newStyleStackSynthesis': '1',
},
});
new PipelineStack(app, 'PipelineStack', {
env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
});
new PipelineStack(app, 'PipelineStack');
app.synth();
4 changes: 1 addition & 3 deletions packages/@aws-cdk/pipelines/test/integ.newpipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,5 @@ const app = new App({
'@aws-cdk/core:newStyleStackSynthesis': '1',
},
});
new PipelineStack(app, 'PipelineStack', {
env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
});
new PipelineStack(app, 'PipelineStack');
app.synth();
10 changes: 5 additions & 5 deletions ...aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "20.0.0",
"files": {
"60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26": {
"207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86": {
"source": {
"path": "asset.60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26",
"path": "asset.207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26.zip",
"objectKey": "207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand All @@ -27,15 +27,15 @@
}
}
},
"ff8909e2b3e01298b53c87d97e8e745b4f0b2e4b6d29d5680c44e5da87a207a4": {
"8e96d9cc08ada5af474c075327c08e9a3e1f960ac56ba3c2462966b918cb2d6a": {
"source": {
"path": "PipelineSecurityStack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ff8909e2b3e01298b53c87d97e8e745b4f0b2e4b6d29d5680c44e5da87a207a4.json",
"objectKey": "8e96d9cc08ada5af474c075327c08e9a3e1f960ac56ba3c2462966b918cb2d6a.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 ...s-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26.zip"
"S3Key": "207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
118 changes: 118 additions & 0 deletions .../asset.207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86/__entrypoint__.js
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions ....snapshot/asset.207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86/index.js
View file
Open in desktop

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/pipelines/test/pipeline-security.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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}/ff8909e2b3e01298b53c87d97e8e745b4f0b2e4b6d29d5680c44e5da87a207a4.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8e96d9cc08ada5af474c075327c08e9a3e1f960ac56ba3c2462966b918cb2d6a.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
10 changes: 5 additions & 5 deletions ...ipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"version": "20.0.0",
"files": {
"60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26": {
"207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86": {
"source": {
"path": "asset.60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26",
"path": "asset.207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26.zip",
"objectKey": "207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"7194cb5242dc74e57ff29ee5b89a472fe06f40936ec2e2bca16e3bf76ae3fd8a": {
"a2a76f064f46994580b86a6d1ed99cf74e26731a21e51e8cc9adad469bbe29bc": {
"source": {
"path": "PipelineStack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "7194cb5242dc74e57ff29ee5b89a472fe06f40936ec2e2bca16e3bf76ae3fd8a.json",
"objectKey": "a2a76f064f46994580b86a6d1ed99cf74e26731a21e51e8cc9adad469bbe29bc.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 ...elines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26.zip"
"S3Key": "207d1c59082dd1ab722c445b190e0c2cbb20d6c3e981cf674a60159b56338e86.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
Loading