CC-6280: Correctly handle image names that contain a slash (#11007)

* CC-6280: Correctly handle image names that contain a slash

* Fix formatting

Author: gpanders

.changeset/five-worms-cut.md

@@ -0,0 +1,5 @@
+---
+"@cloudflare/containers-shared": patch
+---
+
+Correctly handle image names that contain a slash

packages/containers-shared/src/images.ts

@@ -132,21 +132,31 @@ export async function prepareContainerImagesForDev(args: {
  * anyother-registry.com/anything -> no change
  */
 export function resolveImageName(accountId: string, image: string): string {
-	let url: URL;
+	let url: URL | undefined;
 	try {
 		url = new URL(`http://${image}`);
 	} catch {
-		// not a valid url so assume it is in the format image:tag and pre-pend the registry
+		// Invalid URL
+	}
+
+	if (
+		url === undefined ||
+		(!url.host.match(/[:.]/) && url.hostname !== "localhost")
+	) {
+		// Not a valid URL so assume it is in the format image:tag and prepend the registry
 		return getCloudflareRegistryWithAccountNamespace(accountId, image);
 	}
-	// hostname not the managed registry, passthrough
+
 	if (url.hostname !== getCloudflareContainerRegistry()) {
+		// hostname not the managed registry, passthrough
 		return image;
 	}
-	// is managed registry and has the account id, passthrough
+
 	if (url.pathname.startsWith(`/${accountId}`)) {
+		// is managed registry and has the account id, passthrough
 		return image;
 	}
+
 	// check if already looks like it has an account id (32 char hex string)
 	const accountIdPattern = /^\/([a-f0-9]{32})\//;
 	const match = accountIdPattern.exec(url.pathname);

packages/wrangler/src/__tests__/containers/push.test.ts

@@ -100,6 +100,21 @@ describe("containers push", () => {
 		]);
 	});
 
+	it("should tag image with the correct uri if given an <namespace>/<image>:<tag> argument", async () => {
+		await runWrangler("containers push test-namespace/app:tag");
+
+		expect(runDockerCmd).toHaveBeenCalledTimes(2);
+		expect(runDockerCmd).toHaveBeenNthCalledWith(1, "docker", [
+			"tag",
+			`test-namespace/app:tag`,
+			`${getCloudflareContainerRegistry()}/some-account-id/test-namespace/app:tag`,
+		]);
+		expect(runDockerCmd).toHaveBeenNthCalledWith(2, "docker", [
+			"push",
+			`${getCloudflareContainerRegistry()}/some-account-id/test-namespace/app:tag`,
+		]);
+	});
+
 	it("should tag image with the correct uri if given an registry.cloudflare.com/<image>:<tag> argument", async () => {
 		setIsTTY(false);
 		setWranglerConfig({});