@highstate/backend 0.6.1 → 0.7.0

package/dist/index.d.ts

@@ -56,9 +56,9 @@ declare class LocalPulumiHost {
     private lock;
     private constructor();
     getCurrentUser(): Promise<WhoAmIResult | null>;
-    runInline<T>(projectId: string, pulumiProjectName: string, pulumiStackName: string, program: () => Promise<void> | Promise<Record<string, unknown>>, fn: (stack: Stack) => Promise<T>): Promise<T>;
-    runEmpty<T>(projectId: string, pulumiProjectName: string, pulumiStackName: string, fn: (stack: Stack) => Promise<T>): Promise<T>;
-    runLocal<T>(projectId: string, pulumiProjectName: string, pulumiStackName: string, programPathResolver: () => Promise<string> | string, fn: (stack: Stack) => Promise<T>, stackConfig?: ConfigMap): Promise<T>;
+    runInline<T>(projectId: string, pulumiProjectName: string, pulumiStackName: string, program: () => Promise<void> | Promise<Record<string, unknown>>, fn: (stack: Stack) => Promise<T>, envVars?: Record<string, string>): Promise<T>;
+    runEmpty<T>(projectId: string, pulumiProjectName: string, pulumiStackName: string, fn: (stack: Stack) => Promise<T>, envVars?: Record<string, string>): Promise<T>;
+    runLocal<T>(projectId: string, pulumiProjectName: string, pulumiStackName: string, programPathResolver: () => Promise<string> | string, fn: (stack: Stack) => Promise<T>, stackConfig?: ConfigMap, envVars?: Record<string, string>): Promise<T>;
     private sharedPassword;
     private passwords;
     hasPassword(projectId: string): boolean;
@@ -137,6 +137,7 @@ declare const configSchema: z.ZodObject<{
     HIGHSTATE_BACKEND_RUNNER_LOCAL_SKIP_STATE_CHECK: z.ZodDefault<z.ZodBoolean>;
     HIGHSTATE_BACKEND_RUNNER_LOCAL_PRINT_OUTPUT: z.ZodDefault<z.ZodBoolean>;
     HIGHSTATE_BACKEND_RUNNER_LOCAL_SOURCE_BASE_PATH: z.ZodOptional<z.ZodString>;
+    HIGHSTATE_BACKEND_RUNNER_LOCAL_CACHE_DIR: z.ZodOptional<z.ZodString>;
     HIGHSTATE_BACKEND_RUNNER_TYPE: z.ZodDefault<z.ZodEnum<["local"]>>;
     HIGHSTATE_BACKEND_STATE_LOCAL_DIR: z.ZodOptional<z.ZodString>;
     HIGHSTATE_BACKEND_STATE_TYPE: z.ZodDefault<z.ZodEnum<["local"]>>;
@@ -167,6 +168,7 @@ declare const configSchema: z.ZodObject<{
     HIGHSTATE_BACKEND_PROJECT_PROJECTS_DIR?: string | undefined;
     HIGHSTATE_BACKEND_STATE_LOCAL_DIR?: string | undefined;
     HIGHSTATE_BACKEND_RUNNER_LOCAL_SOURCE_BASE_PATH?: string | undefined;
+    HIGHSTATE_BACKEND_RUNNER_LOCAL_CACHE_DIR?: string | undefined;
     HIGHSTATE_BACKEND_TERMINAL_DOCKER_HOST?: string | undefined;
     HIGHSTATE_BACKEND_WORKSPACE_LOCAL_DIR?: string | undefined;
 }, {
@@ -183,6 +185,7 @@ declare const configSchema: z.ZodObject<{
     HIGHSTATE_BACKEND_RUNNER_LOCAL_SKIP_STATE_CHECK?: boolean | undefined;
     HIGHSTATE_BACKEND_RUNNER_LOCAL_PRINT_OUTPUT?: boolean | undefined;
     HIGHSTATE_BACKEND_RUNNER_LOCAL_SOURCE_BASE_PATH?: string | undefined;
+    HIGHSTATE_BACKEND_RUNNER_LOCAL_CACHE_DIR?: string | undefined;
     HIGHSTATE_BACKEND_RUNNER_TYPE?: "local" | undefined;
     HIGHSTATE_BACKEND_TERMINAL_DOCKER_BINARY?: string | undefined;
     HIGHSTATE_BACKEND_TERMINAL_DOCKER_HOST?: string | undefined;

package/dist/index.mjs

@@ -79,7 +79,7 @@ class LocalPulumiHost {
       return null;
     }
   }
-  async runInline(projectId, pulumiProjectName, pulumiStackName, program, fn) {
+  async runInline(projectId, pulumiProjectName, pulumiStackName, program, fn, envVars) {
     return await this.lock.acquire(`${pulumiProjectName}.${pulumiStackName}`, async () => {
       const { LocalWorkspace } = await import('@pulumi/pulumi/automation/index.js');
       const stack = await LocalWorkspace.createOrSelectStack(
@@ -95,7 +95,8 @@ class LocalPulumiHost {
           },
           envVars: {
             PULUMI_CONFIG_PASSPHRASE: this.getPassword(projectId),
-            PULUMI_K8S_AWAIT_ALL: "true"
+            PULUMI_K8S_AWAIT_ALL: "true",
+            ...envVars
           }
         }
       );
@@ -112,12 +113,19 @@ class LocalPulumiHost {
       }
     });
   }
-  async runEmpty(projectId, pulumiProjectName, pulumiStackName, fn) {
-    return await this.runInline(projectId, pulumiProjectName, pulumiStackName, async () => {
-    }, fn);
+  async runEmpty(projectId, pulumiProjectName, pulumiStackName, fn, envVars) {
+    return await this.runInline(
+      projectId,
+      pulumiProjectName,
+      pulumiStackName,
+      async () => {
+      },
+      fn,
+      envVars
+    );
   }
   // TODO: extract args to options object
-  async runLocal(projectId, pulumiProjectName, pulumiStackName, programPathResolver, fn, stackConfig) {
+  async runLocal(projectId, pulumiProjectName, pulumiStackName, programPathResolver, fn, stackConfig, envVars) {
     return await this.lock.acquire(`${pulumiProjectName}.${pulumiStackName}`, async () => {
       const { LocalWorkspace } = await import('@pulumi/pulumi/automation/index.js');
       const stack = await LocalWorkspace.createOrSelectStack(
@@ -137,7 +145,8 @@ class LocalPulumiHost {
           } : void 0,
           envVars: {
             PULUMI_CONFIG_PASSPHRASE: this.getPassword(projectId),
-            PULUMI_K8S_AWAIT_ALL: "true"
+            PULUMI_K8S_AWAIT_ALL: "true",
+            ...envVars
           }
         }
       );
@@ -1206,14 +1215,16 @@ const localRunnerBackendConfig = z.object({
   HIGHSTATE_BACKEND_RUNNER_LOCAL_SKIP_SOURCE_CHECK: z.boolean({ coerce: true }).default(false),
   HIGHSTATE_BACKEND_RUNNER_LOCAL_SKIP_STATE_CHECK: z.boolean({ coerce: true }).default(false),
   HIGHSTATE_BACKEND_RUNNER_LOCAL_PRINT_OUTPUT: z.boolean({ coerce: true }).default(true),
-  HIGHSTATE_BACKEND_RUNNER_LOCAL_SOURCE_BASE_PATH: z.string().optional()
+  HIGHSTATE_BACKEND_RUNNER_LOCAL_SOURCE_BASE_PATH: z.string().optional(),
+  HIGHSTATE_BACKEND_RUNNER_LOCAL_CACHE_DIR: z.string().optional()
 });
 class LocalRunnerBackend {
-  constructor(skipSourceCheck, skipStateCheck, printOutput, sourceBasePath, pulumiProjectHost) {
+  constructor(skipSourceCheck, skipStateCheck, printOutput, sourceBasePath, cacheDir, pulumiProjectHost) {
     this.skipSourceCheck = skipSourceCheck;
     this.skipStateCheck = skipStateCheck;
     this.printOutput = printOutput;
     this.sourceBasePath = sourceBasePath;
+    this.cacheDir = cacheDir;
     this.pulumiProjectHost = pulumiProjectHost;
   }
   events = new EventEmitter();
@@ -1398,7 +1409,10 @@ class LocalRunnerBackend {
             }
           );
         },
-        configMap
+        configMap,
+        {
+          HIGHSTATE_CACHE_DIR: this.cacheDir
+        }
       );
     } catch (error) {
       this.updateState({
@@ -1468,6 +1482,9 @@ class LocalRunnerBackend {
             },
             (error) => this.pulumiProjectHost.tryUnlockStack(stack, error)
           );
+        },
+        {
+          PULUMI_K8S_DELETE_UNREACHABLE: "true"
         }
       );
     } catch (error) {
@@ -1657,11 +1674,22 @@ class LocalRunnerBackend {
       const [projectPath] = await resolveMainLocalProject();
       sourceBasePath = resolve$1(projectPath, "units");
     }
+    let cacheDir = config.HIGHSTATE_BACKEND_RUNNER_LOCAL_CACHE_DIR;
+    if (!cacheDir) {
+      const homeDir = process.env.HOME ?? process.env.USERPROFILE;
+      if (!homeDir) {
+        throw new Error(
+          "Failed to determine the home directory, please set HIGHSTATE_BACKEND_RUNNER_LOCAL_CACHE_DIR"
+        );
+      }
+      cacheDir = resolve$1(homeDir, ".cache", "highstate");
+    }
     return new LocalRunnerBackend(
       config.HIGHSTATE_BACKEND_RUNNER_LOCAL_SKIP_SOURCE_CHECK,
       config.HIGHSTATE_BACKEND_RUNNER_LOCAL_SKIP_STATE_CHECK,
       config.HIGHSTATE_BACKEND_RUNNER_LOCAL_PRINT_OUTPUT,
       sourceBasePath,
+      cacheDir,
       pulumiProjectHost
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "type": "module",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "build": "pkgroll --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
-    "@highstate/contract": "^0.6.1",
+    "@highstate/contract": "^0.7.0",
     "@types/node": "^22.10.1",
     "ajv": "^8.17.1",
     "better-lock": "^3.2.0",
@@ -65,5 +65,5 @@
     "rollup": "^4.28.1",
     "typescript": "^5.7.2"
   },
-  "gitHead": "afe736f7e93b7fcfbae97e2d6e35b07175a8fc76"
+  "gitHead": "2f5227f7b88cf38946e490fc4cdb96127bd8b174"
 }