fix version piping to txz url

pujitm · pujitm · commit ef15fd2ad83e · 2025-06-30T15:18:10.000-04:00
diff --git a/plugin/builder/build-plugin.ts b/plugin/builder/build-plugin.ts
@@ -2,7 +2,13 @@ import { readFile, writeFile, mkdir, rename } from "fs/promises";
 import { $ } from "zx";
 import { escape as escapeHtml } from "html-sloppy-escaper";
 import { dirname, join } from "node:path";
-import { getTxzName, pluginName, startingDir, defaultArch, defaultBuild } from "./utils/consts";
+import {
+  getTxzName,
+  pluginName,
+  startingDir,
+  defaultArch,
+  defaultBuild,
+} from "./utils/consts";
 import { getPluginUrl } from "./utils/bucket-urls";
 import { getMainTxzUrl } from "./utils/bucket-urls";
 import {
@@ -25,10 +31,17 @@ const checkGit = async () => {
   }
 };
 
-const moveTxzFile = async ({txzPath, apiVersion, buildNumber}: Pick<PluginEnv, "txzPath" | "apiVersion" | "buildNumber">) => {
-  const txzName = getTxzName({version: apiVersion, build: buildNumber.toString()});
+const moveTxzFile = async ({
+  txzPath,
+  apiVersion,
+  buildNumber,
+}: Pick<PluginEnv, "txzPath" | "apiVersion" | "buildNumber">) => {
+  const txzName = getTxzName({
+    version: apiVersion,
+    build: buildNumber.toString(),
+  });
   const targetPath = join(deployDir, txzName);
-  
+
   // Ensure the txz always has the full version name
   if (txzPath !== targetPath) {
     console.log(`Ensuring TXZ has correct name: ${txzPath} -> ${targetPath}`);
@@ -61,7 +74,7 @@ const buildPlugin = async ({
   apiVersion,
 }: PluginEnv) => {
   console.log(`API version: ${apiVersion}`);
-  
+
   // Update plg file
   let plgContent = await readFile(getRootPluginPath({ startingDir }), "utf8");
 
@@ -71,11 +84,19 @@ const buildPlugin = async ({
     version: pluginVersion,
     api_version: apiVersion,
     arch: defaultArch,
-    build: defaultBuild,
+    build: buildNumber.toString(),
     plugin_url: getPluginUrl({ baseUrl, tag }),
-    txz_url: getMainTxzUrl({ baseUrl, apiVersion, tag, build: buildNumber.toString() }),
+    txz_url: getMainTxzUrl({
+      baseUrl,
+      tag,
+      version: apiVersion,
+      build: buildNumber.toString(),
+    }),
     txz_sha256: txzSha256,
-    txz_name: getTxzName({version: apiVersion, build: buildNumber.toString()}),
+    txz_name: getTxzName({
+      version: apiVersion,
+      build: buildNumber.toString(),
+    }),
     ...(tag ? { tag } : {}),
   };
 
diff --git a/plugin/builder/utils/bucket-urls.ts b/plugin/builder/utils/bucket-urls.ts
@@ -13,9 +13,7 @@ interface UrlParams {
   tag?: string;
 }
 
-interface TxzUrlParams extends UrlParams, TxzNameParams {
-  apiVersion: string;
-}
+interface TxzUrlParams extends UrlParams, TxzNameParams {}
 
 /**
  * Get the bucket path for the given tag

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ interface UrlParams {`
`13`	`13`	`tag?: string;`
`14`	`14`	`}`
`15`	`15`
`16`		`-interface TxzUrlParams extends UrlParams, TxzNameParams {`
`17`		`- apiVersion: string;`
`18`		`-}`
	`16`	`+interface TxzUrlParams extends UrlParams, TxzNameParams {}`
`19`	`17`
`20`	`18`	`/**`
`21`	`19`	`* Get the bucket path for the given tag`