From c8cd98ff805141a8f86dd1aac255eee0104a0cf5 Mon Sep 17 00:00:00 2001
From: Vitaly Markov <wild.desu@gmail.com>
Date: Mon, 18 Mar 2024 14:19:35 +0000
Subject: [PATCH] Add --authenticator option to convert and singedb apps; Move
 --authenticator down the list of arguments for better readability of help;
 Apply black formatting

---
 snowddl/app/base.py     | 12 ++++++------
 snowddl/app/convert.py  |  5 +++++
 snowddl/app/singledb.py |  5 +++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/snowddl/app/base.py b/snowddl/app/base.py
index cd23b2a..1030a3a 100644
--- a/snowddl/app/base.py
+++ b/snowddl/app/base.py
@@ -74,11 +74,6 @@ def init_arguments_parser(self):
             metavar="PRIVATE_KEY",
             default=environ.get("SNOWFLAKE_PRIVATE_KEY_PATH"),
         )
-        parser.add_argument(
-            "--authenticator",
-            help="Authenticator: 'snowflake' or 'externalbrowser' (to use any IdP and a web browser) (default: SNOWFLAKE_AUTHENTICATOR env variable or 'snowflake')",
-            default=environ.get("SNOWFLAKE_AUTHENTICATOR") or 'snowflake'
-        )
 
         # Role & warehouse
         parser.add_argument(
@@ -95,6 +90,11 @@ def init_arguments_parser(self):
         )
 
         # Options
+        parser.add_argument(
+            "--authenticator",
+            help="Authenticator: 'snowflake' or 'externalbrowser' (to use any IdP and a web browser) (default: SNOWFLAKE_AUTHENTICATOR env variable or 'snowflake')",
+            default=environ.get("SNOWFLAKE_AUTHENTICATOR", "snowflake"),
+        )
         parser.add_argument(
             "--passphrase",
             help="Passphrase for private key file (default: SNOWFLAKE_PRIVATE_KEY_PASSPHRASE env variable)",
@@ -426,7 +426,7 @@ def get_connection(self):
         elif self.args.get("authenticator") == "externalbrowser":
             options["authenticator"] = "externalbrowser"
         else:
-            raise ValueError("Only 'Snowflake' and 'externalbrowser' authenticators are supported")
+            raise ValueError("Only 'snowflake' and 'externalbrowser' authenticators are supported")
 
         if self.args.get("query_tag"):
             options["session_parameters"] = {
diff --git a/snowddl/app/convert.py b/snowddl/app/convert.py
index 0b1d583..9eb109a 100644
--- a/snowddl/app/convert.py
+++ b/snowddl/app/convert.py
@@ -65,6 +65,11 @@ def init_arguments_parser(self):
         )
 
         # Options
+        parser.add_argument(
+            "--authenticator",
+            help="Authenticator: 'snowflake' or 'externalbrowser' (to use any IdP and a web browser) (default: SNOWFLAKE_AUTHENTICATOR env variable or 'snowflake')",
+            default=environ.get("SNOWFLAKE_AUTHENTICATOR", "snowflake"),
+        )
         parser.add_argument(
             "--passphrase",
             help="Passphrase for private key file (default: SNOWFLAKE_PRIVATE_KEY_PASSPHRASE env variable)",
diff --git a/snowddl/app/singledb.py b/snowddl/app/singledb.py
index 5d18df3..c87c8bd 100644
--- a/snowddl/app/singledb.py
+++ b/snowddl/app/singledb.py
@@ -95,6 +95,11 @@ def init_arguments_parser(self):
         )
 
         # Generic options
+        parser.add_argument(
+            "--authenticator",
+            help="Authenticator: 'snowflake' or 'externalbrowser' (to use any IdP and a web browser) (default: SNOWFLAKE_AUTHENTICATOR env variable or 'snowflake')",
+            default=environ.get("SNOWFLAKE_AUTHENTICATOR", "snowflake"),
+        )
         parser.add_argument(
             "--passphrase",
             help="Passphrase for private key file (default: SNOWFLAKE_PRIVATE_KEY_PASSPHRASE env variable)",