@mittwald/cli 1.11.0 → 1.11.2

package/dist/lib/apiutil/api_retry.js

@@ -32,9 +32,10 @@ export function configureAxiosRetry(axios) {
                 return true;
             }
             const isSafeRequest = error.config?.method?.toLowerCase() === "get";
+            const isConditionalRequest = !!error.config?.headers?.["if-event-reached"];
             const isPreconditionFailed = error.response?.status === 412;
             const isAccessDenied = error.response?.status === 403;
-            if (isPreconditionFailed) {
+            if (isPreconditionFailed && isConditionalRequest) {
                 return true;
             }
             return isSafeRequest && isAccessDenied && shouldRetryAccessDenied;

package/dist/lib/basecommands/RenderBaseCommand.js

@@ -52,6 +52,7 @@ export class RenderBaseCommand extends ExtendedBaseCommand {
                                 useIncreaseInkStdoutColumns();
                                 return this.render();
                             } }) }) }) }) }));
+        await handle.waitUntilExit();
     }
     useAppInstallationId(command) {
         return usePromise(() => this.withAppInstallationId(command), []);

package/dist/lib/resources/stack/enrich.js

@@ -14,8 +14,15 @@ async function setEnvironmentFromEnvFile(service) {
         return service;
     }
     const enriched = structuredClone(service);
-    const envFileContent = await readFile(service.env_file, "utf-8");
-    const envVars = parse(envFileContent);
+    const envFiles = Array.isArray(service.env_file)
+        ? service.env_file
+        : [service.env_file];
+    let envVars = {};
+    for (const envFile of envFiles) {
+        const envFileContent = await readFile(envFile, "utf-8");
+        const fileEnvVars = parse(envFileContent);
+        envVars = { ...envVars, ...fileEnvVars };
+    }
     delete enriched.env_file;
     enriched.envs = {
         ...envVars,

package/dist/lib/resources/stack/enrich.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/resources/stack/enrich.test.js

@@ -0,0 +1,167 @@
+import { describe, expect, it, jest, beforeEach } from "@jest/globals";
+const mockReadFile = jest.fn();
+jest.unstable_mockModule("fs/promises", () => ({
+    readFile: mockReadFile,
+}));
+const { enrichStackDefinition } = await import("./enrich.js");
+describe("enrichStackDefinition", () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    it("should handle service without env_file", async () => {
+        const input = {
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    ports: ["80:80"],
+                },
+            },
+        };
+        const result = await enrichStackDefinition(input);
+        expect(result).toEqual(input);
+        expect(mockReadFile).not.toHaveBeenCalled();
+    });
+    it("should handle single env_file as string", async () => {
+        mockReadFile.mockResolvedValueOnce("FOO=bar\nBAZ=qux");
+        const input = {
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    env_file: ".env",
+                },
+            },
+        };
+        const result = await enrichStackDefinition(input);
+        expect(mockReadFile).toHaveBeenCalledWith(".env", "utf-8");
+        expect(result).toEqual({
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    envs: {
+                        FOO: "bar",
+                        BAZ: "qux",
+                    },
+                },
+            },
+        });
+    });
+    it("should handle env_file as array", async () => {
+        mockReadFile
+            .mockResolvedValueOnce("FOO=bar\nBAZ=qux")
+            .mockResolvedValueOnce("FOO=overridden\nNEW=value");
+        const input = {
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    env_file: [".env", ".env.local"],
+                },
+            },
+        };
+        const result = await enrichStackDefinition(input);
+        expect(mockReadFile).toHaveBeenCalledWith(".env", "utf-8");
+        expect(mockReadFile).toHaveBeenCalledWith(".env.local", "utf-8");
+        expect(result).toEqual({
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    envs: {
+                        FOO: "overridden", // Later file should override
+                        BAZ: "qux",
+                        NEW: "value",
+                    },
+                },
+            },
+        });
+    });
+    it("should merge env_file variables with existing envs", async () => {
+        mockReadFile.mockResolvedValueOnce("FOO=from_file\nFILE_VAR=file_value");
+        const input = {
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    env_file: ".env",
+                    envs: {
+                        FOO: "existing", // Should override env_file
+                        EXISTING_VAR: "existing_value",
+                    },
+                },
+            },
+        };
+        const result = await enrichStackDefinition(input);
+        expect(result).toEqual({
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    envs: {
+                        FOO: "existing", // Existing envs take precedence
+                        FILE_VAR: "file_value",
+                        EXISTING_VAR: "existing_value",
+                    },
+                },
+            },
+        });
+    });
+    it("should handle multiple services with different env_file configurations", async () => {
+        mockReadFile
+            .mockResolvedValueOnce("NGINX_VAR=nginx_value")
+            .mockResolvedValueOnce("APP_VAR=app_value1")
+            .mockResolvedValueOnce("APP_VAR=app_value2\nOTHER=other");
+        const input = {
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    env_file: ".env.nginx",
+                },
+                app: {
+                    image: "app:latest",
+                    env_file: [".env.app", ".env.app.local"],
+                },
+                db: {
+                    image: "postgres:latest",
+                    // No env_file
+                },
+            },
+        };
+        const result = await enrichStackDefinition(input);
+        expect(result).toEqual({
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    envs: {
+                        NGINX_VAR: "nginx_value",
+                    },
+                },
+                app: {
+                    image: "app:latest",
+                    envs: {
+                        APP_VAR: "app_value2", // Later file overrides
+                        OTHER: "other",
+                    },
+                },
+                db: {
+                    image: "postgres:latest",
+                },
+            },
+        });
+    });
+    it("should handle empty env files", async () => {
+        mockReadFile.mockResolvedValueOnce("");
+        const input = {
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    env_file: ".env",
+                },
+            },
+        };
+        const result = await enrichStackDefinition(input);
+        expect(result).toEqual({
+            services: {
+                nginx: {
+                    image: "nginx:latest",
+                    envs: {},
+                },
+            },
+        });
+    });
+});

package/dist/lib/resources/stack/types.d.ts

@@ -3,7 +3,7 @@ type ContainerServiceDeclareRequest = MittwaldAPIV2.Components.Schemas.Container
 export type ContainerServiceInput = ContainerServiceDeclareRequest & {
     command?: string[] | string;
     entrypoint?: string[] | string;
-    env_file?: string;
+    env_file?: string | string[];
     environment?: {
         [k: string]: string;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/cli",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "Hand-crafted CLI for the mittwald API",
   "license": "MIT",
   "author": {
@@ -56,7 +56,7 @@
     "envfile": "^7.1.0",
     "fast-xml-parser": "^5.2.5",
     "ink": "^6.2.3",
-    "ink-link": "^4.0.0",
+    "ink-link": "^5.0.0",
     "ink-text-input": "^6.0.0",
     "js-yaml": "^4.1.0",
     "marked": "^15.0.12",