v0.25.1 - Fix regression in requestResolveHeaders

CHANGELOG.md

@@ -4,6 +4,9 @@ Notable changes.
 
 ## November 2022
 
+### [0.25.1]
+- Fix regression in https://github.com/devcontainers/cli/pull/298
+
 ### [0.25.0]
 
 - `features test`: Respect image label metadata. (https://github.com/devcontainers/cli/pull/288)

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.25.0",
+	"version": "0.25.1",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},

src/spec-configuration/containerCollectionsOCIPush.ts

@@ -161,14 +161,14 @@ async function putManifestWithTags(output: Log, manifestStr: string, ociRef: OCI
 			data: Buffer.from(manifestStr),
 		};
 
-		let { statusCode, resHeaders } = await requestResolveHeaders(options);
+		let { statusCode, resHeaders } = await requestResolveHeaders(options, output);
 
 		// Retry logic: when request fails with HTTP 429: too many requests
 		if (statusCode === 429) {
 			output.write(`Failed to PUT manifest for tag ${tag} due to too many requests. Retrying...`, LogLevel.Warning);
 			await delay(2000);
 
-			let response = await requestResolveHeaders(options);
+			let response = await requestResolveHeaders(options, output);
 			statusCode = response.statusCode;
 			resHeaders = response.resHeaders;
 		}
@@ -212,7 +212,7 @@ async function putBlob(output: Log, pathToBlob: string, blobPutLocationUriPath:
 
 	output.write(`Crafted blob url:  ${url}`, LogLevel.Trace);
 
-	const { statusCode } = await requestResolveHeaders({ type: 'PUT', url, headers, data: await readLocalFile(pathToBlob) });
+	const { statusCode } = await requestResolveHeaders({ type: 'PUT', url, headers, data: await readLocalFile(pathToBlob) }, output);
 	if (statusCode !== 201) {
 		output.write(`${statusCode}: Failed to upload blob '${pathToBlob}' to '${url}'`, LogLevel.Error);
 		return false;

src/spec-utils/httpRequest.ts

@@ -91,10 +91,13 @@ export function requestResolveHeaders(options: { type: string; url: string; head
 					resBody: Buffer.concat(chunks)
 				});
 			});
-			if (options.data) {
-				req.write(options.data);
-			}
-			req.end();
 		});
+
+		if (options.data) {
+			req.write(options.data);
+		}
+
+		req.on('error', reject);
+		req.end();
 	});
 }