wrangler 0.0.0-e33294b0 → 0.0.0-e351afcf

package/src/__tests__/constellation.test.ts

@@ -0,0 +1,371 @@
+import * as fs from "node:fs";
+import { rest } from "msw";
+import { endEventLoop } from "./helpers/end-event-loop";
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { clearDialogs, mockConfirm } from "./helpers/mock-dialogs";
+import { useMockIsTTY } from "./helpers/mock-istty";
+import { createFetchResult, msw } from "./helpers/msw";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("constellation help", () => {
+	const std = mockConsoleMethods();
+	runInTempDir();
+
+	it("should show help when no argument is passed", async () => {
+		await runWrangler("constellation");
+		await endEventLoop();
+
+		expect(std.out).toMatchInlineSnapshot(`
+		"wrangler constellation
+
+		🤖 Interact with Constellation AI models
+
+		Commands:
+		  wrangler constellation project  Manage your projects
+		  wrangler constellation model    Manage your models
+		  wrangler constellation catalog  Check the curated model catalog
+		  wrangler constellation runtime  Check the suported runtimes
+
+		Flags:
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]"
+	`);
+	});
+
+	it("should show help when an invalid argument is passed", async () => {
+		await expect(() => runWrangler("constellation asdf")).rejects.toThrow(
+			"Unknown argument: asdf"
+		);
+
+		expect(std.err).toMatchInlineSnapshot(`
+		"X [ERROR] Unknown argument: asdf
+
+		"
+	`);
+		expect(std.out).toMatchInlineSnapshot(`
+		"
+		wrangler constellation
+
+		🤖 Interact with Constellation AI models
+
+		Commands:
+		  wrangler constellation project  Manage your projects
+		  wrangler constellation model    Manage your models
+		  wrangler constellation catalog  Check the curated model catalog
+		  wrangler constellation runtime  Check the suported runtimes
+
+		Flags:
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]"
+	`);
+	});
+});
+
+describe("constellation commands", () => {
+	mockAccountId();
+	mockApiToken();
+	runInTempDir();
+	const { setIsTTY } = useMockIsTTY();
+
+	const std = mockConsoleMethods();
+
+	beforeEach(() => {
+		// @ts-expect-error we're using a very simple setTimeout mock here
+		jest.spyOn(global, "setTimeout").mockImplementation((fn, _period) => {
+			setImmediate(fn);
+		});
+		setIsTTY(true);
+	});
+
+	afterEach(() => {
+		clearDialogs();
+	});
+
+	it("should handle project creation", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation project create new_project ONNX");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		✅ Successfully created Project \\"new_project3\\"!"
+	`);
+	});
+
+	it("should handle project listing", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation project list");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌──────────────────────────────────────┬──────────────┬─────────┬─────────────────────────────┐
+		│ id                                   │ name         │ runtime │ created_at                  │
+		├──────────────────────────────────────┼──────────────┼─────────┼─────────────────────────────┤
+		│ 4806cdcf-9aa7-4fa2-b6a1-77fe9e196680 │ new_project3 │ ONNX    │ 2023-04-28T13:25:58.513105Z │
+		└──────────────────────────────────────┴──────────────┴─────────┴─────────────────────────────┘"
+	`);
+	});
+
+	it("should handle project deletion", async () => {
+		mockConstellationRequest();
+		mockConfirm({
+			text: "Ok to proceed?",
+			result: true,
+		});
+
+		await runWrangler("constellation project delete new_project3");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		About to delete Project 'new_project3' (4806cdcf-9aa7-4fa2-b6a1-77fe9e196680).
+		Deleting...
+		Deleted 'new_project3' successfully."
+	`);
+	});
+
+	it("should handle catalog list", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation catalog list");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌──────────────────────────────────────┬──────────────────────┬─────────────────┬───────────────┐
+		│ project_id                           │ project_name         │ project_runtime │ models        │
+		├──────────────────────────────────────┼──────────────────────┼─────────────────┼───────────────┤
+		│ b162a29d-0a6d-4155-bedf-54a01fc8d0ef │ image-classification │ ONNX            │ squeezenet1_1 │
+		└──────────────────────────────────────┴──────────────────────┴─────────────────┴───────────────┘"
+	`);
+	});
+
+	it("should handle runtime list", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation runtime list");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌─────────┐
+		│ name    │
+		├─────────┤
+		│ ONNX    │
+		├─────────┤
+		│ XGBoost │
+		└─────────┘"
+	`);
+	});
+
+	it("should handle model upload", async () => {
+		mockConstellationRequest();
+		await fs.promises.writeFile("model.onnx", `model`);
+		await runWrangler(
+			"constellation model upload new_project3 model2 model.onnx"
+		);
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		✅ Successfully uploaded Model \\"model2\\"!"
+	`);
+	});
+
+	it("should handle model list", async () => {
+		mockConstellationRequest();
+		await runWrangler("constellation model list new_project3");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		┌──────────────────────────────────────┬──────────────────────────────────────┬────────┬─────────────┬─────────────────────────────┐
+		│ id                                   │ project_id                           │ name   │ description │ created_at                  │
+		├──────────────────────────────────────┼──────────────────────────────────────┼────────┼─────────────┼─────────────────────────────┤
+		│ 450bb086-3c09-4991-a0cc-eed48c504ae0 │ 9d478427-dea6-4988-9b16-f6f8888d974c │ model1 │             │ 2023-04-28T11:15:14.806217Z │
+		├──────────────────────────────────────┼──────────────────────────────────────┼────────┼─────────────┼─────────────────────────────┤
+		│ 2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02 │ 9d478427-dea6-4988-9b16-f6f8888d974c │ model2 │             │ 2023-04-28T13:50:37.494090Z │
+		└──────────────────────────────────────┴──────────────────────────────────────┴────────┴─────────────┴─────────────────────────────┘"
+	`);
+	});
+
+	it("should handle model deletion", async () => {
+		mockConstellationRequest();
+		mockConfirm({
+			text: "Ok to proceed?",
+			result: true,
+		});
+
+		await runWrangler("constellation model delete new_project3 model2");
+		expect(std.out).toMatchInlineSnapshot(`
+		"--------------------
+		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------
+
+		About to delete Model 'model2' (2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02).
+		Deleting...
+		Deleted 'model2' successfully."
+	`);
+	});
+});
+
+/** Create a mock handler for Constellation API */
+function mockConstellationRequest() {
+	msw.use(
+		rest.get("*/accounts/:accountId/constellation/project", (req, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult(
+						[
+							{
+								id: "4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+								name: "new_project3",
+								runtime: "ONNX",
+								created_at: "2023-04-28T13:25:58.513105Z",
+							},
+						],
+						true
+					)
+				)
+			);
+		}),
+		rest.post(
+			"*/accounts/:accountId/constellation/project",
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(
+							{
+								id: "4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+								name: "new_project3",
+								runtime: "ONNX",
+								created_at: "2023-04-28T13:25:58.513105Z",
+							},
+							true
+						)
+					)
+				);
+			}
+		),
+		rest.delete(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+			(req, res, ctx) => {
+				return res.once(ctx.json(createFetchResult(null, true)));
+			}
+		),
+		rest.get("*/accounts/:accountId/constellation/catalog", (req, res, ctx) => {
+			return res.once(
+				ctx.json(
+					createFetchResult(
+						[
+							{
+								project: {
+									id: "b162a29d-0a6d-4155-bedf-54a01fc8d0ef",
+									name: "image-classification",
+									runtime: "ONNX",
+									created_at: "2023-04-27T18:55:38.417187Z",
+								},
+								models: [
+									{
+										id: "edb202d3-f4ac-43ab-8762-3ae6b43c4c57",
+										project_id: "b162a29d-0a6d-4155-bedf-54a01fc8d0ef",
+										name: "squeezenet1_1",
+										description: null,
+										created_at: "2023-04-27T18:56:15.305087Z",
+									},
+								],
+							},
+						],
+						true
+					)
+				)
+			);
+		}),
+		rest.get("*/accounts/:accountId/constellation/runtime", (req, res, ctx) => {
+			return res.once(ctx.json(createFetchResult(["ONNX", "XGBoost"], true)));
+		}),
+		rest.post(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680/model",
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(
+							{
+								id: "2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02",
+								project_id: "4806cdcf-9aa7-4fa2-b6a1-77fe9e196680",
+								name: "model2",
+								description: null,
+								created_at: "2023-04-28T13:50:37.494090Z",
+							},
+							true
+						)
+					)
+				);
+			}
+		),
+		rest.get(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680/model",
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(
+							[
+								{
+									id: "450bb086-3c09-4991-a0cc-eed48c504ae0",
+									project_id: "9d478427-dea6-4988-9b16-f6f8888d974c",
+									name: "model1",
+									description: null,
+									created_at: "2023-04-28T11:15:14.806217Z",
+								},
+								{
+									id: "2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02",
+									project_id: "9d478427-dea6-4988-9b16-f6f8888d974c",
+									name: "model2",
+									description: null,
+									created_at: "2023-04-28T13:50:37.494090Z",
+								},
+							],
+							true
+						)
+					)
+				);
+			}
+		),
+		rest.delete(
+			"*/accounts/:accountId/constellation/project/4806cdcf-9aa7-4fa2-b6a1-77fe9e196680/model/2dd35b4e-0c7a-4c7a-a9e2-e33c0e17bc02",
+			(req, res, ctx) => {
+				return res.once(ctx.json(createFetchResult(null, true)));
+			}
+		)
+	);
+}

package/src/__tests__/d1/execute.test.ts

@@ -1,9 +1,11 @@
+import { mockConsoleMethods } from "../helpers/mock-console";
 import { useMockIsTTY } from "../helpers/mock-istty";
 import { runInTempDir } from "../helpers/run-in-tmp";
 import { runWrangler } from "../helpers/run-wrangler";
 import writeWranglerToml from "../helpers/write-wrangler-toml";
 
 describe("execute", () => {
+	mockConsoleMethods();
 	runInTempDir();
 	const { setIsTTY } = useMockIsTTY();
 
@@ -18,7 +20,7 @@ describe("execute", () => {
 		await expect(
 			runWrangler("d1 execute --command 'select 1;'")
 		).rejects.toThrowError(
-			`In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.`
+			`In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.`
 		);
 	});
 

package/src/__tests__/d1/migrate.test.ts

@@ -1,13 +1,22 @@
 import { cwd } from "process";
+import { rest } from "msw";
 import { reinitialiseAuthTokens } from "../../user";
 import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
+import { mockConsoleMethods } from "../helpers/mock-console";
+import { mockConfirm } from "../helpers/mock-dialogs";
 import { useMockIsTTY } from "../helpers/mock-istty";
+import { mockGetMemberships, mockOAuthFlow } from "../helpers/mock-oauth-flow";
+import { mockSetTimeout } from "../helpers/mock-set-timeout";
+import { msw } from "../helpers/msw";
 import { runInTempDir } from "../helpers/run-in-tmp";
 import { runWrangler } from "../helpers/run-wrangler";
 import writeWranglerToml from "../helpers/write-wrangler-toml";
 
 describe("migrate", () => {
 	runInTempDir();
+	mockConsoleMethods();
+	mockSetTimeout();
+
 	const { setIsTTY } = useMockIsTTY();
 
 	describe("create", () => {
@@ -26,6 +35,9 @@ describe("migrate", () => {
 	});
 
 	describe("apply", () => {
+		mockAccountId({ accountId: null });
+		mockApiToken();
+		const { mockOAuthServerCallback } = mockOAuthFlow();
 		it("should not attempt to login in local mode", async () => {
 			setIsTTY(false);
 			writeWranglerToml({
@@ -75,6 +87,96 @@ describe("migrate", () => {
 				runWrangler("d1 migrations apply --local db --preview")
 			).rejects.toThrowError(`Error: can't use --preview with --local`);
 		});
+
+		it("multiple accounts: should throw when trying to apply migrations without an account_id in config", async () => {
+			setIsTTY(false);
+
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "/tmp/my-migrations-go-here",
+					},
+				],
+			});
+			mockOAuthServerCallback();
+			mockGetMemberships([
+				{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+				{ id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+			]);
+			mockConfirm({
+				text: `No migrations folder found.
+Ok to create /tmp/my-migrations-go-here?`,
+				result: true,
+			});
+			await runWrangler("d1 migrations create db test");
+			mockConfirm({
+				text: `About to apply 1 migration(s)
+Your database may not be available to serve requests during the migration, continue?`,
+				result: true,
+			});
+			await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
+				`More than one account available but unable to select one in non-interactive mode.`
+			);
+		});
+		it("multiple accounts: should let the user apply migrations with an account_id in config", async () => {
+			setIsTTY(false);
+			msw.use(
+				rest.post(
+					"*/accounts/:accountId/d1/database/:databaseId/query",
+					async (req, res, ctx) => {
+						return res(
+							ctx.status(200),
+							ctx.json({
+								result: [
+									{
+										results: [],
+										success: true,
+										meta: {},
+									},
+								],
+								success: true,
+								errors: [],
+								messages: [],
+							})
+						);
+					}
+				)
+			);
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "/tmp/my-migrations-go-here",
+					},
+				],
+				account_id: "nx01",
+			});
+			mockOAuthServerCallback();
+			mockGetMemberships([
+				{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+				{ id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+			]);
+			mockConfirm({
+				text: `No migrations folder found.
+Ok to create /tmp/my-migrations-go-here?`,
+				result: true,
+			});
+			await runWrangler("d1 migrations create db test");
+			mockConfirm({
+				text: `About to apply 1 migration(s)
+Your database may not be available to serve requests during the migration, continue?`,
+				result: true,
+			});
+			//if we get to this point, wrangler knows the account_id
+			await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
+				`request to https://api.cloudflare.com/client/v4/accounts/nx01/d1/database/xxxx/backup failed`
+			);
+		});
 	});
 
 	describe("list", () => {

package/src/__tests__/delete.test.ts

@@ -31,6 +31,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "Successfully deleted my-script",
 		  "warn": "",
 		}
@@ -51,6 +52,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "Successfully deleted test-name",
 		  "warn": "",
 		}
@@ -64,6 +66,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "--dry-run: exiting now.",
 		  "warn": "",
 		}
@@ -82,6 +85,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "",
 		  "warn": "",
 		}
@@ -126,6 +130,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
 		Successfully deleted my-script",
 		  "warn": "",
@@ -202,6 +207,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
 		🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets_preview\\"
 		Successfully deleted my-script",