Add --authenticator option to convert and singedb apps; Move --authen…

…ticator down the list of arguments for better readability of help; Apply black formatting
littleK0i · Mar 18, 2024 · c8cd98f · c8cd98f
1 parent 4a2bb0d
commit c8cd98f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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)",