Merge pull request #79 from eshtek/feature/app-scripts-v3

Implements App Scripts V3 and Updates Analysis

Author: jerodfritz

eshtek/apps-schema.ts

@@ -89,7 +89,9 @@ export interface AppInfo extends AppBasics {
     status: AppState;
     url_webui: string;
     upgradeAvailable: boolean;
+    updatedScriptAvailable: boolean;
     latestVersion: string;
+    recommended: boolean;
 }
 export interface AppInfoDetailed extends AppInfo {
     data: number[][];
@@ -165,7 +167,22 @@ interface AppsInstallScriptV2 {
     app_values: Record<string, ChartFormValue>;
 }
 
-export type AppsInstallScript = AppsInstallScriptV1 | AppsInstallScriptV2;
+interface AppsInstallScriptV3 extends Omit<AppsInstallScriptV2, 'version' | 'requirements'> {
+    version: 3;
+    script: {
+        version: string;
+        updateCompatibility?: string;
+        changeLog?: string;
+    };
+    requirements: AppRequirements;  // Required in V3
+}
+
+export type AppsInstallScript = AppsInstallScriptV1 | AppsInstallScriptV2 | AppsInstallScriptV3;
+
+export interface AppConfiguration {
+    installScript?: AppsInstallScript | null;
+    questionResponses?: Record<string, string | number | boolean>;
+}
 
 export interface InstallScriptCuration {
     name: string;

eshtek/apps.ts

@@ -29,12 +29,22 @@ export enum GlobalErrorCode {
     PROCESS_INSTALL_SCRIPT_INVALID_MEMORY_VALUE = 'PROCESS_INSTALL_SCRIPT_INVALID_MEMORY_VALUE',
     PROCESS_INSTALL_SCRIPT_MISSING_QUESTION_RESPONSE = 'PROCESS_INSTALL_SCRIPT_MISSING_QUESTION_RESPONSE',
     PROCESS_INSTALL_SCRIPT_INVALID_QUESTION_RESPONSE_TYPE = 'PROCESS_INSTALL_SCRIPT_INVALID_QUESTION_RESPONSE_TYPE',
+    PROCESS_INSTALL_SCRIPT_MISSING_SCRIPT_METADATA = 'PROCESS_INSTALL_SCRIPT_MISSING_SCRIPT_METADATA',
+    PROCESS_INSTALL_SCRIPT_MISSING_REQUIREMENTS = 'PROCESS_INSTALL_SCRIPT_MISSING_REQUIREMENTS',
+    PROCESS_INSTALL_SCRIPT_INVALID_SCRIPT_VERSION = 'PROCESS_INSTALL_SCRIPT_INVALID_SCRIPT_VERSION',
+    PROCESS_INSTALL_SCRIPT_INVALID_IF_CONDITION = 'PROCESS_INSTALL_SCRIPT_INVALID_IF_CONDITION',
     RUN_INSTALL_SCRIPT_UNSUPPORTED_VERSION = 'RUN_INSTALL_SCRIPT_UNSUPPORTED_VERSION',
     DDP_CLIENT_DISCONNECTED = 'DDP_CLIENT_DISCONNECTED',
     TASK_FAILED_STALE = "TASK_FAILED_STALE",
+    UPDATE_APP_NOT_FOUND = 'UPDATE_APP_NOT_FOUND',
+    UPDATE_APP_NOT_IN_CATALOG = 'UPDATE_APP_NOT_IN_CATALOG',
+    UPDATE_APP_INVALID_SCRIPT = 'UPDATE_APP_INVALID_SCRIPT',
+    UPDATE_APP_INVALID_CATALOG_SCRIPT = 'UPDATE_APP_INVALID_CATALOG_SCRIPT',
+    UPDATE_APP_ANALYSIS_FAILED = 'UPDATE_APP_ANALYSIS_FAILED',
+    UPDATE_APP_FAILED = 'UPDATE_APP_FAILED',
+    UPDATE_APP_NO_CURRENT_CONFIG = 'UPDATE_APP_NO_CURRENT_CONFIG',
     DOMAIN_NOT_FOUND = 'DOMAIN_NOT_FOUND',
     ACME_ACCOUNT_EMAIL_REQUIRED = 'ACME_ACCOUNT_EMAIL_REQUIRED',
     ACME_CHALLENGE_FAILED = 'ACME_CHALLENGE_FAILED',
     ACME_CERTIFICATE_GENERATION_FAILED = 'ACME_CERTIFICATE_GENERATION_FAILED',
-
 }

eshtek/errors.ts

@@ -1,4 +1,5 @@
 import { GlobalErrorCode } from './errors';
+import type { AppConfiguration } from './apps';
 import type { LocationPreferenceId } from './preferences';
 import type { ServerPool, ServerPoolNew, ServerUser, ServerUserType } from './server';
 import type { VMBasics, VMSettings } from './vms';
@@ -115,11 +116,62 @@ export interface RequestDockerUpdatePool {
     poolName: string;
 }
 
-export interface RequestAppInstall {
+export interface RequestAppInstall extends AppConfiguration {
     id: string;
     train?: 'community' | 'stable';
-    installScript?: string;
-    questionResponses?: Record<string, string | number | boolean>;
+}
+
+export interface RequestAppUpdate extends AppConfiguration {}
+export interface RequestAppUpdateAnalysis extends AppConfiguration {}
+
+
+export enum ResourceChangeType {
+    STORAGE = 'storage',
+    NETWORK = 'network',
+    ENVIRONMENT = 'environment',
+    RESOURCE = 'resource',
+    PERMISSION = 'permission',
+    CONFIG = 'config'
+}
+
+export enum ResourceChangeAction {
+    CREATE = 'create',
+    UPDATE = 'update',
+    DELETE = 'delete',
+    NO_OP = 'no-op',
+    PRESERVE = 'preserve'
+}
+
+export interface ResponseResourceChanges {
+    resourceChanges: Array<{
+        address: string;
+        type: ResourceChangeType;
+        change: {
+            actions: Array<ResourceChangeAction>;
+            before: any;
+            after: any;
+        };
+    }>;
+    planSummary: {
+        totalChanges: number;
+        changesByAction: {
+            create: number;
+            update: number;
+            delete: number;
+            noOp: number;
+            preserve: number;
+        };
+    };
+    validation: {
+        updateCompatible: boolean;
+        compatibilityConstraint?: string;
+        warnings: string[];
+    };
+    versionInfo: {
+        current?: string;
+        target?: string;
+        changelog?: string;
+    };
 }
 
 export interface RequestAppDelete {

eshtek/routes.ts

@@ -27,6 +27,8 @@ import {
 } from "./server";
 
 import { vMSHealthSchema } from "./vms-schema";
+const appsHealthSchema = z.any();
+
 
 export const serverUserTypeSchema = z.nativeEnum(ServerUserType);
 
@@ -135,6 +137,12 @@ export const serverSystemDataSystemDeviceDataSchema = z.object({
   networking: z.array(serverSystemDataSystemDeviceSchema).optional(),
 });
 
+export const serverSystemDataApplicationsSchema =
+  serverStatusBasicsSchema.extend({
+    type: z.literal(ServerStatusType.APPLICATIONS),
+    health: appsHealthSchema,
+  });
+
 export const serverSystemDataVirtualizationSchema =
   serverStatusBasicsSchema.extend({
     type: z.literal(ServerStatusType.VIRTUALIZATION),
@@ -220,8 +228,6 @@ const fileTypeSchema = z.any();
 
 const topologyItemStatusSchema = z.any();
 
-const appsHealthSchema = z.any();
-
 const networkInterfaceTypeSchema = z.any();
 
 export const serverPoolBasicsSchema = z.object({
@@ -316,12 +322,6 @@ export const serverSystemDataStorageSchema = serverStatusBasicsSchema.extend({
   }),
 });
 
-export const serverSystemDataApplicationsSchema =
-  serverStatusBasicsSchema.extend({
-    type: z.literal(ServerStatusType.APPLICATIONS),
-    health: appsHealthSchema,
-  });
-
 export const serverSystemDataSchema = z.union([
   serverSystemDataSystemSchema,
   serverSystemDataStorageSchema,