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

Jump to bottom

fix(custom-resources): custom resource response may silently get dropped #28826

Merged
merged 12 commits into from
Feb 26, 2024
Merged

fix(custom-resources): custom resource response may silently get dropped #28826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5ff0793
fix(custom-resources): custom resource response may silently get dropped
rix0rrr Jan 23, 2024
4318606
Snapshots
rix0rrr Jan 23, 2024
a88c0f2
More snapshots
rix0rrr Jan 25, 2024
4f366d7
Add update script
rix0rrr Jan 25, 2024
4082528
Merge remote-tracking branch 'origin/main' into huijbers/cr-response
rix0rrr Jan 26, 2024
5c464dc
Snapshots
rix0rrr Jan 26, 2024
37a260f
Merge remote-tracking branch 'origin/main' into huijbers/cr-response
rix0rrr Jan 31, 2024
0655413
Merge remote-tracking branch 'origin/main' into huijbers/cr-response
rix0rrr Feb 26, 2024
7e6d314
Update snapshots
rix0rrr Feb 26, 2024
1333ad6
Ignore things that aren't integ tests
rix0rrr Feb 26, 2024
c95adbc
Update single hash
rix0rrr Feb 26, 2024
f3461bd
Merge branch 'main' into huijbers/cr-response
mergify[bot] Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions packages/@aws-cdk/custom-resource-handlers/lib/core/nodejs-entrypoint-handler/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ async function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {
Data: event.Data,
};

external.log('submit response to cloudformation', json);
const parsedUrl = url.parse(event.ResponseURL);
const loggingSafeUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}/${parsedUrl.pathname}?***`;
external.log('submit response to cloudformation', loggingSafeUrl, json);

const responseBody = JSON.stringify(json);
const parsedUrl = url.parse(event.ResponseURL);
const req = {
hostname: parsedUrl.hostname,
path: parsedUrl.path,
Expand All @@ -128,12 +129,19 @@ async function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {
await withRetries(retryOptions, external.sendHttpRequest)(req, responseBody);
}

async function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {
return new Promise((resolve, reject) => {
async function defaultSendHttpRequest(options: https.RequestOptions, requestBody: string): Promise<void> {
return new Promise<void>((resolve, reject) => {
try {
const request = https.request(options, _ => resolve());
const request = https.request(options, (response) => {
response.resume(); // Consume the response but don't care about it
if (!response.statusCode || response.statusCode >= 400) {
reject(new Error(`Unsuccessful HTTP response: ${response.statusCode}`));
} else {
resolve();
}
});
request.on('error', reject);
request.write(responseBody);
request.write(requestBody);
request.end();
} catch (e) {
reject(e);
Expand Down
20 changes: 14 additions & 6 deletions packages/@aws-cdk/custom-resource-handlers/lib/nodejs-entrypoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ async function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {
Data: event.Data,
};

external.log('submit response to cloudformation', json);
const parsedUrl = url.parse(event.ResponseURL);
const loggingSafeUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}/${parsedUrl.pathname}?***`;
external.log('submit response to cloudformation', loggingSafeUrl, json);

const responseBody = JSON.stringify(json);
const parsedUrl = url.parse(event.ResponseURL);
const req = {
hostname: parsedUrl.hostname,
path: parsedUrl.path,
Expand All @@ -128,12 +129,19 @@ async function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {
await withRetries(retryOptions, external.sendHttpRequest)(req, responseBody);
}

async function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {
return new Promise((resolve, reject) => {
async function defaultSendHttpRequest(options: https.RequestOptions, requestBody: string): Promise<void> {
return new Promise<void>((resolve, reject) => {
try {
const request = https.request(options, _ => resolve());
const request = https.request(options, (response) => {
response.resume(); // Consume the response but don't care about it
if (!response.statusCode || response.statusCode >= 400) {
reject(new Error(`Unsuccessful HTTP response: ${response.statusCode}`));
} else {
resolve();
}
});
request.on('error', reject);
request.write(responseBody);
request.write(requestBody);
request.end();
} catch (e) {
reject(e);
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/custom-resources/lib/provider-framework/runtime/cfn-response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ export async function submitResponse(status: 'SUCCESS' | 'FAILED', event: CloudF
Data: event.Data,
};

log('submit response to cloudformation', json);

const responseBody = JSON.stringify(json);

const parsedUrl = url.parse(event.ResponseURL);
const loggingSafeUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}/${parsedUrl.pathname}?***`;
log('submit response to cloudformation', loggingSafeUrl, json);

const retryOptions = {
attempts: 5,
Expand Down
15 changes: 11 additions & 4 deletions packages/aws-cdk-lib/custom-resources/lib/provider-framework/runtime/outbound.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@ const awsSdkConfig = {
httpOptions: { timeout: FRAMEWORK_HANDLER_TIMEOUT },
};

async function defaultHttpRequest(options: https.RequestOptions, responseBody: string) {
return new Promise((resolve, reject) => {
async function defaultHttpRequest(options: https.RequestOptions, requestBody: string) {
return new Promise<void>((resolve, reject) => {
try {
const request = https.request(options, resolve);
const request = https.request(options, (response) => {
response.resume(); // Consume the response but don't care about it
if (!response.statusCode || response.statusCode >= 400) {
reject(new Error(`Unsuccessful HTTP response: ${response.statusCode}`));
} else {
resolve();
}
});
request.on('error', reject);
request.write(responseBody);
request.write(requestBody);
request.end();
} catch (e) {
reject(e);
Expand Down