PIPE-37 Small API restructuring for Worker Pipelines (#7046)

cloudflare · Oct 21, 2024 · f9d5fdb · f9d5fdb
1 parent a8ca700
commit f9d5fdb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/.changeset/violet-ducks-brush.md b/.changeset/violet-ducks-brush.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Minor change to 3rd party API shape for Workers Pipelines
diff --git a/packages/wrangler/src/__tests__/pipelines.test.ts b/packages/wrangler/src/__tests__/pipelines.test.ts
@@ -419,9 +419,9 @@ describe("pipelines", () => {
 
 			// contain http source and include auth
 			expect(requests.body?.source[1].type).toEqual("http");
-			expect(
-				(requests.body?.source[1] as HttpSource).config?.authentication
-			).toEqual(true);
+			expect((requests.body?.source[1] as HttpSource).authentication).toEqual(
+				true
+			);
 		});
 
 		it("should create a pipeline without http", async () => {
@@ -581,23 +581,21 @@ describe("pipelines", () => {
 				{
 					type: "http",
 					format: "json",
-					config: {
-						authenticated: true,
-					},
+					authenticated: true,
 				},
 			];
 			const updateReq = mockUpdateRequest(update.name, update);
 
 			await runWrangler(
-				"pipelines update my-pipeline --binding=false --http --authentication --r2 new-bucket --access-key-id new-key --secret-access-key new-secret"
+				"pipelines update my-pipeline --binding=false --http --authentication"
 			);
 
 			expect(updateReq.count).toEqual(1);
 			expect(updateReq.body?.source.length).toEqual(1);
 			expect(updateReq.body?.source[0].type).toEqual("http");
-			expect(
-				(updateReq.body?.source[0] as HttpSource).config?.authentication
-			).toEqual(true);
+			expect((updateReq.body?.source[0] as HttpSource).authentication).toEqual(
+				true
+			);
 		});
 
 		it("should fail a missing pipeline", async () => {

diff --git a/packages/wrangler/src/pipelines/client.ts b/packages/wrangler/src/pipelines/client.ts
@@ -18,9 +18,7 @@ export type HttpSource = {
 	type: "http";
 	format: string;
 	schema?: string;
-	config?: {
-		authentication: boolean;
-	};
+	authentication?: boolean;
 };
 export type BindingSource = {
 	type: "binding";

diff --git a/packages/wrangler/src/pipelines/index.ts b/packages/wrangler/src/pipelines/index.ts
@@ -256,14 +256,14 @@ export function pipelines(pipelineYargs: CommonYargsArgv) {
 
 				// add http source (possibly authenticated), default to add
 				if (args.http === undefined || args.http) {
-					pipelineConfig.source.push({
+					const source: HttpSource = {
 						type: "http",
 						format: "json",
-						config: {
-							authentication:
-								args.authentication !== undefined && args.authentication,
-						},
-					} satisfies HttpSource);
+					};
+					if (args.authentication !== undefined) {
+						source.authentication = args.authentication;
+					}
+					pipelineConfig.source.push(source);
 				}
 				if (pipelineConfig.source.length < 1) {
 					throw new UserError(
@@ -450,14 +450,12 @@ export function pipelines(pipelineYargs: CommonYargsArgv) {
 							type: "http",
 							format: "json",
 							...source,
-							config: {
-								authentication:
-									args.authentication !== undefined
-										? // if auth specified, use it
-											args.authentication
-										: // if auth not specified, use previos value or default(false)
-											source?.config?.authentication || false,
-							},
+							authentication:
+								args.authentication !== undefined
+									? // if auth specified, use it
+										args.authentication
+									: // if auth not specified, use previos value or default(false)
+										source?.authentication,
 						} satisfies HttpSource);
 					}
 				}