From 9143a34819d25d55026c0bd66bb91964b7a2192a Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Tue, 5 Mar 2024 17:11:47 +0100
Subject: [PATCH 01/12] Add retry for API operations that may be eventually
 consistent

---
 src/commands/database/mysql/create.tsx | 120 ++++++++++++++++---------
 src/lib/api_retry.ts                   |  77 ++++++++++++++++
 2 files changed, 155 insertions(+), 42 deletions(-)
 create mode 100644 src/lib/api_retry.ts

diff --git a/src/commands/database/mysql/create.tsx b/src/commands/database/mysql/create.tsx
index 5ba032b9..c1cc9a46 100644
--- a/src/commands/database/mysql/create.tsx
+++ b/src/commands/database/mysql/create.tsx
@@ -11,6 +11,11 @@ import { Text } from "ink";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Value } from "../../../rendering/react/components/Value.js";
+import { withAttemptsToSuccess } from "../../../lib/api_retry.js";
+import type { MittwaldAPIV2 } from "@mittwald/api-client";
+
+type Database = MittwaldAPIV2.Components.Schemas.DatabaseMySqlDatabase;
+type User = MittwaldAPIV2.Components.Schemas.DatabaseMySqlUser;
 
 type Result = {
   databaseId: string;
@@ -71,59 +76,75 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
 
     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 as "full" | "readonly",
-          },
-        },
-      });
-
-      assertStatus(r, 201);
-      return r.data;
-    });
+    const db = await this.createMySQLDatabase(
+      p,
+      projectId,
+      description,
+      version,
+      collation,
+      characterSet,
+      password,
+      externalAccess,
+      accessLevel,
+    );
 
     const database = await p.runStep("fetching database", async () => {
-      const r = await this.apiClient.database.getMysqlDatabase({
-        mysqlDatabaseId: db.id,
-      });
-      assertStatus(r, 200);
-
-      return r.data;
+      const getWithRetry = withAttemptsToSuccess(
+        this.apiClient.database.getMysqlDatabase,
+      );
+      return (await getWithRetry({ mysqlDatabaseId: db.id })).data;
     });
 
     const user = await p.runStep("fetching user", async () => {
-      const r = await this.apiClient.database.getMysqlUser({
-        mysqlUserId: db.userId,
-      });
-      assertStatus(r, 200);
-
-      return r.data;
+      const getWithRetry = withAttemptsToSuccess(
+        this.apiClient.database.getMysqlUser,
+      );
+      return (await getWithRetry({ mysqlUserId: db.userId })).data;
     });
 
-    p.complete(
-      <Success>
-        The database <Value>{database.name}</Value> and the user{" "}
-        <Value>{user.name}</Value> were successfully created.
-      </Success>,
-    );
+    await p.complete(<DatabaseCreateSuccess database={database} user={user} />);
 
     return { databaseId: db.id, userId: db.userId };
   }
 
+  private async createMySQLDatabase(
+    p: ProcessRenderer,
+    projectId: string,
+    description: string,
+    version: string,
+    collation: string,
+    characterSet: string,
+    password: string,
+    externalAccess: boolean,
+    accessLevel: string,
+  ) {
+    return await p.runStep("creating MySQL database", async () => {
+      const characterSettings = { collation, characterSet };
+      const database = {
+        projectId,
+        description,
+        version,
+        characterSettings,
+      };
+      const user = {
+        password,
+        externalAccess,
+        accessLevel: accessLevel as "full" | "readonly",
+      };
+
+      const r = await this.apiClient.database.createMysqlDatabase({
+        projectId,
+        data: {
+          database,
+          user,
+        },
+      });
+
+      assertStatus(r, 201);
+      return r.data;
+    });
+  }
+
   private async getPassword(p: ProcessRenderer): Promise<string> {
     if (this.flags["user-password"]) {
       return this.flags["user-password"];
@@ -138,3 +159,18 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
     }
   }
 }
+
+function DatabaseCreateSuccess({
+  database,
+  user,
+}: {
+  database: Database;
+  user: User;
+}) {
+  return (
+    <Success>
+      The database <Value>{database.name}</Value> and the user{" "}
+      <Value>{user.name}</Value> were successfully created.
+    </Success>
+  );
+}
diff --git a/src/lib/api_retry.ts b/src/lib/api_retry.ts
new file mode 100644
index 00000000..70d554e4
--- /dev/null
+++ b/src/lib/api_retry.ts
@@ -0,0 +1,77 @@
+import { Response } from "@mittwald/api-client-commons";
+import debug from "debug";
+
+const d = debug("mw:api-retry");
+
+type BackoffFunction = (attempt: number) => number;
+
+type RetryOptions = {
+  attempts: number;
+  backoff: BackoffFunction;
+};
+
+/**
+ * Contains a collection of backoff strategies for use with
+ * `withAttemptsToSuccess`.
+ */
+export const backoffStrategies = {
+  exponential: (initial: number, base: number) => (attempt: number) =>
+    initial * base ** attempt,
+  linear: (step: number) => (attempt: number) => step * attempt,
+  max: (inner: BackoffFunction, max: number) => (attempt: number) =>
+    Math.min(inner(attempt), max),
+};
+
+/**
+ * Wraps an API call function and retries it until it returns a successful
+ * response.
+ *
+ * On non-successful responses, it waits for a (configurable) backoff time
+ * before retrying.
+ *
+ * Usage:
+ *
+ *     const getMysqlDatabase = withAttemptsToSuccess(
+ *       this.apiClient.database.getMysqlDatabase,
+ *     );
+ *     return (await getWithRetry({ mysqlDatabaseId })).data;
+ */
+export function withAttemptsToSuccess<TReq, TRes extends Response>(
+  fn: (req: TReq) => Promise<TRes>,
+  {
+    attempts = 50,
+    backoff = backoffStrategies.max(
+      backoffStrategies.exponential(100, 1.2),
+      2000,
+    ),
+  }: Partial<RetryOptions> = {},
+) {
+  return async function (req: TReq) {
+    let response: TRes | undefined;
+    for (let i = 0; i < attempts; i++) {
+      response = await fn(req);
+      const waitFor = backoff(i);
+
+      if (isStatus(response, 200)) {
+        return response;
+      }
+
+      d("received status %d, waiting for %d ms", response.status, waitFor);
+
+      await new Promise((resolve) => setTimeout(resolve, backoff(i)));
+    }
+
+    throw new Error(
+      `received status ${response?.status} after ${attempts} attempts`,
+    );
+  };
+}
+
+function isStatus<T extends Response, S extends T["status"]>(
+  response: T,
+  expectedStatus: S,
+): response is T & {
+  status: S;
+} {
+  return response.status === expectedStatus;
+}

From c85d56c23b2561ddd65c01732ed3e80bdb9b20f2 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Tue, 5 Mar 2024 17:19:20 +0100
Subject: [PATCH 02/12] Also use "if-event-reached" mechanic

---
 src/commands/database/mysql/create.tsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/commands/database/mysql/create.tsx b/src/commands/database/mysql/create.tsx
index c1cc9a46..80bed309 100644
--- a/src/commands/database/mysql/create.tsx
+++ b/src/commands/database/mysql/create.tsx
@@ -76,7 +76,7 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
 
     const password = await this.getPassword(p);
 
-    const db = await this.createMySQLDatabase(
+    const [db, eventId] = await this.createMySQLDatabase(
       p,
       projectId,
       description,
@@ -92,14 +92,24 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
       const getWithRetry = withAttemptsToSuccess(
         this.apiClient.database.getMysqlDatabase,
       );
-      return (await getWithRetry({ mysqlDatabaseId: db.id })).data;
+      return (
+        await getWithRetry({
+          mysqlDatabaseId: db.id,
+          headers: { "if-event-reached": eventId },
+        })
+      ).data;
     });
 
     const user = await p.runStep("fetching user", async () => {
       const getWithRetry = withAttemptsToSuccess(
         this.apiClient.database.getMysqlUser,
       );
-      return (await getWithRetry({ mysqlUserId: db.userId })).data;
+      return (
+        await getWithRetry({
+          mysqlUserId: db.userId,
+          headers: { "if-event-reached": eventId },
+        })
+      ).data;
     });
 
     await p.complete(<DatabaseCreateSuccess database={database} user={user} />);
@@ -141,7 +151,7 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
       });
 
       assertStatus(r, 201);
-      return r.data;
+      return [r.data, r.headers["etag"]];
     });
   }
 

From 30f6b51bc4150120dc1dc7f4a71bfff5a0273e15 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 09:06:43 +0100
Subject: [PATCH 03/12] Refactor parameters of "createMySQLDatabase" function

---
 src/commands/database/mysql/create.tsx | 55 +++++++++++++-------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/commands/database/mysql/create.tsx b/src/commands/database/mysql/create.tsx
index 80bed309..ccfd81e0 100644
--- a/src/commands/database/mysql/create.tsx
+++ b/src/commands/database/mysql/create.tsx
@@ -79,13 +79,19 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
     const [db, eventId] = await this.createMySQLDatabase(
       p,
       projectId,
-      description,
-      version,
-      collation,
-      characterSet,
-      password,
-      externalAccess,
-      accessLevel,
+      {
+        description,
+        version,
+        characterSettings: {
+          collation,
+          characterSet,
+        },
+      },
+      {
+        password,
+        externalAccess,
+        accessLevel: accessLevel as "full" | "readonly",
+      },
     );
 
     const database = await p.runStep("fetching database", async () => {
@@ -120,32 +126,25 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
   private async createMySQLDatabase(
     p: ProcessRenderer,
     projectId: string,
-    description: string,
-    version: string,
-    collation: string,
-    characterSet: string,
-    password: string,
-    externalAccess: boolean,
-    accessLevel: string,
+    database: {
+      description: string;
+      version: string;
+      characterSettings: {
+        collation: string;
+        characterSet: string;
+      };
+    },
+    user: {
+      password: string;
+      externalAccess: boolean;
+      accessLevel: "full" | "readonly";
+    },
   ) {
     return await p.runStep("creating MySQL database", async () => {
-      const characterSettings = { collation, characterSet };
-      const database = {
-        projectId,
-        description,
-        version,
-        characterSettings,
-      };
-      const user = {
-        password,
-        externalAccess,
-        accessLevel: accessLevel as "full" | "readonly",
-      };
-
       const r = await this.apiClient.database.createMysqlDatabase({
         projectId,
         data: {
-          database,
+          database: { projectId, ...database },
           user,
         },
       });

From 94c2b197c2411747e8f02248b1202f203b72a789 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 09:55:00 +0100
Subject: [PATCH 04/12] Add test case for request retrying

---
 src/commands/database/mysql/create.test.ts | 118 +++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 src/commands/database/mysql/create.test.ts

diff --git a/src/commands/database/mysql/create.test.ts b/src/commands/database/mysql/create.test.ts
new file mode 100644
index 00000000..1981b887
--- /dev/null
+++ b/src/commands/database/mysql/create.test.ts
@@ -0,0 +1,118 @@
+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";
+  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}`).reply(200, {
+        id: userId,
+        name: "dbu_xxxxxx",
+      });
+    })
+    .env({ MITTWALD_API_TOKEN: "foo" })
+    .stdout()
+    .command([
+      "database mysql create",
+      "--project-id",
+      projectId,
+      "--version",
+      "8.0",
+      "--description",
+      "Test",
+      "--user-password",
+      "secret",
+    ])
+    .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}`).reply(403, {
+        id: userId,
+        times: 3,
+        name: "dbu_xxxxxx",
+      });
+
+      api.get(`/v2/mysql-users/${userId}`).reply(200, {
+        id: userId,
+        name: "dbu_xxxxxx",
+      });
+    })
+    .env({ MITTWALD_API_TOKEN: "foo" })
+    .stdout()
+    .command([
+      "database mysql create",
+      "--project-id",
+      projectId,
+      "--version",
+      "8.0",
+      "--description",
+      "Test",
+      "--user-password",
+      "secret",
+    ])
+    .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");
+    });
+});

From cf583200f6f8de1246f792630fbe9e101d750c6b Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 13:49:51 +0100
Subject: [PATCH 05/12] Simplify handling of mysql flags

---
 README.md                                    | 12 ++++-----
 src/commands/database/mysql/delete.ts        |  1 -
 src/commands/database/mysql/dump.tsx         |  7 +----
 src/commands/database/mysql/get.ts           |  1 -
 src/commands/database/mysql/phpmyadmin.ts    |  7 +----
 src/commands/database/mysql/port-forward.tsx |  7 +----
 src/commands/database/mysql/shell.tsx        |  7 +----
 src/lib/database/mysql/flags.ts              | 28 +++++---------------
 8 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 6d230b2b..db48afba 100644
--- a/README.md
+++ b/README.md
@@ -2280,7 +2280,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 +2305,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 +2365,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 +2415,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 +2427,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 +2457,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)
diff --git a/src/commands/database/mysql/delete.ts b/src/commands/database/mysql/delete.ts
index f584fb9c..b30b7146 100644
--- a/src/commands/database/mysql/delete.ts
+++ b/src/commands/database/mysql/delete.ts
@@ -15,7 +15,6 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
       this.apiClient,
       this.flags,
       this.args,
-      this.config,
     );
     const response = await this.apiClient.database.deleteMysqlDatabase({
       mysqlDatabaseId,
diff --git a/src/commands/database/mysql/dump.tsx b/src/commands/database/mysql/dump.tsx
index c205f369..b31a33ed 100644
--- a/src/commands/database/mysql/dump.tsx
+++ b/src/commands/database/mysql/dump.tsx
@@ -58,12 +58,7 @@ export class Dump extends ExecRenderBaseCommand<
   static args = { ...mysqlArgs };
 
   protected async exec(): Promise<Record<string, never>> {
-    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(
diff --git a/src/commands/database/mysql/get.ts b/src/commands/database/mysql/get.ts
index 14a1ae3c..a2cd5306 100644
--- a/src/commands/database/mysql/get.ts
+++ b/src/commands/database/mysql/get.ts
@@ -21,7 +21,6 @@ export abstract class Get extends GetBaseCommand<typeof Get, APIResponse> {
       this.apiClient,
       this.flags,
       this.args,
-      this.config,
     );
     return await this.apiClient.database.getMysqlDatabase({
       mysqlDatabaseId,
diff --git a/src/commands/database/mysql/phpmyadmin.ts b/src/commands/database/mysql/phpmyadmin.ts
index de5648d6..89d2c67a 100644
--- a/src/commands/database/mysql/phpmyadmin.ts
+++ b/src/commands/database/mysql/phpmyadmin.ts
@@ -10,12 +10,7 @@ export class PhpMyAdmin extends BaseCommand {
 
   public async run(): Promise<void> {
     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,
     });
diff --git a/src/commands/database/mysql/port-forward.tsx b/src/commands/database/mysql/port-forward.tsx
index 0c38efbb..556b1500 100644
--- a/src/commands/database/mysql/port-forward.tsx
+++ b/src/commands/database/mysql/port-forward.tsx
@@ -28,12 +28,7 @@ export class PortForward extends ExecRenderBaseCommand<
   static args = { ...mysqlArgs };
 
   protected async exec(): Promise<Record<string, never>> {
-    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",
diff --git a/src/commands/database/mysql/shell.tsx b/src/commands/database/mysql/shell.tsx
index 48f29670..502633df 100644
--- a/src/commands/database/mysql/shell.tsx
+++ b/src/commands/database/mysql/shell.tsx
@@ -25,12 +25,7 @@ export class Shell extends ExecRenderBaseCommand<
   static args = { ...mysqlArgs };
 
   protected async exec(): Promise<Record<string, never>> {
-    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 } =
diff --git a/src/lib/database/mysql/flags.ts b/src/lib/database/mysql/flags.ts
index 0d85f86d..ce4a0806 100644
--- a/src/lib/database/mysql/flags.ts
+++ b/src/lib/database/mysql/flags.ts
@@ -1,8 +1,6 @@
-import { Args, Config, Flags } from "@oclif/core";
+import { Args, Flags } from "@oclif/core";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import { ArgOutput, FlagOutput } from "@oclif/core/lib/interfaces/parser.js";
-import { isUuid } from "../../../normalize_id.js";
-import { withProjectId } from "../../project/flags.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 
 export const mysqlConnectionFlags = {
@@ -21,8 +19,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,
   }),
 };
@@ -43,24 +40,13 @@ export async function withMySQLId(
   apiClient: MittwaldAPIV2Client,
   flags: FlagOutput,
   args: ArgOutput,
-  cfg: Config,
 ): Promise<string> {
-  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,
+  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`);
-  }
+  assertStatus(response, 200);
 
-  return database.id;
+  return response.data.id;
 }

From b18b9d95186a5b77c52717cd154c4f7f57f46d00 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 13:54:36 +0100
Subject: [PATCH 06/12] Use axios-retry instead of custom logic

---
 ...-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip | Bin 0 -> 10162 bytes
 ...llowed-npm-2.2.0-b4b58fc581-3d1103a929.zip | Bin 0 -> 3438 bytes
 package.json                                  |  11 +-
 src/BaseCommand.ts                            |   8 ++
 src/commands/database/mysql/create.tsx        |  31 +++---
 src/lib/api_retry.ts                          |  95 +++++-------------
 yarn.lock                                     |  25 ++++-
 7 files changed, 73 insertions(+), 97 deletions(-)
 create mode 100644 .yarn/cache/axios-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip
 create mode 100644 .yarn/cache/is-retry-allowed-npm-2.2.0-b4b58fc581-3d1103a929.zip

diff --git a/.yarn/cache/axios-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip b/.yarn/cache/axios-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip
new file mode 100644
index 0000000000000000000000000000000000000000..286f90237e0f0dc72da525c39bc5594738945e17
GIT binary patch
literal 10162
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

literal 0
HcmV?d00001

diff --git a/.yarn/cache/is-retry-allowed-npm-2.2.0-b4b58fc581-3d1103a929.zip b/.yarn/cache/is-retry-allowed-npm-2.2.0-b4b58fc581-3d1103a929.zip
new file mode 100644
index 0000000000000000000000000000000000000000..e849b48448d98cf6b81eed53d7e2eb333eb95a97
GIT binary patch
literal 3438
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
H@bm5u;h42E

literal 0
HcmV?d00001

diff --git a/package.json b/package.json
index d580e284..3679f9d7 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/BaseCommand.ts b/src/BaseCommand.ts
index 98e99b4e..ae5063f1 100644
--- a/src/BaseCommand.ts
+++ b/src/BaseCommand.ts
@@ -2,6 +2,11 @@ import { Command } from "@oclif/core";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
+import axiosRetry from "axios-retry";
+import debug from "debug";
+import { configureAxiosRetry } from "./lib/api_retry.js";
+
+const d = debug("mw:base");
 
 export abstract class BaseCommand extends Command {
   protected authenticationRequired = true;
@@ -17,9 +22,12 @@ export abstract class BaseCommand extends Command {
           `Could not get token from either config file (${this.getTokenFilename()}) or environment`,
         );
       }
+
       this.apiClient = MittwaldAPIV2Client.newWithToken(token);
       this.apiClient.axios.defaults.headers["User-Agent"] =
         `mittwald-cli/${this.config.version}`;
+
+      configureAxiosRetry(this.apiClient.axios);
     }
   }
 
diff --git a/src/commands/database/mysql/create.tsx b/src/commands/database/mysql/create.tsx
index ccfd81e0..cff53c7e 100644
--- a/src/commands/database/mysql/create.tsx
+++ b/src/commands/database/mysql/create.tsx
@@ -11,7 +11,6 @@ import { Text } from "ink";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Value } from "../../../rendering/react/components/Value.js";
-import { withAttemptsToSuccess } from "../../../lib/api_retry.js";
 import type { MittwaldAPIV2 } from "@mittwald/api-client";
 
 type Database = MittwaldAPIV2.Components.Schemas.DatabaseMySqlDatabase;
@@ -95,27 +94,21 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
     );
 
     const database = await p.runStep("fetching database", async () => {
-      const getWithRetry = withAttemptsToSuccess(
-        this.apiClient.database.getMysqlDatabase,
-      );
-      return (
-        await getWithRetry({
-          mysqlDatabaseId: db.id,
-          headers: { "if-event-reached": eventId },
-        })
-      ).data;
+      const response = await this.apiClient.database.getMysqlDatabase({
+        mysqlDatabaseId: db.id,
+        headers: { "if-event-reached": eventId },
+      });
+      assertStatus(response, 200);
+      return response.data;
     });
 
     const user = await p.runStep("fetching user", async () => {
-      const getWithRetry = withAttemptsToSuccess(
-        this.apiClient.database.getMysqlUser,
-      );
-      return (
-        await getWithRetry({
-          mysqlUserId: db.userId,
-          headers: { "if-event-reached": eventId },
-        })
-      ).data;
+      const response = await this.apiClient.database.getMysqlUser({
+        mysqlUserId: db.userId,
+        headers: { "if-event-reached": eventId },
+      });
+      assertStatus(response, 200);
+      return response.data;
     });
 
     await p.complete(<DatabaseCreateSuccess database={database} user={user} />);
diff --git a/src/lib/api_retry.ts b/src/lib/api_retry.ts
index 70d554e4..55e5f54d 100644
--- a/src/lib/api_retry.ts
+++ b/src/lib/api_retry.ts
@@ -1,77 +1,36 @@
-import { Response } from "@mittwald/api-client-commons";
+import { AxiosInstance, Response } from "@mittwald/api-client-commons";
 import debug from "debug";
+import axiosRetry from "axios-retry";
 
 const d = debug("mw:api-retry");
 
-type BackoffFunction = (attempt: number) => number;
-
-type RetryOptions = {
-  attempts: number;
-  backoff: BackoffFunction;
-};
-
-/**
- * Contains a collection of backoff strategies for use with
- * `withAttemptsToSuccess`.
- */
-export const backoffStrategies = {
-  exponential: (initial: number, base: number) => (attempt: number) =>
-    initial * base ** attempt,
-  linear: (step: number) => (attempt: number) => step * attempt,
-  max: (inner: BackoffFunction, max: number) => (attempt: number) =>
-    Math.min(inner(attempt), max),
-};
-
-/**
- * Wraps an API call function and retries it until it returns a successful
- * response.
- *
- * On non-successful responses, it waits for a (configurable) backoff time
- * before retrying.
- *
- * Usage:
- *
- *     const getMysqlDatabase = withAttemptsToSuccess(
- *       this.apiClient.database.getMysqlDatabase,
- *     );
- *     return (await getWithRetry({ mysqlDatabaseId })).data;
- */
-export function withAttemptsToSuccess<TReq, TRes extends Response>(
-  fn: (req: TReq) => Promise<TRes>,
-  {
-    attempts = 50,
-    backoff = backoffStrategies.max(
-      backoffStrategies.exponential(100, 1.2),
-      2000,
-    ),
-  }: Partial<RetryOptions> = {},
-) {
-  return async function (req: TReq) {
-    let response: TRes | undefined;
-    for (let i = 0; i < attempts; i++) {
-      response = await fn(req);
-      const waitFor = backoff(i);
-
-      if (isStatus(response, 200)) {
-        return response;
+export function configureAxiosRetry(axios: AxiosInstance) {
+  axios.interceptors.request.use((config) => {
+    return {
+      ...config,
+      validateStatus: (status) => status < 300,
+    };
+  });
+
+  axiosRetry(axios, {
+    retries: 50,
+    retryDelay: axiosRetry.exponentialDelay,
+    onRetry(count, error) {
+      d("retrying request after %d attempts; error: %o", count, error);
+    },
+    retryCondition(error) {
+      if (error.code === "ERR_FR_TOO_MANY_REDIRECTS") {
+        return false;
       }
 
-      d("received status %d, waiting for %d ms", response.status, waitFor);
-
-      await new Promise((resolve) => setTimeout(resolve, backoff(i)));
-    }
+      if (axiosRetry.isNetworkOrIdempotentRequestError(error)) {
+        return true;
+      }
 
-    throw new Error(
-      `received status ${response?.status} after ${attempts} attempts`,
-    );
-  };
-}
+      const isSafeRequest = error.config?.method?.toLowerCase() === "get";
+      const isAccessDenied = error.response?.status === 403;
 
-function isStatus<T extends Response, S extends T["status"]>(
-  response: T,
-  expectedStatus: S,
-): response is T & {
-  status: S;
-} {
-  return response.status === expectedStatus;
+      return isSafeRequest && isAccessDenied;
+    },
+  });
 }
diff --git a/yarn.lock b/yarn.lock
index 0161d201..5d5fd9a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1530,7 +1530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mittwald/api-client-commons@npm:^4.10.0, @mittwald/api-client-commons@npm:^4.2.2":
+"@mittwald/api-client-commons@npm:^4.10.0":
   version: 4.10.0
   resolution: "@mittwald/api-client-commons@npm:4.10.0"
   dependencies:
@@ -1568,7 +1568,6 @@ __metadata:
   resolution: "@mittwald/cli@workspace:."
   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
@@ -1591,7 +1590,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^7.1.0
     "@typescript-eslint/parser": ^7.0.2
     "@yarnpkg/pnpify": ^4.0.0-rc.48
-    axios: ^1.5.0
+    axios-retry: ^4.0.0
     chalk: ^5.3.0
     date-fns: ^3.2.0
     eslint: ^8.44.0
@@ -4274,7 +4273,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.5.0, axios@npm:^1.6.7":
+"axios-retry@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "axios-retry@npm:4.0.0"
+  dependencies:
+    is-retry-allowed: ^2.2.0
+  peerDependencies:
+    axios: 0.x || 1.x
+  checksum: 132b63132e8087242b8888fdebf3786cfd687e1021970319336a63533b4b584ab23a39d5b5a05e84b96055a640129a25e60b6a6cdb422c4cf10517398238000f
+  languageName: node
+  linkType: hard
+
+"axios@npm:^1.6.7":
   version: 1.6.7
   resolution: "axios@npm:1.6.7"
   dependencies:
@@ -7108,6 +7118,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-retry-allowed@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "is-retry-allowed@npm:2.2.0"
+  checksum: 3d1103a9290b5d03626756a41054844633eac78bc5d3e3a95b13afeae94fa3cfbcf7f0b5520d83f75f48a25ce7b142fdbac4217dc4b0630f3ea55e866ec3a029
+  languageName: node
+  linkType: hard
+
 "is-scoped@npm:^2.1.0":
   version: 2.1.0
   resolution: "is-scoped@npm:2.1.0"

From 8dc920a9801346e1c44c81a4614bd804ce292b34 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 14:34:27 +0100
Subject: [PATCH 07/12] Add centralized handling for eventual consistency

---
 src/BaseCommand.ts                     |  2 ++
 src/commands/database/mysql/create.tsx |  6 ++---
 src/lib/api_consistency.ts             | 33 ++++++++++++++++++++++++++
 src/lib/api_retry.ts                   |  2 +-
 4 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 src/lib/api_consistency.ts

diff --git a/src/BaseCommand.ts b/src/BaseCommand.ts
index ae5063f1..dc2b174c 100644
--- a/src/BaseCommand.ts
+++ b/src/BaseCommand.ts
@@ -5,6 +5,7 @@ import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import axiosRetry from "axios-retry";
 import debug from "debug";
 import { configureAxiosRetry } from "./lib/api_retry.js";
+import { configureConsistencyHandling } from "./lib/api_consistency.js";
 
 const d = debug("mw:base");
 
@@ -28,6 +29,7 @@ export abstract class BaseCommand extends Command {
         `mittwald-cli/${this.config.version}`;
 
       configureAxiosRetry(this.apiClient.axios);
+      configureConsistencyHandling(this.apiClient.axios);
     }
   }
 
diff --git a/src/commands/database/mysql/create.tsx b/src/commands/database/mysql/create.tsx
index cff53c7e..a83bc509 100644
--- a/src/commands/database/mysql/create.tsx
+++ b/src/commands/database/mysql/create.tsx
@@ -75,7 +75,7 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
 
     const password = await this.getPassword(p);
 
-    const [db, eventId] = await this.createMySQLDatabase(
+    const db = await this.createMySQLDatabase(
       p,
       projectId,
       {
@@ -96,7 +96,6 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
     const database = await p.runStep("fetching database", async () => {
       const response = await this.apiClient.database.getMysqlDatabase({
         mysqlDatabaseId: db.id,
-        headers: { "if-event-reached": eventId },
       });
       assertStatus(response, 200);
       return response.data;
@@ -105,7 +104,6 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
     const user = await p.runStep("fetching user", async () => {
       const response = await this.apiClient.database.getMysqlUser({
         mysqlUserId: db.userId,
-        headers: { "if-event-reached": eventId },
       });
       assertStatus(response, 200);
       return response.data;
@@ -143,7 +141,7 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
       });
 
       assertStatus(r, 201);
-      return [r.data, r.headers["etag"]];
+      return r.data;
     });
   }
 
diff --git a/src/lib/api_consistency.ts b/src/lib/api_consistency.ts
new file mode 100644
index 00000000..593c431f
--- /dev/null
+++ b/src/lib/api_consistency.ts
@@ -0,0 +1,33 @@
+import { AxiosHeaders, AxiosInstance } from "@mittwald/api-client-commons";
+import debug from "debug";
+
+const d = debug("mw:api-consistency");
+
+export function configureConsistencyHandling(axios: AxiosInstance) {
+  let lastEventId: string | undefined = 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"].indexOf(
+        response.config?.method?.toLowerCase() ?? "",
+      ) >= 0;
+    const headers = response.headers as AxiosHeaders;
+
+    if (headers.has("etag") && isMutatingRequest) {
+      d(
+        "setting last event id to %o after mutating request",
+        headers.get("etag"),
+      );
+      lastEventId = headers.get("etag") as string;
+    }
+    return response;
+  });
+}
diff --git a/src/lib/api_retry.ts b/src/lib/api_retry.ts
index 55e5f54d..1156ed61 100644
--- a/src/lib/api_retry.ts
+++ b/src/lib/api_retry.ts
@@ -16,7 +16,7 @@ export function configureAxiosRetry(axios: AxiosInstance) {
     retries: 50,
     retryDelay: axiosRetry.exponentialDelay,
     onRetry(count, error) {
-      d("retrying request after %d attempts; error: %o", count, error);
+      d("retrying request after %d attempts; error: %o", count, error.message);
     },
     retryCondition(error) {
       if (error.code === "ERR_FR_TOO_MANY_REDIRECTS") {

From 4e86196983aff975d7e01cdd21d6cedf0ea43ecc Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 14:37:22 +0100
Subject: [PATCH 08/12] Remove explicit consistency handling where is was
 already implemented

---
 src/commands/project/create.tsx |  2 --
 src/lib/app/Installer.tsx       |  9 ++-------
 src/lib/app/install.ts          | 11 +++++------
 src/lib/app/wait.tsx            |  3 ---
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/commands/project/create.tsx b/src/commands/project/create.tsx
index 8a991b84..0764cec7 100644
--- a/src/commands/project/create.tsx
+++ b/src/commands/project/create.tsx
@@ -47,7 +47,6 @@ export default class Create extends ExecRenderBaseCommand<
     });
 
     assertStatus(result, 201);
-    const eventId = result.headers["etag"];
 
     stepCreating.complete();
     process.addInfo(
@@ -64,7 +63,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 (
diff --git a/src/lib/app/Installer.tsx b/src/lib/app/Installer.tsx
index 5674fe28..405a393a 100644
--- a/src/lib/app/Installer.tsx
+++ b/src/lib/app/Installer.tsx
@@ -87,7 +87,7 @@ export class AppInstaller<TFlagName extends AvailableFlagName> {
       this.appId,
     );
 
-    const [appInstallationId, eventId] = await triggerAppInstallation(
+    const appInstallationId = await triggerAppInstallation(
       apiClient,
       process,
       projectId,
@@ -97,12 +97,7 @@ export class AppInstaller<TFlagName extends AvailableFlagName> {
 
     let successText: string;
     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 {
       successText = `Your ${this.appName} installation has started. Have fun when it's ready! 🎉`;
diff --git a/src/lib/app/install.ts b/src/lib/app/install.ts
index fab8c428..f3d57a3c 100644
--- a/src/lib/app/install.ts
+++ b/src/lib/app/install.ts
@@ -10,10 +10,10 @@ export async function triggerAppInstallation(
   projectId: string,
   flags: Record<string, string>,
   appVersion: AppAppVersion,
-) {
-  const [appInstallationId, eventId] = await process.runStep(
+): Promise<string> {
+  const appInstallationId = await process.runStep(
     "starting installation",
-    async (): Promise<[string, string]> => {
+    async (): Promise<string> => {
       const result = await apiClient.app.requestAppinstallation({
         projectId,
         data: {
@@ -28,7 +28,7 @@ export async function triggerAppInstallation(
       });
 
       assertStatus(result, 201);
-      return [result.data.id, result.headers["etag"]];
+      return result.data.id;
     },
   );
 
@@ -52,7 +52,6 @@ export async function triggerAppInstallation(
     await process.runStep("setting document root", async () => {
       const result = await apiClient.app.patchAppinstallation({
         appInstallationId,
-        headers: { "if-event-reached": eventId },
         data: {
           customDocumentRoot: flags["document-root"],
         },
@@ -62,5 +61,5 @@ export async function triggerAppInstallation(
     });
   }
 
-  return [appInstallationId, eventId];
+  return appInstallationId;
 }
diff --git a/src/lib/app/wait.tsx b/src/lib/app/wait.tsx
index cf44ef2e..783d01ac 100644
--- a/src/lib/app/wait.tsx
+++ b/src/lib/app/wait.tsx
@@ -8,7 +8,6 @@ export async function waitUntilAppIsInstalled(
   apiClient: MittwaldAPIV2Client,
   process: ProcessRenderer,
   appInstallationId: string,
-  eventId: string,
 ) {
   const stepWaiting = process.addStep(
     <Text>waiting for app installation to be ready</Text>,
@@ -17,8 +16,6 @@ export async function waitUntilAppIsInstalled(
   await waitUntil(async () => {
     const installationResponse = await apiClient.app.getAppinstallation({
       appInstallationId,
-      // TODO: Remove once @mittwald/api-client supports this
-      headers: { "if-event-reached": eventId } as any, // eslint-disable-line
     });
 
     if (

From 2f830ce7be4185bd94209583c07f7cc792f3aef5 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 14:50:31 +0100
Subject: [PATCH 09/12] Clean up unused imports

---
 src/BaseCommand.ts   | 4 ----
 src/lib/api_retry.ts | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/BaseCommand.ts b/src/BaseCommand.ts
index dc2b174c..874bf7e1 100644
--- a/src/BaseCommand.ts
+++ b/src/BaseCommand.ts
@@ -2,13 +2,9 @@ import { Command } from "@oclif/core";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
-import axiosRetry from "axios-retry";
-import debug from "debug";
 import { configureAxiosRetry } from "./lib/api_retry.js";
 import { configureConsistencyHandling } from "./lib/api_consistency.js";
 
-const d = debug("mw:base");
-
 export abstract class BaseCommand extends Command {
   protected authenticationRequired = true;
   protected apiClient: MittwaldAPIV2Client =
diff --git a/src/lib/api_retry.ts b/src/lib/api_retry.ts
index 1156ed61..90b5f9bd 100644
--- a/src/lib/api_retry.ts
+++ b/src/lib/api_retry.ts
@@ -1,4 +1,4 @@
-import { AxiosInstance, Response } from "@mittwald/api-client-commons";
+import { AxiosInstance } from "@mittwald/api-client-commons";
 import debug from "debug";
 import axiosRetry from "axios-retry";
 

From 67ea44e45b3047f2ad64f59572dc340a7f6adc00 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 14:51:54 +0100
Subject: [PATCH 10/12] Refactor tests

---
 src/commands/database/mysql/create.test.ts | 49 +++++++++-------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/commands/database/mysql/create.test.ts b/src/commands/database/mysql/create.test.ts
index 1981b887..ca3888fb 100644
--- a/src/commands/database/mysql/create.test.ts
+++ b/src/commands/database/mysql/create.test.ts
@@ -4,6 +4,21 @@ 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, {
@@ -13,7 +28,7 @@ describe("database:mysql:create", () => {
         .post(`/v2/projects/${projectId}/mysql-databases`, {
           database: {
             projectId,
-            description: "Test",
+            description,
             version: "8.0",
             characterSettings: {
               collation: "utf8mb4_unicode_ci",
@@ -21,7 +36,7 @@ describe("database:mysql:create", () => {
             },
           },
           user: {
-            password: "secret",
+            password,
             externalAccess: false,
             accessLevel: "full",
           },
@@ -40,17 +55,7 @@ describe("database:mysql:create", () => {
     })
     .env({ MITTWALD_API_TOKEN: "foo" })
     .stdout()
-    .command([
-      "database mysql create",
-      "--project-id",
-      projectId,
-      "--version",
-      "8.0",
-      "--description",
-      "Test",
-      "--user-password",
-      "secret",
-    ])
+    .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");
@@ -86,11 +91,7 @@ describe("database:mysql:create", () => {
         name: "mysql_xxxxxx",
       });
 
-      api.get(`/v2/mysql-users/${userId}`).reply(403, {
-        id: userId,
-        times: 3,
-        name: "dbu_xxxxxx",
-      });
+      api.get(`/v2/mysql-users/${userId}`).times(3).reply(403);
 
       api.get(`/v2/mysql-users/${userId}`).reply(200, {
         id: userId,
@@ -99,17 +100,7 @@ describe("database:mysql:create", () => {
     })
     .env({ MITTWALD_API_TOKEN: "foo" })
     .stdout()
-    .command([
-      "database mysql create",
-      "--project-id",
-      projectId,
-      "--version",
-      "8.0",
-      "--description",
-      "Test",
-      "--user-password",
-      "secret",
-    ])
+    .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");

From 839b0bbddb35a31f493585066d0869b726bd995f Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 15:14:03 +0100
Subject: [PATCH 11/12] Update src/lib/api_consistency.ts

Co-authored-by: Marco Falkenberg <mfal@users.noreply.github.com>
---
 src/lib/api_consistency.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/api_consistency.ts b/src/lib/api_consistency.ts
index 593c431f..bcbb6791 100644
--- a/src/lib/api_consistency.ts
+++ b/src/lib/api_consistency.ts
@@ -16,7 +16,7 @@ export function configureConsistencyHandling(axios: AxiosInstance) {
 
   axios.interceptors.response.use((response) => {
     const isMutatingRequest =
-      ["post", "put", "delete"].indexOf(
+      ["post", "put", "delete", "patch"].indexOf(
         response.config?.method?.toLowerCase() ?? "",
       ) >= 0;
     const headers = response.headers as AxiosHeaders;

From 0257ad436b40e9cd440b4aec36cb6c640137444c Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Wed, 6 Mar 2024 15:15:51 +0100
Subject: [PATCH 12/12] Update src/lib/api_retry.ts

---
 src/lib/api_retry.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/api_retry.ts b/src/lib/api_retry.ts
index 90b5f9bd..0bd25cbc 100644
--- a/src/lib/api_retry.ts
+++ b/src/lib/api_retry.ts
@@ -13,7 +13,7 @@ export function configureAxiosRetry(axios: AxiosInstance) {
   });
 
   axiosRetry(axios, {
-    retries: 50,
+    retries: 10,
     retryDelay: axiosRetry.exponentialDelay,
     onRetry(count, error) {
       d("retrying request after %d attempts; error: %o", count, error.message);