wrangler 2.7.1 → 2.8.1

package/src/__tests__/r2.test.ts

@@ -4,7 +4,7 @@ import prettyBytes from "pretty-bytes";
 import { MAX_UPLOAD_SIZE } from "../r2/constants";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { msw, mswSuccessR2handlers } from "./helpers/msw";
+import { createFetchResult, msw, mswSuccessR2handlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type { R2BucketInfo } from "../r2/helpers";
@@ -60,12 +60,8 @@ describe("r2", () => {
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.text()).toEqual("");
 							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: {
+								context.json(
+									createFetchResult({
 										buckets: [
 											{
 												name: "bucket-1-local-once",
@@ -76,8 +72,8 @@ describe("r2", () => {
 												creation_date: "01-01-2001",
 											},
 										],
-									},
-								})
+									})
+								)
 							);
 						}
 					)
@@ -155,15 +151,7 @@ describe("r2", () => {
 							const { accountId } = request.params;
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.json()).toEqual({ name: "testBucket" });
-							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: {},
-								})
-							);
+							return response.once(context.json(createFetchResult({})));
 						}
 					)
 				);
@@ -245,15 +233,7 @@ describe("r2", () => {
 								"Bearer some-api-token"
 							);
 
-							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: null,
-								})
-							);
+							return response.once(context.json(createFetchResult(null)));
 						}
 					)
 				);
@@ -333,17 +313,13 @@ describe("r2", () => {
 					}
 				`);
 						return response.once(
-							context.status(200),
-							context.json({
-								success: true,
-								errors: [],
-								messages: [],
-								result: {
+							context.json(
+								createFetchResult({
 									accountId: "some-account-id",
 									bucketName: "bucketName-object-test",
 									objectName: "wormhole-img.png",
-								},
-							})
+								})
+							)
 						);
 					}
 				)

package/src/__tests__/secret.test.ts

@@ -6,7 +6,7 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm, mockPrompt, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
-
+import { mockGetMembershipsFail } from "./helpers/mock-oauth-flow";
 import { useMockStdin } from "./helpers/mock-stdin";
 import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
@@ -21,14 +21,6 @@ function createFetchResult(result: unknown, success = true) {
 	};
 }
 
-export function mockGetMembershipsFail() {
-	msw.use(
-		rest.get("*/memberships", (req, res, ctx) => {
-			return res.once(ctx.json(createFetchResult([], false)));
-		})
-	);
-}
-
 export function mockGetMemberships(
 	accounts: { id: string; account: { id: string; name: string } }[]
 ) {

package/src/__tests__/tail.test.ts

@@ -5,7 +5,7 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
-import { msw, mswSucessScriptHandlers } from "./helpers/msw";
+import { createFetchResult, msw, mswSucessScriptHandlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type {
@@ -13,6 +13,7 @@ import type {
 	RequestEvent,
 	ScheduledEvent,
 	AlarmEvent,
+	EmailEvent,
 } from "../tail/createTail";
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
@@ -404,6 +405,18 @@ describe("tail", () => {
 			expect(std.out).toMatch(deserializeToJson(serializedMessage));
 		});
 
+		it("logs email messages in json format", async () => {
+			const api = mockWebsocketAPIs();
+			await runWrangler("tail test-worker --format json");
+
+			const event = generateMockEmailEvent();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(std.out).toMatch(deserializeToJson(serializedMessage));
+		});
+
 		it("logs request messages in pretty format", async () => {
 			const api = mockWebsocketAPIs();
 			await runWrangler("tail test-worker --format pretty");
@@ -473,6 +486,29 @@ describe("tail", () => {
 		      `);
 		});
 
+		it("logs email messages in pretty format", async () => {
+			const api = mockWebsocketAPIs();
+			await runWrangler("tail test-worker --format pretty");
+
+			const event = generateMockEmailEvent();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(
+				std.out
+					.replace(
+						new Date(mockEventTimestamp).toLocaleString(),
+						"[mock event timestamp]"
+					)
+					.replace(mockTailExpiration.toISOString(), "[mock expiration date]")
+			).toMatchInlineSnapshot(`
+			        "Successfully created tail, expires at [mock expiration date]
+			        Connected to test-worker, waiting for logs...
+			        Email from:${mockEmailEventFrom} to:${mockEmailEventTo} size:${mockEmailEventSize} @ [mock event timestamp] - Ok"
+		      `);
+		});
+
 		it("should not crash when the tail message has a void event", async () => {
 			const api = mockWebsocketAPIs();
 			await runWrangler("tail test-worker --format pretty");
@@ -634,7 +670,13 @@ function serialize(message: TailEventMessage): WebSocket.RawData {
  * @returns true if `event` is a RequestEvent
  */
 function isRequest(
-	event: ScheduledEvent | RequestEvent | AlarmEvent | undefined | null
+	event:
+		| ScheduledEvent
+		| RequestEvent
+		| AlarmEvent
+		| EmailEvent
+		| undefined
+		| null
 ): event is RequestEvent {
 	return Boolean(event && "request" in event);
 }
@@ -701,17 +743,13 @@ function mockCreateTailRequest(
 					expect(req.params.envName).toEqual(env);
 				}
 				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: {
+					ctx.json(
+						createFetchResult({
 							url: websocketURL,
 							id: "tail-id",
 							expires_at: mockTailExpiration,
-						},
-					})
+						})
+					)
 				);
 			}
 		)
@@ -735,6 +773,21 @@ const mockEventTimestamp = 1645454470467;
  */
 const mockEventScheduledTime = new Date(mockEventTimestamp).toISOString();
 
+/**
+ * Default value for email event from
+ */
+const mockEmailEventFrom = "from@example.com";
+
+/**
+ * Default value for email event to
+ */
+const mockEmailEventTo = "to@example.com";
+
+/**
+ * Default value for email event mail size
+ */
+const mockEmailEventSize = 45416;
+
 /**
  * Mock out the API hit during Tail deletion
  *
@@ -761,15 +814,7 @@ function mockDeleteTailRequest(
 					}
 				}
 				expect(req.params.tailId).toEqual("tail-id");
-				return res(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: null,
-					})
-				);
+				return res(ctx.json(createFetchResult(null)));
 			}
 		)
 	);
@@ -903,3 +948,11 @@ function generateMockAlarmEvent(opts?: Partial<AlarmEvent>): AlarmEvent {
 		scheduledTime: opts?.scheduledTime || mockEventScheduledTime,
 	};
 }
+
+function generateMockEmailEvent(opts?: Partial<EmailEvent>): EmailEvent {
+	return {
+		mailFrom: opts?.mailFrom || mockEmailEventFrom,
+		rcptTo: opts?.rcptTo || mockEmailEventTo,
+		rawSize: opts?.rawSize || mockEmailEventSize,
+	};
+}