support new /meta/version schema for ClientVersion (#32)

endorlabs · Oct 24, 2023 · 0a71190 · 0a71190
1 parent 09959c9
commit 0a71190
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -21935,6 +21935,9 @@ const fetchLatestEndorctlVersion = (api) => __awaiter(void 0, void 0, void 0, fu
     if (!(0, utils_1.isVersionResponse)(data)) {
         throw new Error(`Invalid response from Endor Labs API: \`${body}\``);
     }
+    if (!data.ClientVersion) {
+        data.ClientVersion = data.Service.Version;
+    }
     return data;
 });
 const setupEndorctl = ({ version, checksum, api }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -21949,7 +21952,7 @@ const setupEndorctl = ({ version, checksum, api }) => __awaiter(void 0, void 0,
         if (!version) {
             core.info(`Endorctl version not provided, using latest version`);
             const data = yield fetchLatestEndorctlVersion(api);
-            endorctlVersion = data.Service.Version;
+            endorctlVersion = data.ClientVersion;
             endorctlChecksum = (0, utils_1.getEndorctlChecksum)(data.ClientChecksums, platform.os, platform.arch);
         }
         core.info(`Downloading endorctl version ${endorctlVersion}`);

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/scan.ts b/src/scan.ts
@@ -48,6 +48,10 @@ const fetchLatestEndorctlVersion = async (api: string) => {
     throw new Error(`Invalid response from Endor Labs API: \`${body}\``);
   }
 
+  if (!data.ClientVersion) {
+    data.ClientVersion = data.Service.Version;
+  }
+
   return data;
 };
 
@@ -67,7 +71,7 @@ const setupEndorctl = async ({ version, checksum, api }: SetupProps) => {
       core.info(`Endorctl version not provided, using latest version`);
 
       const data = await fetchLatestEndorctlVersion(api);
-      endorctlVersion = data.Service.Version;
+      endorctlVersion = data.ClientVersion;
       endorctlChecksum = getEndorctlChecksum(
         data.ClientChecksums,
         platform.os,

diff --git a/src/types.ts b/src/types.ts
@@ -20,6 +20,7 @@ export interface ClientChecksumsType {
 
 export interface VersionResponse {
   Service: ServiceType;
+  ClientVersion: string;
   ClientChecksums: ClientChecksumsType;
 }