@mittwald/cli 1.0.0-alpha.37 → 1.0.0-alpha.39

package/README.md

@@ -191,7 +191,7 @@ USAGE
 * [`mw domain virtualhost delete VIRTUAL-HOST-ID`](#mw-domain-virtualhost-delete-virtual-host-id)
 * [`mw domain virtualhost get INGRESS-ID`](#mw-domain-virtualhost-get-ingress-id)
 * [`mw domain virtualhost list`](#mw-domain-virtualhost-list)
-* [`mw help [COMMANDS]`](#mw-help-commands)
+* [`mw help [COMMAND]`](#mw-help-command)
 * [`mw login reset`](#mw-login-reset)
 * [`mw login status`](#mw-login-status)
 * [`mw login token`](#mw-login-token)
@@ -254,6 +254,7 @@ USAGE
 * [`mw user ssh-key create`](#mw-user-ssh-key-create)
 * [`mw user ssh-key delete ID`](#mw-user-ssh-key-delete-id)
 * [`mw user ssh-key get KEY-ID`](#mw-user-ssh-key-get-key-id)
+* [`mw user ssh-key import`](#mw-user-ssh-key-import)
 * [`mw user ssh-key list`](#mw-user-ssh-key-list)
 
 ## `mw app copy [INSTALLATION-ID]`
@@ -2280,7 +2281,7 @@ USAGE
   $ mw database mysql delete DATABASE-ID [-q] [-f]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -f, --force  Do not ask for confirmation
@@ -2305,7 +2306,7 @@ USAGE
   $ mw database mysql dump DATABASE-ID -o <value> [-q] [-p <value>] [--ssh-user <value>] [--temporary-user] [--gzip]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -o, --output=<value>          (required) the output file to write the dump to ("-" for stdout)
@@ -2365,7 +2366,7 @@ USAGE
   $ mw database mysql get DATABASE-ID [-o json|yaml |  | ]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -o, --output=<option>  output in a more machine friendly format
@@ -2415,7 +2416,7 @@ USAGE
   $ mw database mysql phpmyadmin DATABASE-ID
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 ```
 
 ## `mw database mysql port-forward DATABASE-ID`
@@ -2427,7 +2428,7 @@ USAGE
   $ mw database mysql port-forward DATABASE-ID [-q] [--ssh-user <value>] [--port <value>]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -q, --quiet             suppress process output and only display a machine-readable summary.
@@ -2457,7 +2458,7 @@ USAGE
   $ mw database mysql shell DATABASE-ID [-q] [-p <value>]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -p, --mysql-password=<value>  the password to use for the MySQL user (env: MYSQL_PWD)
@@ -3105,16 +3106,16 @@ FLAG DESCRIPTIONS
     to persistently set a default project for all commands that accept this flag.
 ```
 
-## `mw help [COMMANDS]`
+## `mw help [COMMAND]`
 
 Display help for mw.
 
 ```
 USAGE
-  $ mw help [COMMANDS] [-n]
+  $ mw help [COMMAND] [-n]
 
 ARGUMENTS
-  COMMANDS  Command to show help for.
+  COMMAND  Command to show help for.
 
 FLAGS
   -n, --nested-commands  Include all nested commands in the output.
@@ -3123,7 +3124,7 @@ DESCRIPTION
   Display help for mw.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.0.14/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.0.16/src/commands/help.ts)_
 
 ## `mw login reset`
 
@@ -4517,7 +4518,7 @@ EXAMPLES
     $ mw update --available
 ```
 
-_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.1.14/src/commands/update.ts)_
+_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.1.16/src/commands/update.ts)_
 
 ## `mw user api-token create`
 
@@ -4679,14 +4680,14 @@ Create and import a new SSH key
 
 ```
 USAGE
-  $ mw user ssh-key create [-q] [--output <value>] [--no-passphrase] [--comment <value>] [--expiresAt <value>]
+  $ mw user ssh-key create [-q] [--expires <value>] [--output <value>] [--no-passphrase] [--comment <value>]
 
 FLAGS
-  -q, --quiet              suppress process output and only display a machine-readable summary.
-      --comment=<value>    A comment for the SSH key.
-      --expiresAt=<value>  Duration after which the SSH key should expire (example: '1y').
-      --no-passphrase      Use this flag to not set a passphrase for the SSH key.
-      --output=<value>     [default: mstudio-cli] A filename in your ~/.ssh directory to write the SSH key to.
+  -q, --quiet            suppress process output and only display a machine-readable summary.
+      --comment=<value>  A comment for the SSH key.
+      --expires=<value>  An interval after which the SSH key expires (examples: 30m, 30d, 1y).
+      --no-passphrase    Use this flag to not set a passphrase for the SSH key.
+      --output=<value>   [default: mstudio-cli] A filename in your ~/.ssh directory to write the SSH key to.
 
 DESCRIPTION
   Create and import a new SSH key
@@ -4742,6 +4743,29 @@ DESCRIPTION
   Get a specific SSH key
 ```
 
+## `mw user ssh-key import`
+
+Import an existing (local) SSH key
+
+```
+USAGE
+  $ mw user ssh-key import [-q] [--expires <value>] [--input <value>]
+
+FLAGS
+  -q, --quiet            suppress process output and only display a machine-readable summary.
+      --expires=<value>  An interval after which the SSH key expires (examples: 30m, 30d, 1y).
+      --input=<value>    [default: id_rsa.pub] A filename in your ~/.ssh directory containing the key to import.
+
+DESCRIPTION
+  Import an existing (local) SSH key
+
+FLAG DESCRIPTIONS
+  -q, --quiet  suppress process output and only display a machine-readable summary.
+
+    This flag controls if you want to see the process output or only a summary. When using mw non-interactively (e.g. in
+    scripts), you can use this flag to easily get the IDs of created resources for further processing.
+```
+
 ## `mw user ssh-key list`
 
 Get your stored ssh keys

package/dist/BaseCommand.js

@@ -2,6 +2,8 @@ import { Command } from "@oclif/core";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
+import { configureAxiosRetry } from "./lib/api_retry.js";
+import { configureConsistencyHandling } from "./lib/api_consistency.js";
 export class BaseCommand extends Command {
     authenticationRequired = true;
     apiClient = MittwaldAPIV2Client.newUnauthenticated();
@@ -15,6 +17,8 @@ export class BaseCommand extends Command {
             this.apiClient = MittwaldAPIV2Client.newWithToken(token);
             this.apiClient.axios.defaults.headers["User-Agent"] =
                 `mittwald-cli/${this.config.version}`;
+            configureAxiosRetry(this.apiClient.axios);
+            configureConsistencyHandling(this.apiClient.axios);
         }
     }
     getTokenFilename() {

package/dist/commands/database/mysql/create.d.ts

@@ -18,6 +18,7 @@ export declare class Create extends ExecRenderBaseCommand<typeof Create, Result>
         "project-id": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string>;
     };
     protected exec(): Promise<Result>;
+    private createMySQLDatabase;
     private getPassword;
     protected render({ databaseId }: Result): ReactNode;
 }

package/dist/commands/database/mysql/create.js

@@ -49,46 +49,48 @@ export class Create extends ExecRenderBaseCommand {
         const projectId = await this.withProjectId(Create);
         const { description, version, collation, "character-set": characterSet, "user-external": externalAccess, "user-access-level": accessLevel, } = this.flags;
         const password = await this.getPassword(p);
-        const db = await p.runStep("creating MySQL database", async () => {
-            const r = await this.apiClient.database.createMysqlDatabase({
-                projectId,
-                data: {
-                    database: {
-                        projectId,
-                        description,
-                        version,
-                        characterSettings: {
-                            collation,
-                            characterSet,
-                        },
-                    },
-                    user: {
-                        password,
-                        externalAccess,
-                        accessLevel: accessLevel,
-                    },
-                },
-            });
-            assertStatus(r, 201);
-            return r.data;
+        const db = await this.createMySQLDatabase(p, projectId, {
+            description,
+            version,
+            characterSettings: {
+                collation,
+                characterSet,
+            },
+        }, {
+            password,
+            externalAccess,
+            accessLevel: accessLevel,
         });
         const database = await p.runStep("fetching database", async () => {
-            const r = await this.apiClient.database.getMysqlDatabase({
+            const response = await this.apiClient.database.getMysqlDatabase({
                 mysqlDatabaseId: db.id,
             });
-            assertStatus(r, 200);
-            return r.data;
+            assertStatus(response, 200);
+            return response.data;
         });
         const user = await p.runStep("fetching user", async () => {
-            const r = await this.apiClient.database.getMysqlUser({
+            const response = await this.apiClient.database.getMysqlUser({
                 mysqlUserId: db.userId,
             });
-            assertStatus(r, 200);
-            return r.data;
+            assertStatus(response, 200);
+            return response.data;
         });
-        p.complete(_jsxs(Success, { children: ["The database ", _jsx(Value, { children: database.name }), " and the user", " ", _jsx(Value, { children: user.name }), " were successfully created."] }));
+        await p.complete(_jsx(DatabaseCreateSuccess, { database: database, user: user }));
         return { databaseId: db.id, userId: db.userId };
     }
+    async createMySQLDatabase(p, projectId, database, user) {
+        return await p.runStep("creating MySQL database", async () => {
+            const r = await this.apiClient.database.createMysqlDatabase({
+                projectId,
+                data: {
+                    database: { projectId, ...database },
+                    user,
+                },
+            });
+            assertStatus(r, 201);
+            return r.data;
+        });
+    }
     async getPassword(p) {
         if (this.flags["user-password"]) {
             return this.flags["user-password"];
@@ -101,3 +103,6 @@ export class Create extends ExecRenderBaseCommand {
         }
     }
 }
+function DatabaseCreateSuccess({ database, user, }) {
+    return (_jsxs(Success, { children: ["The database ", _jsx(Value, { children: database.name }), " and the user", " ", _jsx(Value, { children: user.name }), " were successfully created."] }));
+}

package/dist/commands/database/mysql/create.test.d.ts

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

package/dist/commands/database/mysql/create.test.js

@@ -0,0 +1,100 @@
+import { expect, test } from "@oclif/test";
+describe("database:mysql:create", () => {
+    const projectId = "339d6458-839f-4809-a03d-78700069690c";
+    const databaseId = "83e0cb85-dcf7-4968-8646-87a63980ae91";
+    const userId = "a8c1eb2a-aa4d-4daf-8e21-9d91d56559ca";
+    const password = "secret";
+    const description = "Test";
+    const createFlags = [
+        "database mysql create",
+        "--project-id",
+        projectId,
+        "--version",
+        "8.0",
+        "--description",
+        description,
+        "--user-password",
+        password,
+    ];
+    test
+        .nock("https://api.mittwald.de", (api) => {
+        api.get(`/v2/projects/${projectId}`).reply(200, {
+            id: projectId,
+        });
+        api
+            .post(`/v2/projects/${projectId}/mysql-databases`, {
+            database: {
+                projectId,
+                description,
+                version: "8.0",
+                characterSettings: {
+                    collation: "utf8mb4_unicode_ci",
+                    characterSet: "utf8mb4",
+                },
+            },
+            user: {
+                password,
+                externalAccess: false,
+                accessLevel: "full",
+            },
+        })
+            .reply(201, { id: databaseId, userId });
+        api.get(`/v2/mysql-databases/${databaseId}`).reply(200, {
+            id: databaseId,
+            name: "mysql_xxxxxx",
+        });
+        api.get(`/v2/mysql-users/${userId}`).reply(200, {
+            id: userId,
+            name: "dbu_xxxxxx",
+        });
+    })
+        .env({ MITTWALD_API_TOKEN: "foo" })
+        .stdout()
+        .command(createFlags)
+        .it("creates a database and prints database and user name", (ctx) => {
+        // cannot match on exact output, because linebreaks
+        expect(ctx.stdout).to.contain("The database mysql_xxxxxx");
+        expect(ctx.stdout).to.contain("the user dbu_xxxxxx");
+    });
+    test
+        .nock("https://api.mittwald.de", (api) => {
+        api.get(`/v2/projects/${projectId}`).reply(200, {
+            id: projectId,
+        });
+        api
+            .post(`/v2/projects/${projectId}/mysql-databases`, {
+            database: {
+                projectId,
+                description: "Test",
+                version: "8.0",
+                characterSettings: {
+                    collation: "utf8mb4_unicode_ci",
+                    characterSet: "utf8mb4",
+                },
+            },
+            user: {
+                password: "secret",
+                externalAccess: false,
+                accessLevel: "full",
+            },
+        })
+            .reply(201, { id: databaseId, userId });
+        api.get(`/v2/mysql-databases/${databaseId}`).reply(200, {
+            id: databaseId,
+            name: "mysql_xxxxxx",
+        });
+        api.get(`/v2/mysql-users/${userId}`).times(3).reply(403);
+        api.get(`/v2/mysql-users/${userId}`).reply(200, {
+            id: userId,
+            name: "dbu_xxxxxx",
+        });
+    })
+        .env({ MITTWALD_API_TOKEN: "foo" })
+        .stdout()
+        .command(createFlags)
+        .it("retries fetching user until successful", (ctx) => {
+        // cannot match on exact output, because linebreaks
+        expect(ctx.stdout).to.contain("The database mysql_xxxxxx");
+        expect(ctx.stdout).to.contain("the user dbu_xxxxxx");
+    });
+});

package/dist/commands/database/mysql/delete.js

@@ -8,7 +8,7 @@ export default class Delete extends DeleteBaseCommand {
     static flags = { ...DeleteBaseCommand.baseFlags };
     static args = { ...mysqlArgs };
     async deleteResource() {
-        const mysqlDatabaseId = await withMySQLId(this.apiClient, this.flags, this.args, this.config);
+        const mysqlDatabaseId = await withMySQLId(this.apiClient, this.flags, this.args);
         const response = await this.apiClient.database.deleteMysqlDatabase({
             mysqlDatabaseId,
         });

package/dist/commands/database/mysql/dump.js

@@ -43,7 +43,7 @@ export class Dump extends ExecRenderBaseCommand {
     };
     static args = { ...mysqlArgs };
     async exec() {
-        const databaseId = await withMySQLId(this.apiClient, this.flags, this.args, this.config);
+        const databaseId = await withMySQLId(this.apiClient, this.flags, this.args);
         const p = makeProcessRenderer(this.flags, "Dumping a MySQL database");
         const connectionDetails = await getConnectionDetailsWithPassword(this.apiClient, databaseId, p, this.flags);
         if (this.flags["temporary-user"]) {

package/dist/commands/database/mysql/get.js

@@ -7,7 +7,7 @@ export class Get extends GetBaseCommand {
     };
     static args = { ...mysqlArgs };
     async getData() {
-        const mysqlDatabaseId = await withMySQLId(this.apiClient, this.flags, this.args, this.config);
+        const mysqlDatabaseId = await withMySQLId(this.apiClient, this.flags, this.args);
         return await this.apiClient.database.getMysqlDatabase({
             mysqlDatabaseId,
         });

package/dist/commands/database/mysql/phpmyadmin.js

@@ -7,7 +7,7 @@ export class PhpMyAdmin extends BaseCommand {
     static args = { ...mysqlArgs };
     async run() {
         const { flags, args } = await this.parse(PhpMyAdmin);
-        const databaseId = await withMySQLId(this.apiClient, flags, args, this.config);
+        const databaseId = await withMySQLId(this.apiClient, flags, args);
         const users = await this.apiClient.database.listMysqlUsers({
             mysqlDatabaseId: databaseId,
         });

package/dist/commands/database/mysql/port-forward.js

@@ -20,7 +20,7 @@ export class PortForward extends ExecRenderBaseCommand {
     };
     static args = { ...mysqlArgs };
     async exec() {
-        const databaseId = await withMySQLId(this.apiClient, this.flags, this.args, this.config);
+        const databaseId = await withMySQLId(this.apiClient, this.flags, this.args);
         const p = makeProcessRenderer(this.flags, "Port-forwarding a MySQL database");
         const { sshUser, sshHost, hostname, database } = await getConnectionDetails(this.apiClient, databaseId, this.flags["ssh-user"], p);
         const { port } = this.flags;

package/dist/commands/database/mysql/shell.js

@@ -13,7 +13,7 @@ export class Shell extends ExecRenderBaseCommand {
     };
     static args = { ...mysqlArgs };
     async exec() {
-        const databaseId = await withMySQLId(this.apiClient, this.flags, this.args, this.config);
+        const databaseId = await withMySQLId(this.apiClient, this.flags, this.args);
         const p = makeProcessRenderer(this.flags, "Starting a MySQL shell");
         const { sshUser, sshHost, user, hostname, database, password } = await getConnectionDetailsWithPassword(this.apiClient, databaseId, p, this.flags);
         p.complete(_jsx(Text, { children: "Starting MySQL shell -- get ready..." }));

package/dist/commands/ddev/init.d.ts

@@ -15,6 +15,7 @@ export declare class Init extends ExecRenderBaseCommand<typeof Init, void> {
     protected exec(): Promise<void>;
     protected render(): React.ReactNode;
     private addSSHCredentials;
+    private determineDDEVVersion;
     private installMittwaldPlugin;
     private initializeDDEVProject;
     private determineProjectName;

package/dist/commands/ddev/init.js

@@ -14,6 +14,10 @@ import { renderDDEVConfig } from "../../lib/ddev/config_render.js";
 import { loadDDEVConfig } from "../../lib/ddev/config_loader.js";
 import { Value } from "../../rendering/react/components/Value.js";
 import { ddevFlags } from "../../lib/ddev/flags.js";
+import { exec } from "child_process";
+import { promisify } from "util";
+import { compareSemVer } from "semver-parser";
+const execAsync = promisify(exec);
 export class Init extends ExecRenderBaseCommand {
     static summary = "Initialize a new ddev project in the current directory.";
     static description = "This command initializes a new ddev configuration for an existing app installation in the current directory.\n" +
@@ -50,9 +54,10 @@ export class Init extends ExecRenderBaseCommand {
         const appInstallationId = await this.withAppInstallationId(Init);
         const r = makeProcessRenderer(this.flags, "Initializing DDEV project");
         await assertDDEVIsInstalled(r);
+        const ddevVersion = await this.determineDDEVVersion(r);
         const config = await this.writeMittwaldConfiguration(r, appInstallationId);
         const projectName = await this.determineProjectName(r);
-        await this.initializeDDEVProject(r, config, projectName);
+        await this.initializeDDEVProject(r, config, projectName, ddevVersion);
         await this.installMittwaldPlugin(r);
         await this.addSSHCredentials(r);
         await r.complete(_jsx(DDEVInitSuccess, {}));
@@ -66,6 +71,12 @@ export class Init extends ExecRenderBaseCommand {
             "ssh",
         ]);
     }
+    async determineDDEVVersion(r) {
+        const { stdout } = await execAsync("ddev --version");
+        const version = stdout.trim().replace(/^ddev version +/, "");
+        r.addInfo(_jsx(InfoDDEVVersion, { version: version }));
+        return version;
+    }
     async installMittwaldPlugin(r) {
         const { "override-mittwald-plugin": mittwaldPlugin } = this.flags;
         await spawnInProcess(r, "installing mittwald plugin", "ddev", [
@@ -73,13 +84,17 @@ export class Init extends ExecRenderBaseCommand {
             mittwaldPlugin,
         ]);
     }
-    async initializeDDEVProject(r, config, projectName) {
-        await spawnInProcess(r, "initializing DDEV project", "ddev", [
+    async initializeDDEVProject(r, config, projectName, ddevVersion) {
+        const ddevFlags = [
             "config",
             "--project-name",
             projectName,
             ...ddevConfigToFlags(config),
-        ]);
+        ];
+        if (compareSemVer(ddevVersion, "1.22.7") < 0) {
+            ddevFlags.push("--create-docroot");
+        }
+        await spawnInProcess(r, "initializing DDEV project", "ddev", ddevFlags);
     }
     async determineProjectName(r) {
         const { "project-name": projectName } = this.flags;
@@ -118,3 +133,6 @@ async function writeContentsToFile(filename, data) {
 function InfoUsingExistingName({ name }) {
     return (_jsxs(_Fragment, { children: ["using existing project name: ", _jsx(Value, { children: name })] }));
 }
+function InfoDDEVVersion({ version }) {
+    return (_jsxs(_Fragment, { children: ["detected DDEV version: ", _jsx(Value, { children: version })] }));
+}

package/dist/commands/project/create.js

@@ -35,7 +35,6 @@ export default class Create extends ExecRenderBaseCommand {
             data: { description },
         });
         assertStatus(result, 201);
-        const eventId = result.headers["etag"];
         stepCreating.complete();
         process.addInfo(_jsxs(Text, { children: ["project ID: ", _jsx(Value, { children: result.data.id })] }));
         if (flags.wait) {
@@ -43,7 +42,6 @@ export default class Create extends ExecRenderBaseCommand {
             await waitUntil(async () => {
                 const projectResponse = await this.apiClient.project.getProject({
                     projectId: result.data.id,
-                    headers: { "if-event-reached": eventId },
                 });
                 if (projectResponse.status === 200 &&
                     projectResponse.data.readiness === "ready") {

package/dist/commands/user/ssh-key/create.d.ts

@@ -5,9 +5,10 @@ export default class Create extends ExecRenderBaseCommand<typeof Create, undefin
         output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "no-passphrase": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         comment: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        expiresAt: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     protected exec(): Promise<undefined>;
     protected render(): null;
+    private getPassphrase;
 }

package/dist/commands/user/ssh-key/create.js

@@ -1,20 +1,21 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Flags } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
-import * as cp from "child_process";
 import * as path from "path";
 import * as os from "os";
 import * as fs from "fs/promises";
-import parseDuration from "parse-duration";
 import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Filename } from "../../../rendering/react/components/Filename.js";
 import { Text } from "ink";
+import { expirationDateFromFlagsOptional, expireFlags, } from "../../../lib/expires.js";
+import { spawnInProcess } from "../../../rendering/process/process_exec.js";
 export default class Create extends ExecRenderBaseCommand {
     static description = "Create and import a new SSH key";
     static flags = {
         ...processFlags,
+        ...expireFlags("SSH key"),
         output: Flags.string({
             description: "A filename in your ~/.ssh directory to write the SSH key to.",
             default: "mstudio-cli",
@@ -25,41 +26,21 @@ export default class Create extends ExecRenderBaseCommand {
         comment: Flags.string({
             description: "A comment for the SSH key.",
         }),
-        expiresAt: Flags.string({
-            description: "Duration after which the SSH key should expire (example: '1y').",
-        }),
     };
     async exec() {
-        const { flags } = await this.parse(Create);
         const cmd = "ssh-keygen";
-        const outputFile = path.join(os.homedir(), ".ssh", flags.output);
-        const args = ["-t", "rsa", "-f", outputFile];
-        const process = makeProcessRenderer(flags, "Creating a new SSH key");
-        let expiresAt;
-        if (flags["expiresAt"]) {
-            const parsedDuration = parseDuration(flags["expiresAt"]);
-            if (!parsedDuration) {
-                throw new Error("Invalid duration");
-            }
-            expiresAt = new Date();
-            expiresAt.setTime(new Date().getTime() + parsedDuration);
-        }
-        if (flags["no-passphrase"]) {
-            args.push("-N", "");
-        }
-        else {
-            const passphrase = await process.addInput(_jsx(Text, { children: "enter passphrase for SSH key" }), true);
-            args.push("-N", passphrase);
+        const outputFile = path.join(os.homedir(), ".ssh", this.flags.output);
+        const r = makeProcessRenderer(this.flags, "Creating a new SSH key");
+        const expiresAt = expirationDateFromFlagsOptional(this.flags);
+        const passphrase = await this.getPassphrase(r);
+        const args = ["-t", "rsa", "-f", outputFile, "-N", passphrase];
+        if (this.flags.comment) {
+            args.push("-C", this.flags.comment);
         }
-        if (flags.comment) {
-            args.push("-C", flags.comment);
-        }
-        const publicKey = await process.runStep("generating SSH key using ssh-keygen", async () => {
-            cp.spawnSync(cmd, args, { stdio: "ignore" });
-            return await fs.readFile(outputFile + ".pub", "utf-8");
-        });
-        process.addInfo(_jsxs(Text, { children: ["ssh key saved to ", _jsx(Filename, { filename: outputFile }), "."] }));
-        await process.runStep("importing SSH key", async () => {
+        await spawnInProcess(r, "generating SSH key using ssh-keygen", cmd, args);
+        const publicKey = await fs.readFile(outputFile + ".pub", "utf-8");
+        r.addInfo(_jsx(InfoSSHKeySaved, { filename: outputFile }));
+        await r.runStep("importing SSH key", async () => {
             const response = await this.apiClient.user.createSshKey({
                 data: {
                     publicKey,
@@ -67,11 +48,22 @@ export default class Create extends ExecRenderBaseCommand {
                 },
             });
             assertStatus(response, 201);
-            return response;
         });
-        process.complete(_jsx(Success, { children: "Your SSH key was successfully created and imported to your user profile." }));
+        await r.complete(_jsx(SSHKeySuccess, {}));
     }
     render() {
         return null;
     }
+    async getPassphrase(r) {
+        if (this.flags["no-passphrase"]) {
+            return "";
+        }
+        return await r.addInput(_jsx(Text, { children: "enter passphrase for SSH key" }), true);
+    }
+}
+function SSHKeySuccess() {
+    return (_jsx(Success, { children: "Your SSH key was successfully created and imported to your user profile." }));
+}
+function InfoSSHKeySaved({ filename }) {
+    return (_jsxs(Text, { children: ["ssh key saved to ", _jsx(Filename, { filename: filename }), "."] }));
 }

package/dist/commands/user/ssh-key/import.d.ts

@@ -0,0 +1,11 @@
+import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+export default class Import extends ExecRenderBaseCommand<typeof Import, undefined> {
+    static description: string;
+    static flags: {
+        input: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        expires: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    protected exec(): Promise<undefined>;
+    protected render(): null;
+}

package/dist/commands/user/ssh-key/import.js

@@ -0,0 +1,56 @@
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Flags } from "@oclif/core";
+import { assertStatus } from "@mittwald/api-client-commons";
+import * as path from "path";
+import * as os from "os";
+import * as fs from "fs/promises";
+import { ExecRenderBaseCommand } from "../../../rendering/react/ExecRenderBaseCommand.js";
+import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
+import { Success } from "../../../rendering/react/components/Success.js";
+import { Filename } from "../../../rendering/react/components/Filename.js";
+import { expirationDateFromFlagsOptional, expireFlags, } from "../../../lib/expires.js";
+export default class Import extends ExecRenderBaseCommand {
+    static description = "Import an existing (local) SSH key";
+    static flags = {
+        ...processFlags,
+        ...expireFlags("SSH key"),
+        input: Flags.string({
+            description: "A filename in your ~/.ssh directory containing the key to import.",
+            default: "id_rsa.pub",
+        }),
+    };
+    async exec() {
+        const inputFile = path.join(os.homedir(), ".ssh", this.flags.input);
+        const r = makeProcessRenderer(this.flags, "Importing an SSH key");
+        const expiresAt = expirationDateFromFlagsOptional(this.flags);
+        const publicKey = await fs.readFile(inputFile, "utf-8");
+        const publicKeyParts = publicKey.split(" ");
+        const keys = await r.runStep("retrieving existing SSH keys", async () => {
+            const response = await this.apiClient.user.listSshKeys();
+            assertStatus(response, 200);
+            return response.data;
+        });
+        const keyAlreadyExists = (keys.sshKeys ?? []).some(({ key }) => publicKeyParts.includes(key));
+        if (keyAlreadyExists) {
+            r.addInfo(_jsxs(_Fragment, { children: ["the SSH key ", _jsx(Filename, { filename: inputFile }), " is already imported."] }));
+            await r.complete(_jsx(SSHKeySuccess, {}));
+            return;
+        }
+        await r.runStep("importing SSH key", async () => {
+            const response = await this.apiClient.user.createSshKey({
+                data: {
+                    publicKey,
+                    expiresAt: expiresAt?.toJSON(),
+                },
+            });
+            assertStatus(response, 201);
+        });
+        await r.complete(_jsx(SSHKeySuccess, {}));
+    }
+    render() {
+        return null;
+    }
+}
+function SSHKeySuccess() {
+    return (_jsx(Success, { children: "Your SSH key was successfully read and imported to your user profile." }));
+}

package/dist/lib/api_consistency.d.ts

@@ -0,0 +1,2 @@
+import { AxiosInstance } from "@mittwald/api-client-commons";
+export declare function configureConsistencyHandling(axios: AxiosInstance): void;

package/dist/lib/api_consistency.js

@@ -0,0 +1,21 @@
+import debug from "debug";
+const d = debug("mw:api-consistency");
+export function configureConsistencyHandling(axios) {
+    let lastEventId = undefined;
+    axios.interceptors.request.use((config) => {
+        if (lastEventId !== undefined) {
+            d("setting if-event-reached to %o", lastEventId);
+            config.headers["if-event-reached"] = lastEventId;
+        }
+        return config;
+    });
+    axios.interceptors.response.use((response) => {
+        const isMutatingRequest = ["post", "put", "delete", "patch"].indexOf(response.config?.method?.toLowerCase() ?? "") >= 0;
+        const headers = response.headers;
+        if (headers.has("etag") && isMutatingRequest) {
+            d("setting last event id to %o after mutating request", headers.get("etag"));
+            lastEventId = headers.get("etag");
+        }
+        return response;
+    });
+}

package/dist/lib/api_retry.d.ts

@@ -0,0 +1,2 @@
+import { AxiosInstance } from "@mittwald/api-client-commons";
+export declare function configureAxiosRetry(axios: AxiosInstance): void;

package/dist/lib/api_retry.js

@@ -0,0 +1,29 @@
+import debug from "debug";
+import axiosRetry from "axios-retry";
+const d = debug("mw:api-retry");
+export function configureAxiosRetry(axios) {
+    axios.interceptors.request.use((config) => {
+        return {
+            ...config,
+            validateStatus: (status) => status < 300,
+        };
+    });
+    axiosRetry(axios, {
+        retries: 10,
+        retryDelay: axiosRetry.exponentialDelay,
+        onRetry(count, error) {
+            d("retrying request after %d attempts; error: %o", count, error.message);
+        },
+        retryCondition(error) {
+            if (error.code === "ERR_FR_TOO_MANY_REDIRECTS") {
+                return false;
+            }
+            if (axiosRetry.isNetworkOrIdempotentRequestError(error)) {
+                return true;
+            }
+            const isSafeRequest = error.config?.method?.toLowerCase() === "get";
+            const isAccessDenied = error.response?.status === 403;
+            return isSafeRequest && isAccessDenied;
+        },
+    });
+}

package/dist/lib/app/Installer.js

@@ -33,10 +33,10 @@ export class AppInstaller {
         const projectId = await withProjectId(apiClient, "flag", flags, args, config);
         await autofillFlags(apiClient, process, this.appSupportedFlags, flags, projectId, this.appName);
         const appVersion = await normalizeToAppVersionUuid(apiClient, "version" in flags ? flags.version : "latest", process, this.appId);
-        const [appInstallationId, eventId] = await triggerAppInstallation(apiClient, process, projectId, flags, appVersion);
+        const appInstallationId = await triggerAppInstallation(apiClient, process, projectId, flags, appVersion);
         let successText;
         if (flags.wait) {
-            await waitUntilAppIsInstalled(apiClient, process, appInstallationId, eventId);
+            await waitUntilAppIsInstalled(apiClient, process, appInstallationId);
             successText = `Your ${this.appName} installation is now complete. Have fun! 🎉`;
         }
         else {

package/dist/lib/app/install.d.ts

@@ -1,5 +1,5 @@
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
 import { ProcessRenderer } from "../../rendering/process/process.js";
 type AppAppVersion = MittwaldAPIV2.Components.Schemas.AppAppVersion;
-export declare function triggerAppInstallation(apiClient: MittwaldAPIV2Client, process: ProcessRenderer, projectId: string, flags: Record<string, string>, appVersion: AppAppVersion): Promise<string[]>;
+export declare function triggerAppInstallation(apiClient: MittwaldAPIV2Client, process: ProcessRenderer, projectId: string, flags: Record<string, string>, appVersion: AppAppVersion): Promise<string>;
 export {};

package/dist/lib/app/install.js

@@ -1,6 +1,6 @@
 import { assertStatus } from "@mittwald/api-client-commons";
 export async function triggerAppInstallation(apiClient, process, projectId, flags, appVersion) {
-    const [appInstallationId, eventId] = await process.runStep("starting installation", async () => {
+    const appInstallationId = await process.runStep("starting installation", async () => {
         const result = await apiClient.app.requestAppinstallation({
             projectId,
             data: {
@@ -14,7 +14,7 @@ export async function triggerAppInstallation(apiClient, process, projectId, flag
             },
         });
         assertStatus(result, 201);
-        return [result.data.id, result.headers["etag"]];
+        return result.data.id;
     });
     await process.runStep("waiting for installation to be retrievable", async () => {
         for (let attempts = 0; attempts < 10; attempts++) {
@@ -31,7 +31,6 @@ export async function triggerAppInstallation(apiClient, process, projectId, flag
         await process.runStep("setting document root", async () => {
             const result = await apiClient.app.patchAppinstallation({
                 appInstallationId,
-                headers: { "if-event-reached": eventId },
                 data: {
                     customDocumentRoot: flags["document-root"],
                 },
@@ -39,5 +38,5 @@ export async function triggerAppInstallation(apiClient, process, projectId, flag
             assertStatus(result, 204);
         });
     }
-    return [appInstallationId, eventId];
+    return appInstallationId;
 }

package/dist/lib/app/wait.d.ts

@@ -1,3 +1,3 @@
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import { ProcessRenderer } from "../../rendering/process/process.js";
-export declare function waitUntilAppIsInstalled(apiClient: MittwaldAPIV2Client, process: ProcessRenderer, appInstallationId: string, eventId: string): Promise<void>;
+export declare function waitUntilAppIsInstalled(apiClient: MittwaldAPIV2Client, process: ProcessRenderer, appInstallationId: string): Promise<void>;

package/dist/lib/app/wait.js

@@ -1,13 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { waitUntil } from "../wait.js";
 import { Text } from "ink";
-export async function waitUntilAppIsInstalled(apiClient, process, appInstallationId, eventId) {
+export async function waitUntilAppIsInstalled(apiClient, process, appInstallationId) {
     const stepWaiting = process.addStep(_jsx(Text, { children: "waiting for app installation to be ready" }));
     await waitUntil(async () => {
         const installationResponse = await apiClient.app.getAppinstallation({
             appInstallationId,
-            // TODO: Remove once @mittwald/api-client supports this
-            headers: { "if-event-reached": eventId }, // eslint-disable-line
         });
         if (installationResponse.status === 200 &&
             installationResponse.data.appVersion.current ==

package/dist/lib/database/mysql/flags.d.ts

@@ -1,4 +1,3 @@
-import { Config } from "@oclif/core";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import { ArgOutput, FlagOutput } from "@oclif/core/lib/interfaces/parser.js";
 export declare const mysqlConnectionFlags: {
@@ -7,4 +6,4 @@ export declare const mysqlConnectionFlags: {
 export declare const mysqlArgs: {
     "database-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
 };
-export declare function withMySQLId(apiClient: MittwaldAPIV2Client, flags: FlagOutput, args: ArgOutput, cfg: Config): Promise<string>;
+export declare function withMySQLId(apiClient: MittwaldAPIV2Client, flags: FlagOutput, args: ArgOutput): Promise<string>;

package/dist/lib/database/mysql/flags.js

@@ -1,6 +1,4 @@
 import { Args, Flags } from "@oclif/core";
-import { isUuid } from "../../../normalize_id.js";
-import { withProjectId } from "../../project/flags.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 export const mysqlConnectionFlags = {
     "mysql-password": Flags.string({
@@ -17,7 +15,7 @@ NOTE: This is a security risk, as the password will be visible in the process li
 };
 export const mysqlArgs = {
     "database-id": Args.string({
-        description: "The ID of the database (when a project context is set, you can also use the name)",
+        description: "The ID or name of the database",
         required: true,
     }),
 };
@@ -30,19 +28,11 @@ function getIdCandidate(flags, args) {
     }
     throw new Error("No ID given");
 }
-export async function withMySQLId(apiClient, flags, args, cfg) {
-    const candidate = getIdCandidate(flags, args);
-    if (isUuid(candidate)) {
-        return candidate;
-    }
-    const projectId = await withProjectId(apiClient, "flag", flags, args, cfg);
-    const databases = await apiClient.database.listMysqlDatabases({
-        projectId,
+export async function withMySQLId(apiClient, flags, args) {
+    const mysqlDatabaseId = getIdCandidate(flags, args);
+    const response = await apiClient.database.getMysqlDatabase({
+        mysqlDatabaseId,
     });
-    assertStatus(databases, 200);
-    const database = databases.data.find((db) => db.name === candidate);
-    if (!database) {
-        throw new Error(`No database with name "${candidate}" found`);
-    }
-    return database.id;
+    assertStatus(response, 200);
+    return response.data.id;
 }

package/dist/lib/ddev/config.d.ts

@@ -15,7 +15,19 @@ export interface DDEVConfig {
     web_environment: string[];
     docroot: string;
     database: DDEVDatabaseConfig;
+    hooks: DDEVHooks;
 }
+export type DDEVHookEvent = "start" | "import-db" | "import-files" | "composer" | "stop" | "config" | "exec" | "pull" | "push" | "snapshot" | "restore-snapshot";
+export type DDEVHooks = {
+    [k in `pre-${DDEVHookEvent}`]?: DDEVHook[];
+} & {
+    [k in `post-${DDEVHookEvent}`]?: DDEVHook[];
+};
+export type DDEVHook = {
+    exec: string;
+} | {
+    "exec-host": string;
+};
 export interface DDEVDatabaseConfig {
     type: string;
     version: string;

package/dist/lib/ddev/config_builder.d.ts

@@ -4,6 +4,7 @@ export declare class DDEVConfigBuilder {
     private apiClient;
     constructor(apiClient: MittwaldAPIV2Client);
     build(appInstallationId: string, type: string): Promise<Partial<DDEVConfig>>;
+    private buildHooks;
     private determineDocumentRoot;
     private determineProjectType;
     private determineDatabaseVersion;

package/dist/lib/ddev/config_builder.js

@@ -11,9 +11,10 @@ export class DDEVConfigBuilder {
     async build(appInstallationId, type) {
         const appInstallation = await this.getAppInstallation(appInstallationId);
         const systemSoftwares = await this.buildSystemSoftwareVersionMap(appInstallation);
+        type = await this.determineProjectType(appInstallation, type);
         return {
             override_config: true,
-            type: await this.determineProjectType(appInstallation, type),
+            type,
             webserver_type: "apache-fpm",
             php_version: this.determinePHPVersion(systemSoftwares),
             database: await this.determineDatabaseVersion(appInstallation),
@@ -21,6 +22,25 @@ export class DDEVConfigBuilder {
             web_environment: [
                 `MITTWALD_APP_INSTALLATION_ID=${appInstallation.shortId}`,
             ],
+            hooks: this.buildHooks(type),
+        };
+    }
+    buildHooks(type) {
+        const postPull = [
+            { "exec-host": "ddev config --project-name $DDEV_PROJECT" },
+            { "exec-host": "ddev restart" },
+        ];
+        if (type === "typo3") {
+            postPull.push({ exec: "typo3 cache:flush" }, { exec: "typo3 cache:warmup" });
+        }
+        if (type === "wordpress") {
+            postPull.push({ exec: "wp cache flush" });
+        }
+        if (type === "shopware6") {
+            postPull.push({ exec: "bin/console cache:clear" });
+        }
+        return {
+            "post-pull": postPull,
         };
     }
     async determineDocumentRoot(inst) {

package/dist/rendering/process/components/ProcessStateIcon.js

@@ -1,8 +1,8 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Text } from "ink";
 export const ProcessStateIcon = ({ step }) => {
     if (step.type === "info") {
-        return _jsxs(Text, { children: ["\u2139\uFE0F", "  "] });
+        return _jsx(Text, { children: "\uD83D\uDCA1 " });
     }
     else if (step.type === "confirm" || step.type === "input") {
         return _jsx(Text, { children: "\u2753" });

package/dist/rendering/react/hooks/useIncreaseInkStdoutColumns.js

@@ -4,6 +4,6 @@ export const useIncreaseInkStdoutColumns = () => {
     const stdout = useStdout().stdout;
     if (!stdout.isTTY) {
         // Not using Number.MAX_SAFE_INTEGER here because Ink will fail otherwise
-        stdout.columns = 100000;
+        stdout.columns = 100_000;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/cli",
-  "version": "1.0.0-alpha.37",
+  "version": "1.0.0-alpha.39",
   "description": "Hand-crafted CLI for the mittwald API",
   "license": "MIT",
   "author": {
@@ -32,25 +32,24 @@
     "post:generate": "yarn run -T compile && yarn run -T compile:cjs",
     "test": "yarn test:format && yarn test:licenses && yarn test:unit",
     "test:format": "yarn lint && yarn format --check",
-    "test:unit": "mocha --forbid-only \"src/**/*.test.ts\"",
     "test:licenses": "yarn license-check --summary --unknown --failOn 'UNLICENSED;UNKNOWN'",
-    "test:readme": "yarn generate:readme && git diff --exit-code README.md"
+    "test:readme": "yarn generate:readme && git diff --exit-code README.md",
+    "test:unit": "mocha --forbid-only \"src/**/*.test.ts\""
   },
   "files": [
     ".deps",
-    "dist/**/*.{js,d.ts}",
-    "bin"
+    "bin",
+    "dist/**/*.{js,d.ts}"
   ],
   "dependencies": {
     "@mittwald/api-client": "^4.9.0",
-    "@mittwald/api-client-commons": "^4.2.2",
     "@mittwald/react-use-promise": "^2.1.2",
     "@oclif/core": "^3.18.1",
     "@oclif/plugin-autocomplete": "^3.0.3",
     "@oclif/plugin-help": "^6.0.5",
     "@oclif/plugin-update": "^4.1.3",
     "@oclif/plugin-warn-if-update-available": "^3.0.2",
-    "axios": "^1.5.0",
+    "axios-retry": "^4.0.0",
     "chalk": "^5.3.0",
     "date-fns": "^3.2.0",
     "humanize-string": "^3.0.0",
@@ -66,6 +65,7 @@
     "pretty-bytes": "^6.1.0",
     "react": "^18.2.0",
     "semver": "^7.5.4",
+    "semver-parser": "^4.1.6",
     "shell-escape": "^0.2.0",
     "tempfile": "^5.0.0"
   },