snowflake-cli-labs 2.1.2__tar.gz → 2.2.0rc0__tar.gz

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
     rev: "v0.1.7"
     hooks:
       - id: ruff
-        args: [--fix, --exclude, "**/tests/"]
+        args: [--fix, --exclude, "**/tests_integration/"]
   - repo: https://github.com/psf/black
     rev: 22.12.0
     hooks:
@@ -25,6 +25,12 @@ repos:
     hooks:
       - id: mypy
         additional_dependencies: [types-all]
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.4
+    hooks:
+      - id: codespell
+        additional_dependencies:
+          - tomli
   - repo: local
     hooks:
       - id: check-print-in-code
@@ -40,7 +46,8 @@ repos:
           ^src/snowflake/cli/app/dev/.*$|
           ^src/snowflake/cli/templates/.*$|
           ^src/snowflake/cli/api/utils/rendering.py$|
-          ^src/snowflake/cli/plugins/spcs/common.py$
+          ^src/snowflake/cli/plugins/spcs/common.py$|
+          ^src/snowflake/cli/plugins/snowpark/venv.py$
       - id: check-app-imports-in-api
         language: pygrep
         name: "No top level cli.app imports in cli.api"
@@ -54,3 +61,17 @@ repos:
         pass_filenames: true
         files: ^src/.*\.py$
         exclude: ^src/snowflake/cli/app/telemetry.py$
+      - id: dependencies-sync
+        name: "Copy dependencies from pyproject.toml to requirements.txt"
+        language: system
+        entry: python snyk/dependency-sync.py
+        files: ^pyproject.toml$
+      - id: use-local-requirements-model
+        language: pygrep
+        name: "Use snowflake.cli.plugins.snowpark.models.Requirement for requirements parsing"
+        files: ^src/snowflake/.*\.py$
+        entry: >
+          ^from requirements.* import|
+          ^import requirements.*
+        pass_filenames: true
+        exclude: ^src/snowflake/cli/plugins/snowpark/models.py$

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to SnowCLI
+# Contributing to Snowflake CLI
 
 There are two ways to contribute code to the repository: directly or by use of forks. For best practices for the second approach, refer to the section on forks below. Right now, there is limited access to contributing to the repository directly, and hence using forks is the recommended approach.
 
@@ -123,14 +123,14 @@ How to use it?
       You can resume code execution, add breakpoints, evaluate variables, do all the things you usually do when debugging locally.
 
 ## Using Forks
-Create your own fork from the `snowcli` repo. As a heads up, all `snowcli` forks are publicly accessible on Github.
+Create your own fork from the `snowflake-cli` repo. As a heads up, all `snowflake-cli` forks are publicly accessible on Github.
 
-Syncing forks with the upstream `snowcli` repo can be a hassle when trying to resolve merge conflicts. To avoid issues with this approach, we recommend always rebasing to the upstream `snowcli` branch.
+Syncing forks with the upstream `snowflake-cli` repo can be a hassle when trying to resolve merge conflicts. To avoid issues with this approach, we recommend always rebasing to the upstream `snowflake-cli` branch.
 
 In the cloned copy of your fork, perform the following steps.
 
 ```bash
-git remote add sfcli https://github.com/Snowflake-Labs/snowcli.git
+git remote add sfcli https://github.com/snowflakedb/snowflake-cli.git
 git fetch sfcli
 git checkout <your-branch>
 git rebase sfcli/main

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.1.2
+Version: 2.2.0rc0
 Summary: Snowflake CLI
-Project-URL: Source code, https://github.com/Snowflake-Labs/snowcli
-Project-URL: Bug Tracker, https://github.com/Snowflake-Labs/snowcli/issues
+Project-URL: Source code, https://github.com/snowflakedb/snowflake-cli
+Project-URL: Bug Tracker, https://github.com/snowflakedb/snowflake-cli/issues
 Author: Snowflake Inc.
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -217,34 +217,37 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: SQL
 Classifier: Topic :: Database
 Requires-Python: >=3.8
-Requires-Dist: coverage==7.4.1
-Requires-Dist: gitpython==3.1.42
+Requires-Dist: gitpython==3.1.43
 Requires-Dist: jinja2==3.1.3
 Requires-Dist: pip
 Requires-Dist: pluggy==1.4.0
+Requires-Dist: pydantic==2.7.0
 Requires-Dist: pyyaml==6.0.1
 Requires-Dist: requests==2.31.0
-Requires-Dist: requirements-parser==0.5.0
-Requires-Dist: rich==13.7.0
-Requires-Dist: setuptools==69.1.0
-Requires-Dist: snowflake-connector-python[secure-local-storage]==3.7.0
-Requires-Dist: strictyaml==1.7.3
+Requires-Dist: requirements-parser==0.9.0
+Requires-Dist: rich==13.7.1
+Requires-Dist: setuptools==69.5.1
+Requires-Dist: snowflake-connector-python[secure-local-storage]==3.8.1
 Requires-Dist: tomlkit==0.12.3
-Requires-Dist: typer==0.9.0
+Requires-Dist: typer==0.12.3
 Requires-Dist: urllib3<2.3,>=1.21.1
 Provides-Extra: development
-Requires-Dist: coverage==7.4.1; extra == 'development'
+Requires-Dist: coverage==7.4.4; extra == 'development'
 Requires-Dist: pre-commit>=3.5.0; extra == 'development'
 Requires-Dist: pytest-randomly==3.15.0; extra == 'development'
-Requires-Dist: pytest==8.0.1; extra == 'development'
+Requires-Dist: pytest==8.1.1; extra == 'development'
 Requires-Dist: syrupy==4.6.1; extra == 'development'
 Description-Content-Type: text/markdown
 
-# Snowflake Developer CLI
+# Snowflake CLI
+
+Snowflake CLI is an open-source command-line tool explicitly designed for developer-centric workloads in addition to SQL operations. It is a flexible and extensible tool that can accommodate modern development practices and technologies.
+
+With Snowflake CLI, developers can create, manage, update, and view apps running on Snowflake across workloads such as Streamlit in Snowflake, the Snowflake Native App Framework, Snowpark Container Services, and Snowpark. It supports a range of Snowflake features, including user-defined functions, stored procedures, Streamlit in Snowflake, and SQL execution.
+
+
+**Note**: Snowflake CLI is in Public Preview (PuPr). Docs at https://docs.snowflake.com/en/developer-guide/snowflake-cli-v2/index
 
-**Note**: Snowflake CLI is in Private Preview (PrPr). You must register for the PrPr to use Snowflake CLI by filling out the
-[Snowflake CLI  - PrPr Intake Form](https://forms.gle/HZNhPNbzn7oExjFu8). For more information, you can contact a
-Snowflake sales representative.
 
 ## Install Snowflake CLI
 
@@ -263,7 +266,7 @@ Requires [Homebrew](https://brew.sh/).
 
 ```bash
 brew tap Snowflake-Labs/snowflake-cli
-brew install snowcli
+brew install snowflake-cli
 snow --help
 ```
 
@@ -272,8 +275,8 @@ snow --help
 Requires Python >= 3.8 and git
 
 ```bash
-git clone https://github.com/snowflake-labs/snowcli
-cd snowcli
+git clone https://github.com/snowflakedb/snowflake-cli
+cd snowflake-cli
 # you can also do the below in an active virtual environment:
 # python -m venv .venv
 # source .venv/bin/activate

snowflake_cli_labs-2.2.0rc0/README.md

@@ -0,0 +1,51 @@
+# Snowflake CLI
+
+Snowflake CLI is an open-source command-line tool explicitly designed for developer-centric workloads in addition to SQL operations. It is a flexible and extensible tool that can accommodate modern development practices and technologies.
+
+With Snowflake CLI, developers can create, manage, update, and view apps running on Snowflake across workloads such as Streamlit in Snowflake, the Snowflake Native App Framework, Snowpark Container Services, and Snowpark. It supports a range of Snowflake features, including user-defined functions, stored procedures, Streamlit in Snowflake, and SQL execution.
+
+
+**Note**: Snowflake CLI is in Public Preview (PuPr). Docs at https://docs.snowflake.com/en/developer-guide/snowflake-cli-v2/index
+
+
+## Install Snowflake CLI
+
+### Install with pip (PyPi)
+
+Requires Python >= 3.8
+
+```bash
+pip install snowflake-cli-labs
+snow --help
+```
+
+### Install with Homebrew (Mac only)
+
+Requires [Homebrew](https://brew.sh/).
+
+```bash
+brew tap Snowflake-Labs/snowflake-cli
+brew install snowflake-cli
+snow --help
+```
+
+### Install from source
+
+Requires Python >= 3.8 and git
+
+```bash
+git clone https://github.com/snowflakedb/snowflake-cli
+cd snowflake-cli
+# you can also do the below in an active virtual environment:
+# python -m venv .venv
+# source .venv/bin/activate
+hatch build && pip install .
+snow --version
+```
+
+You should now be able to run `snow` and get the CLI message.
+
+## Get involved
+
+Have a feature idea? Running into a bug? Want to contribute? We'd love to hear from you!
+Please open or review issues, open pull requests, or reach out to us on developers@snowflake.com

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/RELEASE-NOTES.md

@@ -1,15 +1,81 @@
+# v2.2.0
+
+## Backward incompatibility
+
+## Deprecations
+* `snow snowpark package lookup` no longer performs check against PyPi. Using `--pypi-download` or `--yes`
+  has no effect and will cause a warning. In this way the command has single responsibility - check if package is
+  available in Snowflake Anaconda channel.
+* `snow snowpark package create`:
+  * `--pypi-download` or `--yes` flags are deprecated, have no effect and will cause a warning.
+    `create` command always checks against PyPi.
+  * `--allow-native-libraries` is deprecated in favour of boolean flag `--allow-shared-libraries`.
+    Using old flag will cause a warning.
+* `snow snowpark build`:
+  * `--pypi-download` flag is deprecated, have no effect and will cause a warning. Create command always check against PyPi.
+  * `--check-anaconda-for-pypi-depts` is deprecated and using it will cause warning, the functionality is replaced by `--ignore-anaconda`
+  * `--package-native-libraries` is deprecated and using it will cause warning, the functionality is replaced by `--allow-shared-libraries`
+* `snow object stage` commands are deprecated and using them will cause a warning.
+   Functionality is replaced by `snow stage` commands.
+
+## New additions
+* Added support for fully qualified name (`database.schema.name`) in `name` parameter in streamlit project definition
+* Added support for fully qualified image repository names in `spcs image-repository` commands.
+* Added `--if-not-exists` option to `create` commands for `service`, and `compute-pool`. Added `--replace` and `--if-not-exists` options for `image-repository create`.
+* Added support for python connector diagnostic report.
+* Added `snow app deploy` command that creates an application package and syncs the local changes to the stage without creating or updating the application.
+* Added `is_default` column to `snow connection list` output to highlight default connection.
+* `snow snowpark package create`:
+  * new `--ignore-anaconda` flag disables package lookup in Snowflake Anaconda channel.
+    All dependencies will be downloaded from PyPi.
+  * new `--skip-version-check` skips comparing versions of dependencies between requirements and Anaconda.
+  * new `--index-url` flag sets up Base URL of the Python Package Index to use for package lookup.
+* `snow snowpark build`:
+  * new `--skip-version-check` skips comparing versions of dependencies between requirements and Anaconda.
+  * new `--index-url` flag sets up Base URL of the Python Package Index to use for package lookup.
+* Added `--recursive` flag for copy from stage, it will reproduce the directory structure locally.
+* Added support for snowgit. New commands:
+  * `snow git setup` - wizard setting up a git repository stage and creating all necessary objects
+  * `snow git fetch` - fetches latest changes from the origin repository into Snowflake repository
+  * `snow git list-brahces` - lists all branches in the repository
+  * `snow git list-tags` - lists all tags in the repository
+  * `snow git list-files` - lists all files on provided branch/tag/commit
+  * `snow git copy` - copies files from provided branch/tag/commit into stage or local directory
+  * `snow git execute` - execute immediate files from repository
+* Added command for execute immediate `snow object stage execute`
+* Fetching available packages list from Snowflake instead of directly from Anaconda with fallback to the old method (for backward compatibility).
+  As the new method requires a connection to Snowflake, it adds connection options to the following commands:
+  * `snow snowpark build`
+  * `snow snowpark package lookup`
+  * `snow snowpark package create`
+
+## Fixes and improvements
+* Adding `--image-name` option for image name argument in `spcs image-repository list-tags` for consistency with other commands.
+* Fixed errors during `spcs image-registry login` not being formatted correctly.
+* Project definition no longer accept extra fields. Any extra field will cause an error.
+* Changing imports in function/procedure section in `snowflake.yml` will cause the definition update on replace
+* Adding `--pattern` flag to `stage list` command for filtering out results with regex.
+* Fixed snowpark build paths for builds with --project option (fixed empty zip issue).
+* More clear error messages in `snow snowpark build` command
+* Adding support for any source supported by `pip` in `snow snowpark`.
+* Fixed version parsing for packages lookup on Snowflake Anaconda Channel
+* Fix handling database/schema/role identifiers containing dashes
+* Fix schema override bug in `snow connection test`
+* Hidden incorrectly working config permissions warning on Windows
+
 # v2.1.2
 
 ## Fixes and improvements
- * Add `pip` as Snowflake-cli dependency
- * Optimize `connection test` command
- * Fix venv creation issues in `snowpark package create` and `snowpark build` command
+* Add `pip` as Snowflake-cli dependency
+* Optimize `connection test` command
+* Fix venv creation issues in `snowpark package create` and `snowpark build` command
 
 # v2.1.1
 
 ## Fixes and improvements
 * Improved security of printing connection details in `snow connection list`.
 * Improved parsing of non-quoted scalar values within square brackets in `manifest.yml` in Native App projects.
+
 # v2.1.0
 
 ## Backward incompatibility
@@ -26,6 +92,9 @@
   * Added `create` command for `image-repository`.
   * Added `status`, `set (property)`, `unset (property)`, `suspend` and `resume` commands for `compute-pool`.
   * Added `set (property)`, `unset (property)`,`upgrade` and `list-endpoints` commands for `service`.
+* You can now use github repo link in `snow snowpark package create` to prepare your code for upload
+* Added `allow-native-libraries` option to `snow snowpark package create` command
+* Added alias `--install-from-pip` for `-y` option in `snow snowpark package create` command
 * Connections parameters are also supported by generic environment variables:
   * `SNOWFLAKE_ACCOUNT`
   * `SNOWFLAKE_USER`
@@ -47,6 +116,7 @@
 ## Fixes and improvements
 * Restricted permissions of automatically created files
 * Fixed bug where `spcs service create` would not throw error if service with specified name already exists.
+* Improved package lookup, to avoid unnecessary uploads
 * Logging into the file by default (INFO level)
 * Added validation that service, compute pool, and image repository names are unqualified identifiers.
 * `spcs service` commands now accept qualified names.
@@ -151,7 +221,7 @@
 # v1.2.0
 
 ## Backward incompatibility
-* Removed `snow streamlit create` command. Streamlit can be deployd using `snow streamlit deploy`
+* Removed `snow streamlit create` command. Streamlit can be deployed using `snow streamlit deploy`
 * Removed short option names in compute pool commands:
   * `-n` for `--name`, name of compute pool
   * `-d` for `--num`, number of pool's instances

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/performance_history_analysis.py

@@ -44,7 +44,7 @@ def _print_summary_performance_descending(
 ) -> None:
     commits_with_diffs: List[Tuple[Commit, Decimal]] = []
     last_result: Optional[Decimal] = None
-    for (commit, result) in reversed(commits_with_results):
+    for commit, result in reversed(commits_with_results):
         if last_result:
             result_diff = Decimal(result) - last_result
             if result_diff > 0:
@@ -54,7 +54,7 @@ def _print_summary_performance_descending(
         commits_with_diffs, key=lambda e: e[1], reverse=True
     )
     print("\nCommits causing performance descending:")
-    for (commit, diff) in sorted_list_of_diffs:
+    for commit, diff in sorted_list_of_diffs:
         print(
             f"Diff [{diff}] after commit {commit} ({commit.authored_datetime}) -> {commit.message.splitlines()[0]}"
         )

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/pyproject.toml

@@ -11,21 +11,20 @@ requires-python = ">=3.8"
 description = "Snowflake CLI"
 readme = "README.md"
 dependencies = [
-  "coverage==7.4.1",
   "jinja2==3.1.3",
   "pluggy==1.4.0",
   "PyYAML==6.0.1",
-  "rich==13.7.0",
+  "rich==13.7.1",
   "requests==2.31.0",
-  "requirements-parser==0.5.0",
-  "setuptools==69.1.0",
-  "snowflake-connector-python[secure-local-storage]==3.7.0",
-  "strictyaml==1.7.3",
+  "requirements-parser==0.9.0",
+  "setuptools==69.5.1",
+  "snowflake-connector-python[secure-local-storage]==3.8.1",
   "tomlkit==0.12.3",
-  "typer==0.9.0",
+  "typer==0.12.3",
   "urllib3>=1.21.1,<2.3",
-  "GitPython==3.1.42",
+  "GitPython==3.1.43",
   "pip",
+  "pydantic==2.7.0"
 ]
 classifiers = [
   "Development Status :: 3 - Alpha",
@@ -41,16 +40,16 @@ classifiers = [
 
 [project.optional-dependencies]
 development = [
-  "coverage==7.4.1",
+  "coverage==7.4.4",
   "pre-commit>=3.5.0",
-  "pytest==8.0.1",
+  "pytest==8.1.1",
   "pytest-randomly==3.15.0",
   "syrupy==4.6.1",
 ]
 
 [project.urls]
-"Source code" = "https://github.com/Snowflake-Labs/snowcli"
-"Bug Tracker" = "https://github.com/Snowflake-Labs/snowcli/issues"
+"Source code" = "https://github.com/snowflakedb/snowflake-cli"
+"Bug Tracker" = "https://github.com/snowflakedb/snowflake-cli/issues"
 
 [project.scripts]
 snow = "snowflake.cli.app.__main__:main"
@@ -122,6 +121,7 @@ select = [
   "TID252", # relative imports
   "SLF",    # Accessing private methods
   "F401",   # unused imports
+  "F403",   # star imports
 ]
 
 [tool.pytest.ini_options]
@@ -129,6 +129,10 @@ addopts = "-m 'not integration and not performance and not e2e and not spcs and
 markers = [
   "integration: mark test as integration test",
   "performance: mark test as performance test",
-  "e2e: mark test to execute on SnowCLI installed in fresh virtual environment",
+  "e2e: mark test to execute on Snowflake CLI installed in fresh virtual environment",
   "loaded_modules: checks loaded modules",
 ]
+
+
+[tool.codespell]
+skip = 'tests/*'

snowflake_cli_labs-2.2.0rc0/snyk/dependency-sync.py

@@ -0,0 +1,18 @@
+from pathlib import Path
+
+import tomlkit
+
+
+def sync():
+    pyproject = tomlkit.loads(Path("pyproject.toml").read_text())
+    dependencies = pyproject["project"]["dependencies"]
+    dev_dependencies = pyproject["project"]["optional-dependencies"]["development"]
+    with open("snyk/requirements.txt", "w") as req:
+        for dep in dependencies:
+            req.write(f"{dep}\n")
+        for dep in dev_dependencies:
+            req.write(f"{dep}\n")
+
+
+if __name__ == "__main__":
+    sync()

snowflake_cli_labs-2.2.0rc0/snyk/requirements.txt

@@ -0,0 +1,19 @@
+jinja2==3.1.3
+pluggy==1.4.0
+PyYAML==6.0.1
+rich==13.7.1
+requests==2.31.0
+requirements-parser==0.9.0
+setuptools==69.5.1
+snowflake-connector-python[secure-local-storage]==3.8.1
+tomlkit==0.12.3
+typer==0.12.3
+urllib3>=1.21.1,<2.3
+GitPython==3.1.43
+pip
+pydantic==2.7.0
+coverage==7.4.4
+pre-commit>=3.5.0
+pytest==8.1.1
+pytest-randomly==3.15.0
+syrupy==4.6.1

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/src/snowflake/cli/__about__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-VERSION = "2.1.2"
+VERSION = "2.2.0rc0"

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/src/snowflake/cli/api/cli_global_context.py

@@ -24,7 +24,12 @@ class _ConnectionContext:
         self._private_key_path: Optional[str] = None
         self._warehouse: Optional[str] = None
         self._mfa_passcode: Optional[str] = None
+        self._enable_diag: Optional[bool] = False
+        self._diag_log_path: Optional[Path] = None
+        self._diag_allowlist_path: Optional[Path] = None
         self._temporary_connection: bool = False
+        self._session_token: Optional[str] = None
+        self._master_token: Optional[str] = None
 
     def __setattr__(self, key, value):
         """
@@ -118,6 +123,27 @@ class _ConnectionContext:
     def set_mfa_passcode(self, value: Optional[str]):
         self._mfa_passcode = value
 
+    @property
+    def enable_diag(self) -> Optional[bool]:
+        return self._enable_diag
+
+    def set_enable_diag(self, value: Optional[bool]):
+        self._enable_diag = value
+
+    @property
+    def diag_log_path(self) -> Optional[Path]:
+        return self._diag_log_path
+
+    def set_diag_log_path(self, value: Optional[Path]):
+        self._diag_log_path = value
+
+    @property
+    def diag_allowlist_path(self) -> Optional[Path]:
+        return self._diag_allowlist_path
+
+    def set_diag_allowlist_path(self, value: Optional[Path]):
+        self._diag_allowlist_path = value
+
     @property
     def temporary_connection(self) -> bool:
         return self._temporary_connection
@@ -125,6 +151,20 @@ class _ConnectionContext:
     def set_temporary_connection(self, value: bool):
         self._temporary_connection = value
 
+    @property
+    def session_token(self) -> Optional[str]:
+        return self._session_token
+
+    def set_session_token(self, value: Optional[str]):
+        self._session_token = value
+
+    @property
+    def master_token(self) -> Optional[str]:
+        return self._master_token
+
+    def set_master_token(self, value: Optional[str]):
+        self._master_token = value
+
     @property
     def connection(self) -> SnowflakeConnection:
         if not self._cached_connection:
@@ -142,6 +182,8 @@ class _ConnectionContext:
             "schema": self.schema,
             "role": self.role,
             "warehouse": self.warehouse,
+            "session_token": self.session_token,
+            "master_token": self.master_token,
         }
 
     def _build_connection(self):
@@ -150,6 +192,9 @@ class _ConnectionContext:
         return connect_to_snowflake(
             temporary_connection=self.temporary_connection,
             mfa_passcode=self._mfa_passcode,
+            enable_diag=self._enable_diag,
+            diag_log_path=self._diag_log_path,
+            diag_allowlist_path=self._diag_allowlist_path,
             connection_name=self.connection_name,
             **self._collect_not_empty_connection_attributes(),
         )

{snowflake_cli_labs-2.1.2 → snowflake_cli_labs-2.2.0rc0}/src/snowflake/cli/api/commands/decorators.py

@@ -12,12 +12,17 @@ from snowflake.cli.api.commands.flags import (
     ConnectionOption,
     DatabaseOption,
     DebugOption,
+    DiagAllowlistPathOption,
+    DiagLogPathOption,
+    EnableDiagOption,
+    MasterTokenOption,
     MfaPasscodeOption,
     OutputFormatOption,
     PasswordOption,
     PrivateKeyPathOption,
     RoleOption,
     SchemaOption,
+    SessionTokenOption,
     SilentOption,
     TemporaryConnectionOption,
     UserOption,
@@ -206,6 +211,18 @@ GLOBAL_CONNECTION_OPTIONS = [
         annotation=Optional[str],
         default=PrivateKeyPathOption,
     ),
+    inspect.Parameter(
+        "session_token",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[str],
+        default=SessionTokenOption,
+    ),
+    inspect.Parameter(
+        "master_token",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[str],
+        default=MasterTokenOption,
+    ),
     inspect.Parameter(
         "database",
         inspect.Parameter.KEYWORD_ONLY,
@@ -242,6 +259,24 @@ GLOBAL_CONNECTION_OPTIONS = [
         annotation=Optional[str],
         default=MfaPasscodeOption,
     ),
+    inspect.Parameter(
+        "enable_diag",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[bool],
+        default=EnableDiagOption,
+    ),
+    inspect.Parameter(
+        "diag_log_path",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[str],
+        default=DiagLogPathOption,
+    ),
+    inspect.Parameter(
+        "diag_allowlist_path",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[str],
+        default=DiagAllowlistPathOption,
+    ),
 ]
 
 GLOBAL_OPTIONS = [