Skip to content

Commit b2d23c1

Browse files
committed
chore: patch SDK component and remove process.exit
1 parent 2a6f8d3 commit b2d23c1

File tree

6 files changed

+93
-16
lines changed

6 files changed

+93
-16
lines changed

.projen/deps.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ const repoProject = new yarn.Monorepo({
212212
defaultReleaseBranch: 'main',
213213
typescriptVersion: TYPESCRIPT_VERSION,
214214
devDeps: [
215+
'patch-package',
215216
'cdklabs-projen-project-types',
216217
'glob',
217218
'semver',
@@ -287,6 +288,7 @@ const repoProject = new yarn.Monorepo({
287288
],
288289
},
289290
});
291+
repoProject.package.setScript('postinstall', 'patch-package');
290292

291293
new AdcPublishing(repoProject);
292294
new RecordPublishingTimestamp(repoProject);

package.json

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/aws-cdk/lib/cli/cli.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -734,15 +734,6 @@ export function cli(args: string[] = process.argv.slice(2)) {
734734
} catch (e: any) {
735735
await CliIoHost.get()?.asIoHelper().defaults.trace(`Ending Telemetry failed: ${e.message}`);
736736
}
737-
/*
738-
* The SDK may leave open handles in some environments. One case we have seen is
739-
* MetadataService leaving an open socket in GitHub Actions. To ensure that
740-
* the CLI exits in all environments, we explicitly call process.exit() after
741-
* ending telemetry.
742-
*
743-
* See https://github.com/aws/aws-sdk-js-v3/issues/7538.
744-
*/
745-
process.exit();
746737
});
747738
}
748739
/* c8 ignore stop */
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
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
2+
index 348a134..4be6050 100644
3+
--- a/node_modules/@aws-sdk/ec2-metadata-service/dist-cjs/index.js
4+
+++ b/node_modules/@aws-sdk/ec2-metadata-service/dist-cjs/index.js
5+
@@ -116,6 +116,10 @@ class MetadataService {
6+
return utilStream.sdkStreamMixin(response.body).transformToString();
7+
}
8+
else {
9+
+ if (response.body) {
10+
+ // Consume body
11+
+ utilStream.sdkStreamMixin(response.body).transformToString();
12+
+ }
13+
throw new Error(`Failed to fetch metadata token with status code ${response.statusCode}`);
14+
}
15+
}

yarn.lock

Lines changed: 69 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)