feat: run codegen and update build script

api/dev/Unraid.net/myservers.cfg

@@ -1,5 +1,5 @@
 [api]
-version="3.2.3+30fe90c5"
+version="3.2.3+da53f636"
 extraOrigins=""
 [local]
 [notifier]

api/dev/states/myservers.cfg

@@ -1,5 +1,5 @@
 [api]
-version="3.2.3+30fe90c5"
+version="3.2.3+da53f636"
 extraOrigins=""
 [local]
 [notifier]

api/docker-compose.yml

@@ -45,8 +45,8 @@ services:
     entrypoint: /bin/bash
     environment: 
       - IS_DOCKER=true
-      - GIT_SHA=${git rev-parse --short HEAD}
-      - IS_TAGGED=$(git describe --tags --abbrev=0 --exact-match)
+      - GIT_SHA=${GIT_SHA:?err}
+      - IS_TAGGED=${IS_TAGGED}
     profiles:
       - builder
 
@@ -54,8 +54,8 @@ services:
   builder:
     image: unraid-api:builder
     environment:
-      - GIT_SHA=${git rev-parse --short HEAD}
-      - IS_TAGGED=$(git describe --tags --abbrev=0 --exact-match)
+      - GIT_SHA=${GIT_SHA:?err}
+      - IS_TAGGED=${IS_TAGGED}
     build: 
       context: .
       target: builder

api/package.json

@@ -26,7 +26,7 @@
     "compile": "tsup --config ./tsup.config.ts",
     "bundle": "pkg . --public",
     "build": "npm run compile && npm run bundle",
-    "build:docker": "docker-compose run --rm builder",
+    "build:docker": "GIT_SHA=$(git rev-parse --short HEAD) IS_TAGGED=$(git describe --tags --abbrev=0 --exact-match || echo '') docker-compose run --rm builder",
     "build-pkg": "./scripts/build.mjs",
     "codegen": "MOTHERSHIP_GRAPHQL_LINK='https://staging.mothership.unraid.net/ws' graphql-codegen --config codegen.yml -r dotenv/config './.env.staging'",
     "codegen:watch": "DOTENV_CONFIG_PATH='./.env.staging' graphql-codegen-esm --config codegen.yml --watch -r dotenv/config",

api/scripts/get-tags.mjs

@@ -12,6 +12,7 @@ const runCommand = (command) => {
 const getTags = (env = process.env) => {
 
     if (env.GIT_SHA) {
+        console.log(`Using env vars for git tags: ${env.GIT_SHA} ${env.IS_TAGGED}`)
         return {
             shortSha: env.GIT_SHA,
             isTagged: Boolean(env.IS_TAGGED)

api/src/graphql/generated/client/graphql.ts

@@ -333,13 +333,6 @@ export enum Importance {
   WARNING = 'WARNING'
 }
 
-export enum KeyType {
-  BASIC = 'BASIC',
-  PLUS = 'PLUS',
-  PRO = 'PRO',
-  TRIAL = 'TRIAL'
-}
-
 export type KsServerDetails = {
   __typename?: 'KsServerDetails';
   accessLabel: Scalars['String']['output'];

api/src/graphql/generated/client/validators.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import { z } from 'zod'
-import { AccessUrlInput, ArrayCapacityBytesInput, ArrayCapacityInput, ClientType, ConfigErrorState, DashboardAppsInput, DashboardArrayInput, DashboardCaseInput, DashboardConfigInput, DashboardDisplayInput, DashboardInput, DashboardOsInput, DashboardServiceInput, DashboardServiceUptimeInput, DashboardTwoFactorInput, DashboardTwoFactorLocalInput, DashboardTwoFactorRemoteInput, DashboardVarsInput, DashboardVersionsInput, DashboardVmsInput, EventType, Importance, KeyType, NetworkInput, NotificationInput, NotificationStatus, PingEventSource, RegistrationState, RemoteAccessEventActionType, RemoteAccessInput, RemoteGraphQLClientInput, RemoteGraphQLEventType, RemoteGraphQLServerInput, ServerStatus, URL_TYPE, UpdateType } from '@app/graphql/generated/client/graphql'
+import { AccessUrlInput, ArrayCapacityBytesInput, ArrayCapacityInput, ClientType, ConfigErrorState, DashboardAppsInput, DashboardArrayInput, DashboardCaseInput, DashboardConfigInput, DashboardDisplayInput, DashboardInput, DashboardOsInput, DashboardServiceInput, DashboardServiceUptimeInput, DashboardTwoFactorInput, DashboardTwoFactorLocalInput, DashboardTwoFactorRemoteInput, DashboardVarsInput, DashboardVersionsInput, DashboardVmsInput, EventType, Importance, NetworkInput, NotificationInput, NotificationStatus, PingEventSource, RegistrationState, RemoteAccessEventActionType, RemoteAccessInput, RemoteGraphQLClientInput, RemoteGraphQLEventType, RemoteGraphQLServerInput, ServerStatus, URL_TYPE, UpdateType } from '@app/graphql/generated/client/graphql'
 
 type Properties<T> = Required<{
   [K in keyof T]: z.ZodType<T[K], any, T[K]>;
@@ -20,8 +20,6 @@ export const EventTypeSchema = z.nativeEnum(EventType);
 
 export const ImportanceSchema = z.nativeEnum(Importance);
 
-export const KeyTypeSchema = z.nativeEnum(KeyType);
-
 export const NotificationStatusSchema = z.nativeEnum(NotificationStatus);
 
 export const PingEventSourceSchema = z.nativeEnum(PingEventSource);