-
Notifications
You must be signed in to change notification settings - Fork 4k
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(cli-lib): deploy fails with "no such file or directory, open 'node_modules/@aws-cdk/integ-runner/lib/workers/db.json.gz'" #28199
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
134 changes: 134 additions & 0 deletions
134
packages/@aws-cdk-testing/cli-integ/lib/with-cli-lib.ts
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,134 @@ | ||
import * as os from 'os'; | ||
import * as path from 'path'; | ||
import { TestContext } from './integ-test'; | ||
import { RESOURCES_DIR } from './resources'; | ||
import { AwsContext, withAws } from './with-aws'; | ||
import { cloneDirectory, installNpmPackages, TestFixture, DEFAULT_TEST_TIMEOUT_S, CdkCliOptions } from './with-cdk-app'; | ||
import { withTimeout } from './with-timeout'; | ||
|
||
/** | ||
* Higher order function to execute a block with a CliLib Integration CDK app fixture | ||
*/ | ||
export function withCliLibIntegrationCdkApp<A extends TestContext & AwsContext>(block: (context: CliLibIntegrationTestFixture) => Promise<void>) { | ||
return async (context: A) => { | ||
const randy = context.randomString; | ||
const stackNamePrefix = `cdktest-${randy}`; | ||
const integTestDir = path.join(os.tmpdir(), `cdk-integ-${randy}`); | ||
|
||
context.log(` Stack prefix: ${stackNamePrefix}\n`); | ||
context.log(` Test directory: ${integTestDir}\n`); | ||
context.log(` Region: ${context.aws.region}\n`); | ||
|
||
await cloneDirectory(path.join(RESOURCES_DIR, 'cdk-apps', 'simple-app'), integTestDir, context.output); | ||
const fixture = new CliLibIntegrationTestFixture( | ||
integTestDir, | ||
stackNamePrefix, | ||
context.output, | ||
context.aws, | ||
context.randomString); | ||
|
||
let success = true; | ||
try { | ||
const installationVersion = fixture.packages.requestedFrameworkVersion(); | ||
|
||
if (fixture.packages.majorVersion() === '1') { | ||
throw new Error('This test suite is only compatible with AWS CDK v2'); | ||
} | ||
|
||
const alphaInstallationVersion = fixture.packages.requestedAlphaVersion(); | ||
await installNpmPackages(fixture, { | ||
'aws-cdk-lib': installationVersion, | ||
'@aws-cdk/cli-lib-alpha': alphaInstallationVersion, | ||
'@aws-cdk/aws-lambda-go-alpha': alphaInstallationVersion, | ||
'@aws-cdk/aws-lambda-python-alpha': alphaInstallationVersion, | ||
'constructs': '^10', | ||
}); | ||
|
||
await block(fixture); | ||
} catch (e: any) { | ||
// We survive certain cases involving gopkg.in | ||
if (errorCausedByGoPkg(e.message)) { | ||
return; | ||
} | ||
success = false; | ||
throw e; | ||
} finally { | ||
if (process.env.INTEG_NO_CLEAN) { | ||
context.log(`Left test directory in '${integTestDir}' ($INTEG_NO_CLEAN)\n`); | ||
} else { | ||
await fixture.dispose(success); | ||
} | ||
} | ||
}; | ||
} | ||
|
||
/** | ||
* Return whether or not the error is being caused by gopkg.in being down | ||
* | ||
* Our Go build depends on https://gopkg.in/, which has errors pretty often | ||
* (every couple of days). It is run by a single volunteer. | ||
*/ | ||
function errorCausedByGoPkg(error: string) { | ||
// The error is different depending on what request fails. Messages recognized: | ||
//////////////////////////////////////////////////////////////////// | ||
// go: github.com/aws/aws-lambda-go@v1.28.0 requires | ||
// gopkg.in/yaml.v3@v3.0.0-20200615113413-eeeca48fe776: invalid version: git ls-remote -q origin in /go/pkg/mod/cache/vcs/0901dc1ef67fcce1c9b3ae51078740de4a0e2dc673e720584ac302973af82f36: exit status 128: | ||
// remote: Cannot obtain refs from GitHub: cannot talk to GitHub: Get https://github.com/go-yaml/yaml.git/info/refs?service=git-upload-pack: net/http: request canceled (Client.Timeout exceeded while awaiting headers) | ||
// fatal: unable to access 'https://gopkg.in/yaml.v3/': The requested URL returned error: 502 | ||
//////////////////////////////////////////////////////////////////// | ||
// go: downloading github.com/aws/aws-lambda-go v1.28.0 | ||
// go: github.com/aws/aws-lambda-go@v1.28.0 requires | ||
// gopkg.in/yaml.v3@v3.0.0-20200615113413-eeeca48fe776: unrecognized import path "gopkg.in/yaml.v3": reading https://gopkg.in/yaml.v3?go-get=1: 502 Bad Gateway | ||
// server response: Cannot obtain refs from GitHub: cannot talk to GitHub: Get https://github.com/go-yaml/yaml.git/info/refs?service=git-upload-pack: net/http: request canceled (Client.Timeout exceeded while awaiting headers) | ||
//////////////////////////////////////////////////////////////////// | ||
// go: github.com/aws/aws-lambda-go@v1.28.0 requires | ||
// gopkg.in/yaml.v3@v3.0.0-20200615113413-eeeca48fe776: invalid version: git fetch -f origin refs/heads/*:refs/heads/* refs/tags/*:refs/tags/* in /go/pkg/mod/cache/vcs/0901dc1ef67fcce1c9b3ae51078740de4a0e2dc673e720584ac302973af82f36: exit status 128: | ||
// error: RPC failed; HTTP 502 curl 22 The requested URL returned error: 502 | ||
// fatal: the remote end hung up unexpectedly | ||
//////////////////////////////////////////////////////////////////// | ||
|
||
return (error.includes('gopkg\.in.*invalid version.*exit status 128') | ||
|| error.match(/unrecognized import path[^\n]gopkg\.in/)); | ||
} | ||
|
||
/** | ||
* SAM Integration test fixture for CDK - SAM integration test cases | ||
*/ | ||
export function withCliLibFixture(block: (context: CliLibIntegrationTestFixture) => Promise<void>) { | ||
return withAws(withTimeout(DEFAULT_TEST_TIMEOUT_S, withCliLibIntegrationCdkApp(block))); | ||
} | ||
|
||
export class CliLibIntegrationTestFixture extends TestFixture { | ||
/** | ||
* | ||
*/ | ||
public async cdk(args: string[], options: CdkCliOptions = {}) { | ||
const action = args[0]; | ||
const stackName = args[1]; | ||
|
||
const cliOpts: Record<string, any> = { | ||
stacks: stackName ? [stackName] : undefined, | ||
}; | ||
|
||
if (action === 'deploy') { | ||
cliOpts.requireApproval = options.neverRequireApproval ? 'never' : 'broadening'; | ||
} | ||
|
||
return this.shell(['node', '--input-type=module', `<<__EOS__ | ||
import { AwsCdkCli } from '@aws-cdk/cli-lib-alpha'; | ||
const cli = AwsCdkCli.fromCdkAppDirectory(); | ||
|
||
await cli.${action}(${JSON.stringify(cliOpts)}); | ||
__EOS__`], { | ||
...options, | ||
modEnv: { | ||
AWS_REGION: this.aws.region, | ||
AWS_DEFAULT_REGION: this.aws.region, | ||
STACK_NAME_PREFIX: this.stackNamePrefix, | ||
PACKAGE_LAYOUT_VERSION: this.packages.majorVersion(), | ||
...options.modEnv, | ||
}, | ||
}); | ||
} | ||
|
||
} |
26 changes: 26 additions & 0 deletions
26
packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/simple-app/app.js
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,26 @@ | ||
const cdk = require('aws-cdk-lib/core'); | ||
const iam = require('aws-cdk-lib/aws-iam'); | ||
const sqs = require('aws-cdk-lib/aws-sqs'); | ||
|
||
const stackPrefix = process.env.STACK_NAME_PREFIX; | ||
if (!stackPrefix) { | ||
throw new Error(`the STACK_NAME_PREFIX environment variable is required`); | ||
} | ||
|
||
class SimpleStack extends cdk.Stack { | ||
constructor(scope, id, props) { | ||
super(scope, id, props); | ||
const queue = new sqs.Queue(this, 'queue', { | ||
visibilityTimeout: cdk.Duration.seconds(300), | ||
}); | ||
const role = new iam.Role(this, 'role', { | ||
assumedBy: new iam.AnyPrincipal(), | ||
}); | ||
queue.grantConsumeMessages(role); | ||
} | ||
} | ||
|
||
const app = new cdk.App(); | ||
new SimpleStack(app, `${stackPrefix}-simple-1`); | ||
|
||
app.synth(); |
7 changes: 7 additions & 0 deletions
7
packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/simple-app/cdk.json
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,7 @@ | ||
{ | ||
"app": "node app.js", | ||
"versionReporting": false, | ||
"context": { | ||
"aws-cdk:enableDiffNoFail": "true" | ||
} | ||
} |
65 changes: 65 additions & 0 deletions
65
packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib.integtest.ts
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,65 @@ | ||
import { integTest, withCliLibFixture } from '../../lib'; | ||
|
||
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime | ||
|
||
integTest('cli-lib synth', withCliLibFixture(async (fixture) => { | ||
await fixture.cdk(['synth', fixture.fullStackName('simple-1')]); | ||
expect(fixture.template('simple-1')).toEqual(expect.objectContaining({ | ||
// Checking for a small subset is enough as proof that synth worked | ||
Resources: expect.objectContaining({ | ||
queue276F7297: expect.objectContaining({ | ||
Type: 'AWS::SQS::Queue', | ||
Properties: { | ||
VisibilityTimeout: 300, | ||
}, | ||
Metadata: { | ||
'aws:cdk:path': `${fixture.stackNamePrefix}-simple-1/queue/Resource`, | ||
}, | ||
}), | ||
}), | ||
})); | ||
})); | ||
|
||
integTest('cli-lib list', withCliLibFixture(async (fixture) => { | ||
const listing = await fixture.cdk(['list'], { captureStderr: false }); | ||
expect(listing).toContain(fixture.fullStackName('simple-1')); | ||
})); | ||
|
||
integTest('cli-lib deploy', withCliLibFixture(async (fixture) => { | ||
const stackName = fixture.fullStackName('simple-1'); | ||
|
||
try { | ||
// deploy the stack | ||
await fixture.cdk(['deploy', stackName], { | ||
neverRequireApproval: true, | ||
}); | ||
|
||
// verify the number of resources in the stack | ||
const expectedStack = await fixture.aws.cloudFormation('describeStackResources', { | ||
StackName: stackName, | ||
}); | ||
expect(expectedStack.StackResources?.length).toEqual(3); | ||
} finally { | ||
// delete the stack | ||
await fixture.cdk(['destroy', stackName], { | ||
captureStderr: false, | ||
}); | ||
} | ||
})); | ||
|
||
integTest('security related changes without a CLI are expected to fail when approval is required', withCliLibFixture(async (fixture) => { | ||
const stdErr = await fixture.cdk(['deploy', fixture.fullStackName('simple-1')], { | ||
onlyStderr: true, | ||
captureStderr: true, | ||
allowErrExit: true, | ||
neverRequireApproval: false, | ||
}); | ||
|
||
expect(stdErr).toContain('This deployment will make potentially sensitive changes according to your current security approval level'); | ||
expect(stdErr).toContain('Deployment failed: Error: \"--require-approval\" is enabled and stack includes security-sensitive updates'); | ||
|
||
// Ensure stack was not deployed | ||
await expect(fixture.aws.cloudFormation('describeStacks', { | ||
StackName: fixture.fullStackName('simple-1'), | ||
})).rejects.toThrow('does not exist'); | ||
})); |
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 |
---|---|---|
@@ -1,6 +1,7 @@ | ||
*.js | ||
*.js.map | ||
*.d.ts | ||
*.gz | ||
!lib/init-templates/**/javascript/**/* | ||
node_modules | ||
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 |
---|---|---|
|
@@ -35,3 +35,4 @@ tsconfig.json | |
!build-info.json | ||
!NOTICE | ||
!THIRD_PARTY_LICENSES | ||
!db.json.gz |
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
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.
This is the fix. We cannot depend on
@aws-cdk/aws-service-spec
sincecli-lib
is a jsii package, and service-spec is not.