@mittwald/cli 1.9.0 → 1.10.0

package/dist/commands/app/download.js

@@ -33,11 +33,11 @@ export class Download extends ExecRenderBaseCommand {
     static examples = [
         {
             description: "Download entire app to current working directory",
-            command: "$ <%= config.bin %> <%= command.id %> .",
+            command: "$ <%= config.bin %> <%= command.id %> --target .",
         },
         {
             description: "Download only shared dir from a deployer-managed app",
-            command: "<%= config.bin %> <%= command.id %> --remote-sub-directory=shared .",
+            command: "<%= config.bin %> <%= command.id %> --remote-sub-directory=shared --target .",
         },
     ];
     async exec() {

package/dist/commands/app/exec.d.ts

@@ -0,0 +1,17 @@
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Exec extends ExtendedBaseCommand<typeof Exec> {
+    static summary: string;
+    static description: string;
+    static args: {
+        command: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        workdir: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        env: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        "installation-id": import("@oclif/core/interfaces").OptionFlag<string>;
+        "ssh-user": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "ssh-identity-file": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/app/exec.js

@@ -0,0 +1,71 @@
+import * as child_process from "child_process";
+import { Args, Flags } from "@oclif/core";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+import { sshConnectionFlags } from "../../lib/resources/ssh/flags.js";
+import { sshUsageDocumentation } from "../../lib/resources/ssh/doc.js";
+import { buildSSHClientFlags } from "../../lib/resources/ssh/connection.js";
+import { appInstallationFlags } from "../../lib/resources/app/flags.js";
+import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appinstall.js";
+import shellEscape from "shell-escape";
+import { prepareEnvironmentVariables } from "../../lib/resources/ssh/environment.js";
+export default class Exec extends ExtendedBaseCommand {
+    static summary = "Execute a command in an app installation via SSH non-interactively.";
+    static description = sshUsageDocumentation;
+    static args = {
+        command: Args.string({
+            description: "Command to execute in the app installation",
+            required: true,
+        }),
+    };
+    static flags = {
+        ...sshConnectionFlags,
+        ...appInstallationFlags,
+        workdir: Flags.string({
+            char: "w",
+            summary: "working directory where the command will be executed",
+            default: undefined,
+        }),
+        env: Flags.string({
+            char: "e",
+            summary: "environment variables to set for the command (format: KEY=VALUE)",
+            multiple: true,
+            multipleNonGreedy: true,
+        }),
+        quiet: Flags.boolean({
+            char: "q",
+            summary: "disable informational output, only show command results",
+            default: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(Exec);
+        const appInstallationId = await this.withAppInstallationId(Exec);
+        const { host, user, directory } = await getSSHConnectionForAppInstallation(this.apiClient, appInstallationId, flags["ssh-user"]);
+        if (!flags.quiet) {
+            this.log("executing command on %s as %s", host, user);
+        }
+        const command = args.command;
+        const workdir = flags.workdir ?? directory;
+        // Build the command to execute
+        let execCommand = "";
+        // Add environment variables if provided
+        if (flags.env && flags.env.length > 0) {
+            execCommand += prepareEnvironmentVariables(flags.env);
+        }
+        // Change to working directory if specified, otherwise use app directory
+        execCommand += `cd ${shellEscape([workdir])} && `;
+        // Add the actual command
+        execCommand += command;
+        const sshArgs = buildSSHClientFlags(user, host, flags, {
+            interactive: false,
+        });
+        const wrappedExecCommand = shellEscape(["/bin/bash", "-c", execCommand]);
+        this.debug("running ssh %o, with command %o", sshArgs, wrappedExecCommand);
+        const result = child_process.spawnSync("/usr/bin/ssh", [...sshArgs, wrappedExecCommand], {
+            stdio: "inherit",
+        });
+        if (result.status !== 0) {
+            this.error(`Command failed with exit code ${result.status}`);
+        }
+    }
+}

package/dist/commands/container/exec.d.ts

@@ -10,16 +10,10 @@ export default class Exec extends ExtendedBaseCommand<typeof Exec> {
         workdir: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         env: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         shell: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "project-id": import("@oclif/core/interfaces").OptionFlag<string>;
         "ssh-user": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         "ssh-identity-file": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
-    /**
-     * Prepare environment variables for the SSH command
-     *
-     * @param envVars Array of environment variables in KEY=VALUE format
-     * @returns Formatted string with export commands
-     */
-    private prepareEnvironmentVariables;
     run(): Promise<void>;
 }

package/dist/commands/container/exec.js

@@ -8,6 +8,7 @@ import { buildSSHClientFlags } from "../../lib/resources/ssh/connection.js";
 import { withContainerAndStackId } from "../../lib/resources/container/flags.js";
 import { projectFlags } from "../../lib/resources/project/flags.js";
 import shellEscape from "shell-escape";
+import { prepareEnvironmentVariables } from "../../lib/resources/ssh/environment.js";
 export default class Exec extends ExtendedBaseCommand {
     static summary = "Execute a command in a container via SSH non-interactively.";
     static description = sshUsageDocumentation;
@@ -33,44 +34,32 @@ export default class Exec extends ExtendedBaseCommand {
             char: "e",
             summary: "environment variables to set for the command (format: KEY=VALUE)",
             multiple: true,
+            multipleNonGreedy: true,
         }),
         shell: Flags.string({
             summary: "shell to use for the SSH connection",
             default: "/bin/sh",
         }),
+        quiet: Flags.boolean({
+            char: "q",
+            summary: "disable informational output, only show command results",
+            default: false,
+        }),
     };
-    /**
-     * Prepare environment variables for the SSH command
-     *
-     * @param envVars Array of environment variables in KEY=VALUE format
-     * @returns Formatted string with export commands
-     */
-    prepareEnvironmentVariables(envVars) {
-        return (envVars
-            .map((env) => {
-            const eqIdx = env.indexOf("=");
-            if (eqIdx === -1) {
-                // If no '=', treat the whole string as key with empty value
-                return `export ${shellEscape([env])}=`;
-            }
-            const key = env.slice(0, eqIdx);
-            const value = env.slice(eqIdx + 1);
-            return `export ${shellEscape([key])}=${shellEscape([value])}`;
-        })
-            .join("; ") + "; ");
-    }
     async run() {
         const { args, flags } = await this.parse(Exec);
         const [containerId, stackId] = await withContainerAndStackId(this.apiClient, Exec, flags, this.args, this.config);
         const { host, user } = await getSSHConnectionForContainer(this.apiClient, containerId, stackId, flags["ssh-user"]);
-        this.log("executing command on %s as %s", host, user);
+        if (!flags.quiet) {
+            this.log("executing command on %s as %s", host, user);
+        }
         const command = args.command;
         const workdir = flags.workdir;
         // Build the command to execute
         let execCommand = "";
         // Add environment variables if provided
         if (flags.env && flags.env.length > 0) {
-            execCommand += this.prepareEnvironmentVariables(flags.env);
+            execCommand += prepareEnvironmentVariables(flags.env);
         }
         // Change to working directory if specified
         if (workdir !== undefined) {

package/dist/hooks/prerun/update-brew-check.d.ts

@@ -0,0 +1,3 @@
+import { Hook } from "@oclif/core";
+declare const hook: Hook<"prerun">;
+export default hook;

package/dist/hooks/prerun/update-brew-check.js

@@ -0,0 +1,19 @@
+import { execSync } from "child_process";
+const hook = async function (opts) {
+    const isInstalledWithBrew = () => {
+        try {
+            const cellar = execSync("brew --cellar", { encoding: "utf8" });
+            return opts.config.root.startsWith(cellar.trim());
+        }
+        catch {
+            return false;
+        }
+    };
+    if (opts.Command.id === "update") {
+        if (isInstalledWithBrew()) {
+            opts.context.warn("installed with brew.\nUse `brew upgrade mw` to update to the newest version");
+            opts.context.exit(1);
+        }
+    }
+};
+export default hook;

package/dist/lib/context/TerraformContextProvider.js

@@ -3,7 +3,7 @@ import { cwd } from "process";
 import path from "path";
 import { pathExists } from "../util/fs/pathExists.js";
 function overrideIDFromState(state, type) {
-    const instances = state.resources?.find((r) => r.type === type)?.instances;
+    const instances = state.resources?.find((r) => r.type === type && r.mode === "managed")?.instances;
     if (instances === undefined) {
         return undefined;
     }

package/dist/lib/resources/ssh/environment.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Prepare environment variables for SSH command execution
+ *
+ * @param envVars Array of environment variables in KEY=VALUE format
+ * @returns Formatted string with export commands
+ */
+export declare function prepareEnvironmentVariables(envVars: string[]): string;

package/dist/lib/resources/ssh/environment.js

@@ -0,0 +1,21 @@
+import shellEscape from "shell-escape";
+/**
+ * Prepare environment variables for SSH command execution
+ *
+ * @param envVars Array of environment variables in KEY=VALUE format
+ * @returns Formatted string with export commands
+ */
+export function prepareEnvironmentVariables(envVars) {
+    return (envVars
+        .map((env) => {
+        const eqIdx = env.indexOf("=");
+        if (eqIdx === -1) {
+            // If no '=', treat the whole string as key with empty value
+            return `export ${shellEscape([env])}=`;
+        }
+        const key = env.slice(0, eqIdx);
+        const value = env.slice(eqIdx + 1);
+        return `export ${shellEscape([key])}=${shellEscape([value])}`;
+    })
+        .join("; ") + "; ");
+}

package/dist/rendering/formatter/ListFormatter.d.ts

@@ -1,6 +1,6 @@
 import { BooleanFlag, OptionFlag } from "@oclif/core/interfaces";
 import { ListColumns } from "./Table.js";
-export { ListColumn, ListColumns } from "./Table.js";
+export type { ListColumn, ListColumns } from "./Table.js";
 type ListFormatterFlags = {
     output: OptionFlag<OutputFormat>;
     extended: BooleanFlag<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/cli",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Hand-crafted CLI for the mittwald API",
   "license": "MIT",
   "author": {
@@ -281,6 +281,9 @@
         "bucket": "mittwald-cli",
         "host": "https://mittwald-cli.s3.eu-central-1.amazonaws.com"
       }
+    },
+    "hooks": {
+      "prerun": "./dist/hooks/prerun/update-brew-check"
     }
   },
   "packageManager": "yarn@3.6.1"