From d305caf2c9ccc6ce9de97658b291fddb53e176bd Mon Sep 17 00:00:00 2001
From: Bryan Kendall <bkend@google.com>
Date: Wed, 11 Nov 2020 14:30:45 -0800
Subject: [PATCH] fix database:settings:get/set (#2811)

* fix settings:get/set

* changelog

* formatting is hard
---
 CHANGELOG.md                          | 1 +
 src/apiv2.ts                          | 2 +-
 src/commands/database-settings-get.ts | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb2d..28ed1d59ff4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+- Fixes issue in `database:settings:get` where the value wasn't being properly displayed.
diff --git a/src/apiv2.ts b/src/apiv2.ts
index a8d525e9f55..cca5d5accbe 100644
--- a/src/apiv2.ts
+++ b/src/apiv2.ts
@@ -245,7 +245,7 @@ export class Client {
       method: options.method,
     };
 
-    if (options.json) {
+    if (options.json !== undefined) {
       fetchOptions.body = JSON.stringify(options.json);
     }
 
diff --git a/src/commands/database-settings-get.ts b/src/commands/database-settings-get.ts
index 0243b000038..cfec8aa9142 100644
--- a/src/commands/database-settings-get.ts
+++ b/src/commands/database-settings-get.ts
@@ -44,6 +44,12 @@ export default new Command("database:settings:get <path>")
           original: err,
         });
       }
+      // strictTriggerValidation returns an object, not a single string.
+      // Check for an object and get the `value` from it.
+      if (typeof res.body === "object") {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        res.body = (res.body as any).value;
+      }
       utils.logSuccess(`For database instance ${options.instance}\n\t ${path} = ${res.body}`);
     }
   );