Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ const repoProject = new yarn.Monorepo({
defaultReleaseBranch: 'main',
typescriptVersion: TYPESCRIPT_VERSION,
devDeps: [
'patch-package',
'cdklabs-projen-project-types',
'glob',
'semver',
Expand Down Expand Up @@ -287,6 +288,7 @@ const repoProject = new yarn.Monorepo({
],
},
});
repoProject.package.setScript('postinstall', 'patch-package');

new AdcPublishing(repoProject);
new RecordPublishingTimestamp(repoProject);
Expand Down
4 changes: 3 additions & 1 deletion package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions packages/aws-cdk/lib/cli/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -734,15 +734,6 @@ export function cli(args: string[] = process.argv.slice(2)) {
} catch (e: any) {
await CliIoHost.get()?.asIoHelper().defaults.trace(`Ending Telemetry failed: ${e.message}`);
}
/*
* The SDK may leave open handles in some environments. One case we have seen is
* MetadataService leaving an open socket in GitHub Actions. To ensure that
* the CLI exits in all environments, we explicitly call process.exit() after
* ending telemetry.
*
* See https://github.com/aws/aws-sdk-js-v3/issues/7538.
*/
process.exit();
});
}
/* c8 ignore stop */
15 changes: 15 additions & 0 deletions patches/@aws-sdk+ec2-metadata-service+3.940.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/node_modules/@aws-sdk/ec2-metadata-service/dist-cjs/index.js b/node_modules/@aws-sdk/ec2-metadata-service/dist-cjs/index.js
index 348a134..4be6050 100644
--- a/node_modules/@aws-sdk/ec2-metadata-service/dist-cjs/index.js
+++ b/node_modules/@aws-sdk/ec2-metadata-service/dist-cjs/index.js
@@ -116,6 +116,10 @@ class MetadataService {
return utilStream.sdkStreamMixin(response.body).transformToString();
}
else {
+ if (response.body) {
+ // Consume body
+ utilStream.sdkStreamMixin(response.body).transformToString();
+ }
throw new Error(`Failed to fetch metadata token with status code ${response.statusCode}`);
}
}
75 changes: 69 additions & 6 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading