snowflake-cli-labs 2.8.1__py3-none-any.whl → 3.0.0__py3-none-any.whl

snowflake/cli/api/commands/decorators.py

@@ -19,7 +19,7 @@ from functools import wraps
 from inspect import Signature
 from typing import Callable, Dict, List, Optional, get_type_hints
 
-from snowflake.cli.api.cli_global_context import cli_context
+from snowflake.cli.api.cli_global_context import get_cli_context
 from snowflake.cli.api.commands.flags import (
     AccountOption,
     AuthenticatorOption,
@@ -29,10 +29,12 @@ from snowflake.cli.api.commands.flags import (
     DiagAllowlistPathOption,
     DiagLogPathOption,
     EnableDiagOption,
+    HostOption,
     MasterTokenOption,
     MfaPasscodeOption,
     OutputFormatOption,
     PasswordOption,
+    PortOption,
     PrivateKeyPathOption,
     RoleOption,
     SchemaOption,
@@ -125,8 +127,9 @@ def with_experimental_behaviour(
 
 
 def _execute_before_command_using_global_options(**options):
-    from snowflake.cli.app.loggers import create_loggers
+    from snowflake.cli._app.loggers import create_loggers
 
+    cli_context = get_cli_context()
     create_loggers(cli_context.verbose, cli_context.enable_tracebacks)
 
 
@@ -209,6 +212,18 @@ GLOBAL_CONNECTION_OPTIONS = [
         annotation=Optional[str],
         default=ConnectionOption,
     ),
+    inspect.Parameter(
+        "host",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[str],
+        default=HostOption,
+    ),
+    inspect.Parameter(
+        "port",
+        inspect.Parameter.KEYWORD_ONLY,
+        annotation=Optional[int],
+        default=PortOption,
+    ),
     inspect.Parameter(
         "account",
         inspect.Parameter.KEYWORD_ONLY,
@@ -234,7 +249,7 @@ GLOBAL_CONNECTION_OPTIONS = [
         default=AuthenticatorOption,
     ),
     inspect.Parameter(
-        "private_key_path",
+        "private_key_file",
         inspect.Parameter.KEYWORD_ONLY,
         annotation=Optional[str],
         default=PrivateKeyPathOption,
@@ -342,7 +357,7 @@ GLOBAL_OPTIONS = [
 
 
 def with_output(func):
-    from snowflake.cli.app.printing import print_result
+    from snowflake.cli._app.printing import print_result
 
     @wraps(func)
     def wrapper(*args, **kwargs):

snowflake/cli/api/commands/experimental_behaviour.py

@@ -11,9 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from snowflake.cli.api.cli_global_context import cli_context
+from snowflake.cli.api.cli_global_context import get_cli_context
 
 
 def experimental_behaviour_enabled() -> bool:
-    return cli_context.experimental
+    return get_cli_context().experimental

snowflake/cli/api/commands/flags.py

@@ -15,23 +15,24 @@
 from __future__ import annotations
 
 import tempfile
-from dataclasses import dataclass
-from enum import Enum
-from inspect import signature
 from pathlib import Path
-from typing import Any, Callable, List, Optional, Tuple
+from typing import Any, Callable, Optional
 
 import click
 import typer
 from click import ClickException
-from snowflake.cli.api.cli_global_context import cli_context_manager
-from snowflake.cli.api.commands.typer_pre_execute import register_pre_execute_command
+from snowflake.cli.api.cli_global_context import (
+    _CliGlobalContextManager,
+    get_cli_context_manager,
+)
+from snowflake.cli.api.commands.common import OnErrorType
+from snowflake.cli.api.commands.overrideable_parameter import OverrideableOption
+from snowflake.cli.api.commands.utils import parse_key_value_variables
+from snowflake.cli.api.config import get_all_connections
+from snowflake.cli.api.connections import ConnectionContext
 from snowflake.cli.api.console import cli_console
-from snowflake.cli.api.exceptions import MissingConfiguration
 from snowflake.cli.api.identifiers import FQN
 from snowflake.cli.api.output.formats import OutputFormat
-from snowflake.cli.api.project.definition_manager import DefinitionManager
-from snowflake.cli.api.rendering.jinja import CONTEXT_KEY
 
 DEFAULT_CONTEXT_SETTINGS = {"help_option_names": ["--help", "-h"]}
 
@@ -39,115 +40,39 @@ _CONNECTION_SECTION = "Connection configuration"
 _CLI_BEHAVIOUR = "Global configuration"
 
 
-class OnErrorType(Enum):
-    BREAK = "break"
-    CONTINUE = "continue"
-
-
-class OverrideableOption:
-    """
-    Class that allows you to generate instances of typer.models.OptionInfo with some default properties while allowing
-    specific values to be overridden.
-
-    Custom parameters:
-    - mutually_exclusive (Tuple[str]|List[str]): A list of parameter names that this Option is not compatible with. If this Option has
-     a truthy value and any of the other parameters in the mutually_exclusive list has a truthy value, a
-     ClickException will be thrown. Note that mutually_exclusive can contain an option's own name but does not require
-     it.
-    """
-
-    def __init__(
-        self,
-        default: Any,
-        *param_decls: str,
-        mutually_exclusive: Optional[List[str] | Tuple[str]] = None,
-        **kwargs,
-    ):
-        self.default = default
-        self.param_decls = param_decls
-        self.mutually_exclusive = mutually_exclusive
-        self.kwargs = kwargs
-
-    def __call__(self, **kwargs) -> typer.models.OptionInfo:
-        """
-        Returns a typer.models.OptionInfo instance initialized with the specified default values along with any overrides
-        from kwargs. Note that if you are overriding param_decls, you must pass an iterable of strings, you cannot use
-        positional arguments like you can with typer.Option. Does not modify the original instance.
-        """
-        default = kwargs.get("default", self.default)
-        param_decls = kwargs.get("param_decls", self.param_decls)
-        mutually_exclusive = kwargs.get("mutually_exclusive", self.mutually_exclusive)
-        if not isinstance(param_decls, list) and not isinstance(param_decls, tuple):
-            raise TypeError("param_decls must be a list or tuple")
-        passed_kwargs = self.kwargs.copy()
-        passed_kwargs.update(kwargs)
-        if passed_kwargs.get("callback", None) or mutually_exclusive:
-            passed_kwargs["callback"] = self._callback_factory(
-                passed_kwargs.get("callback", None), mutually_exclusive
-            )
-        for non_kwarg in ["default", "param_decls", "mutually_exclusive"]:
-            passed_kwargs.pop(non_kwarg, None)
-        return typer.Option(default, *param_decls, **passed_kwargs)
-
-    class InvalidCallbackSignature(ClickException):
-        def __init__(self, callback):
-            super().__init__(
-                f"Signature {signature(callback)} is not valid for an OverrideableOption callback function. Must have at most one parameter with each of the following types: (typer.Context, typer.CallbackParam, Any Other Type)"
-            )
-
-    def _callback_factory(
-        self, callback, mutually_exclusive: Optional[List[str] | Tuple[str]]
-    ):
-        callback = callback if callback else lambda x: x
-
-        # inspect existing_callback to make sure signature is valid
-        existing_params = signature(callback).parameters
-        # at most one parameter with each type in [typer.Context, typer.CallbackParam, any other type]
-        limits = [
-            lambda x: x == typer.Context,
-            lambda x: x == typer.CallbackParam,
-            lambda x: x != typer.Context and x != typer.CallbackParam,
-        ]
-        for limit in limits:
-            if len([v for v in existing_params.values() if limit(v.annotation)]) > 1:
-                raise self.InvalidCallbackSignature(callback)
-
-        def generated_callback(ctx: typer.Context, param: typer.CallbackParam, value):
-            if mutually_exclusive:
-                for name in mutually_exclusive:
-                    if value and ctx.params.get(
-                        name, False
-                    ):  # if the current parameter is set to True and a previous parameter is also Truthy
-                        curr_opt = param.opts[0]
-                        other_opt = [x for x in ctx.command.params if x.name == name][
-                            0
-                        ].opts[0]
-                        raise click.ClickException(
-                            f"Options '{curr_opt}' and '{other_opt}' are incompatible."
-                        )
-
-            # pass args to existing callback based on its signature (this is how Typer infers callback args)
-            passed_params = {}
-            for existing_param in existing_params:
-                annotation = existing_params[existing_param].annotation
-                if annotation == typer.Context:
-                    passed_params[existing_param] = ctx
-                elif annotation == typer.CallbackParam:
-                    passed_params[existing_param] = param
-                else:
-                    passed_params[existing_param] = value
-            return callback(**passed_params)
-
-        return generated_callback
+def _connection_callback(prop: str):
+    """Generates a setter for a field on the current context manager's connection context."""
+    if prop not in ConnectionContext.__dataclass_fields__:
+        raise KeyError(
+            f"Cannot generate setter for non-existent connection attr {prop}"
+        )
 
+    def callback(value):
+        try:
+            if click.get_current_context().resilient_parsing:
+                return
+        except RuntimeError:
+            pass
+
+        setattr(get_cli_context_manager().connection_context, prop, value)
+        return value
+
+    return callback
 
-from snowflake.cli.api.config import get_all_connections
 
+def _context_callback(prop: str):
+    """Generates a setter for a field on the current context manager."""
+    if prop not in _CliGlobalContextManager.__dataclass_fields__:
+        raise KeyError(f"Cannot generate setter for non-existent context attr {prop}")
 
-def _callback(provide_setter: Callable[[], Callable[[Any], Any]]):
     def callback(value):
-        set_value = provide_setter()
-        set_value(value)
+        try:
+            if click.get_current_context().resilient_parsing:
+                return
+        except RuntimeError:
+            pass
+
+        setattr(get_cli_context_manager(), prop, value)
         return value
 
     return callback
@@ -159,12 +84,10 @@ ConnectionOption = typer.Option(
     "-c",
     "--environment",
     help=f"Name of the connection, as defined in your `config.toml`. Default: `default`.",
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_connection_name
-    ),
+    callback=_connection_callback("connection_name"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
-    autocompletion=lambda: list(get_all_connections()),
+    shell_complete=lambda _, __, ___: list(get_all_connections()),
 )
 
 TemporaryConnectionOption = typer.Option(
@@ -172,19 +95,35 @@ TemporaryConnectionOption = typer.Option(
     "--temporary-connection",
     "-x",
     help="Uses connection defined with command line parameters, instead of one defined in config",
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_temporary_connection
-    ),
+    callback=_connection_callback("temporary_connection"),
     is_flag=True,
     rich_help_panel=_CONNECTION_SECTION,
 )
 
+HostOption = typer.Option(
+    None,
+    "--host",
+    help="Host address for the connection. Overrides the value specified for the connection.",
+    callback=_connection_callback("host"),
+    show_default=False,
+    rich_help_panel=_CONNECTION_SECTION,
+)
+
+PortOption = typer.Option(
+    None,
+    "--port",
+    help="Port for the connection. Overrides the value specified for the connection.",
+    callback=_connection_callback("port"),
+    show_default=False,
+    rich_help_panel=_CONNECTION_SECTION,
+)
+
 AccountOption = typer.Option(
     None,
     "--account",
     "--accountname",
     help="Name assigned to your Snowflake account. Overrides the value specified for the connection.",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_account),
+    callback=_connection_callback("account"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
@@ -194,7 +133,7 @@ UserOption = typer.Option(
     "--user",
     "--username",
     help="Username to connect to Snowflake. Overrides the value specified for the connection.",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_user),
+    callback=_connection_callback("user"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
@@ -207,7 +146,7 @@ def _password_callback(value: str):
     if value:
         cli_console.message(PLAIN_PASSWORD_MSG)
 
-    return _callback(lambda: cli_context_manager.connection_context.set_password)(value)
+    return _connection_callback("password")(value)
 
 
 PasswordOption = typer.Option(
@@ -225,21 +164,18 @@ AuthenticatorOption = typer.Option(
     "--authenticator",
     help="Snowflake authenticator. Overrides the value specified for the connection.",
     hide_input=True,
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_authenticator
-    ),
+    callback=_connection_callback("authenticator"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
 
 PrivateKeyPathOption = typer.Option(
     None,
+    "--private-key-file",
     "--private-key-path",
-    help="Snowflake private key path. Overrides the value specified for the connection.",
+    help="Snowflake private key file path. Overrides the value specified for the connection.",
     hide_input=True,
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_private_key_path
-    ),
+    callback=_connection_callback("private_key_file"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
     exists=True,
@@ -252,9 +188,7 @@ SessionTokenOption = typer.Option(
     "--session-token",
     help="Snowflake session token. Can be used only in conjunction with --master-token. Overrides the value specified for the connection.",
     hide_input=True,
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_session_token
-    ),
+    callback=_connection_callback("session_token"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
     exists=True,
@@ -268,7 +202,7 @@ MasterTokenOption = typer.Option(
     "--master-token",
     help="Snowflake master token. Can be used only in conjunction with --session-token. Overrides the value specified for the connection.",
     hide_input=True,
-    callback=_callback(lambda: cli_context_manager.connection_context.set_master_token),
+    callback=_connection_callback("master_token"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
     exists=True,
@@ -281,9 +215,7 @@ TokenFilePathOption = typer.Option(
     None,
     "--token-file-path",
     help="Path to file with an OAuth token that should be used when connecting to Snowflake",
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_token_file_path
-    ),
+    callback=_connection_callback("token_file_path"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
     exists=True,
@@ -296,7 +228,7 @@ DatabaseOption = typer.Option(
     "--database",
     "--dbname",
     help="Database to use. Overrides the value specified for the connection.",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_database),
+    callback=_connection_callback("database"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
@@ -306,7 +238,7 @@ SchemaOption = typer.Option(
     "--schema",
     "--schemaname",
     help="Database schema to use. Overrides the value specified for the connection.",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_schema),
+    callback=_connection_callback("schema"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
@@ -316,7 +248,7 @@ RoleOption = typer.Option(
     "--role",
     "--rolename",
     help="Role to use. Overrides the value specified for the connection.",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_role),
+    callback=_connection_callback("role"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
@@ -325,7 +257,7 @@ WarehouseOption = typer.Option(
     None,
     "--warehouse",
     help="Warehouse to use. Overrides the value specified for the connection.",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_warehouse),
+    callback=_connection_callback("warehouse"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
 )
@@ -334,7 +266,7 @@ MfaPasscodeOption = typer.Option(
     None,
     "--mfa-passcode",
     help="Token to use for multi-factor authentication (MFA)",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_mfa_passcode),
+    callback=_connection_callback("mfa_passcode"),
     prompt="MFA passcode",
     prompt_required=False,
     show_default=False,
@@ -345,7 +277,7 @@ EnableDiagOption = typer.Option(
     False,
     "--enable-diag",
     help="Run python connector diagnostic test",
-    callback=_callback(lambda: cli_context_manager.connection_context.set_enable_diag),
+    callback=_connection_callback("enable_diag"),
     show_default=False,
     is_flag=True,
     rich_help_panel=_CONNECTION_SECTION,
@@ -359,12 +291,12 @@ _DIAG_LOG_DEFAULT_VALUE = "<temporary_directory>"
 def _diag_log_path_callback(path: str):
     if path == _DIAG_LOG_DEFAULT_VALUE:
         path = tempfile.gettempdir()
-    cli_context_manager.connection_context.set_diag_log_path(Path(path))
+    get_cli_context_manager().connection_context.diag_log_path = Path(path)
     return path
 
 
 DiagLogPathOption: Path = typer.Option(
-    tempfile.gettempdir(),
+    _DIAG_LOG_DEFAULT_VALUE,
     "--diag-log-path",
     help="Diagnostic report path",
     callback=_diag_log_path_callback,
@@ -378,9 +310,7 @@ DiagAllowlistPathOption: Path = typer.Option(
     None,
     "--diag-allowlist-path",
     help="Diagnostic report path to optional allowlist",
-    callback=_callback(
-        lambda: cli_context_manager.connection_context.set_diag_allowlist_path
-    ),
+    callback=_connection_callback("diag_allowlist_path"),
     show_default=False,
     rich_help_panel=_CONNECTION_SECTION,
     exists=True,
@@ -392,7 +322,7 @@ OutputFormatOption = typer.Option(
     "--format",
     help="Specifies the output format.",
     case_sensitive=False,
-    callback=_callback(lambda: cli_context_manager.set_output_format),
+    callback=_context_callback("output_format"),
     rich_help_panel=_CLI_BEHAVIOUR,
 )
 
@@ -400,7 +330,7 @@ SilentOption = typer.Option(
     False,
     "--silent",
     help="Turns off intermediate output to console.",
-    callback=_callback(lambda: cli_context_manager.set_silent),
+    callback=_context_callback("silent"),
     is_flag=True,
     rich_help_panel=_CLI_BEHAVIOUR,
     is_eager=True,
@@ -411,7 +341,7 @@ VerboseOption = typer.Option(
     "--verbose",
     "-v",
     help="Displays log entries for log levels `info` and higher.",
-    callback=_callback(lambda: cli_context_manager.set_verbose),
+    callback=_context_callback("verbose"),
     is_flag=True,
     rich_help_panel=_CLI_BEHAVIOUR,
 )
@@ -420,7 +350,7 @@ DebugOption = typer.Option(
     False,
     "--debug",
     help="Displays log entries for log levels `debug` and higher; debug logs contains additional information.",
-    callback=_callback(lambda: cli_context_manager.set_enable_tracebacks),
+    callback=_context_callback("enable_tracebacks"),
     is_flag=True,
     rich_help_panel=_CLI_BEHAVIOUR,
 )
@@ -461,6 +391,10 @@ OnErrorOption = typer.Option(
 NoInteractiveOption = typer.Option(False, "--no-interactive", help="Disable prompting.")
 
 
+def entity_argument(entity_type: str) -> typer.Argument:
+    return typer.Argument(None, help=f"ID of {entity_type} entity.")
+
+
 def variables_option(description: str):
     return typer.Option(
         None,
@@ -519,24 +453,49 @@ def experimental_option(
         "--experimental",
         help=help_text,
         hidden=True,
-        callback=_callback(lambda: cli_context_manager.set_experimental),
+        callback=_context_callback("experimental"),
         is_flag=True,
         rich_help_panel=_CLI_BEHAVIOUR,
     )
 
 
+class IdentifierType(click.ParamType):
+    name = "TEXT"
+
+    def convert(self, value, param, ctx):
+        return FQN.from_string(value)
+
+
+class IdentifierStageType(click.ParamType):
+    name = "TEXT"
+
+    def convert(self, value, param, ctx):
+        return FQN.from_stage(value)
+
+
 def identifier_argument(
-    sf_object: str, example: str, callback: Callable | None = None
+    sf_object: str,
+    example: str,
+    click_type: click.ParamType = IdentifierType(),
+    callback: Callable | None = None,
 ) -> typer.Argument:
     return typer.Argument(
         ...,
         help=f"Identifier of the {sf_object}. For example: {example}",
         show_default=False,
-        click_type=IdentifierType(),
+        click_type=click_type,
         callback=callback,
     )
 
 
+def identifier_stage_argument(
+    sf_object: str, example: str, callback: Callable | None = None
+) -> typer.Argument:
+    return identifier_argument(
+        sf_object, example, click_type=IdentifierStageType(), callback=callback
+    )
+
+
 def execution_identifier_argument(sf_object: str, example: str) -> typer.Argument:
     return typer.Argument(
         ...,
@@ -545,29 +504,12 @@ def execution_identifier_argument(sf_object: str, example: str) -> typer.Argumen
     )
 
 
-def register_project_definition(is_optional: bool) -> None:
-    project_path = cli_context_manager.project_path_arg
-    env_overrides_args = cli_context_manager.project_env_overrides_args
-
-    dm = DefinitionManager(project_path, {CONTEXT_KEY: {"env": env_overrides_args}})
-    project_definition = dm.project_definition
-    project_root = dm.project_root
-    template_context = dm.template_context
-
-    if not dm.has_definition_file and not is_optional:
-        raise MissingConfiguration(
-            "Cannot find project definition (snowflake.yml). Please provide a path to the project or run this command in a valid project directory."
-        )
-
-    cli_context_manager.set_project_definition(project_definition)
-    cli_context_manager.set_project_root(project_root)
-    cli_context_manager.set_template_context(template_context)
-
-
 def project_definition_option(is_optional: bool):
-    def project_definition_callback(project_path: str) -> None:
-        cli_context_manager.set_project_path_arg(project_path)
-        register_pre_execute_command(lambda: register_project_definition(is_optional))
+    def project_path_callback(project_path: str) -> str:
+        ctx_mgr = get_cli_context_manager()
+        ctx_mgr.project_path_arg = project_path
+        ctx_mgr.project_is_optional = is_optional
+        return project_path
 
     return typer.Option(
         None,
@@ -575,36 +517,26 @@ def project_definition_option(is_optional: bool):
         "--project",
         help=f"Path where Snowflake project resides. "
         f"Defaults to current working directory.",
-        callback=_callback(lambda: project_definition_callback),
+        callback=project_path_callback,
         show_default=False,
     )
 
 
 def project_env_overrides_option():
-    def project_env_overrides_callback(env_overrides_args_list: list[str]) -> None:
+    def project_env_overrides_callback(
+        env_overrides_args_list: list[str],
+    ) -> dict[str, str]:
         env_overrides_args_map = {
             v.key: v.value for v in parse_key_value_variables(env_overrides_args_list)
         }
-        cli_context_manager.set_project_env_overrides_args(env_overrides_args_map)
+        get_cli_context_manager().project_env_overrides_args = env_overrides_args_map
+        return env_overrides_args_map
 
     return typer.Option(
         [],
         "--env",
-        help="String in format of key=value. Overrides variables from env section used for templating.",
-        callback=_callback(lambda: project_env_overrides_callback),
-        show_default=False,
-    )
-
-
-def readable_file_option(param_name: str, help_str: str) -> typer.Option:
-    return typer.Option(
-        None,
-        param_name,
-        exists=True,
-        file_okay=True,
-        dir_okay=False,
-        readable=True,
-        help=help_str,
+        help="String in format of key=value. Overrides variables from env section used for templates.",
+        callback=project_env_overrides_callback,
         show_default=False,
     )
 
@@ -627,36 +559,3 @@ def deprecated_flag_callback_enum(msg: str):
         return value.value
 
     return _warning_callback
-
-
-@dataclass
-class Variable:
-    key: str
-    value: str
-
-    def __init__(self, key: str, value: str):
-        self.key = key
-        self.value = value
-
-
-def parse_key_value_variables(variables: Optional[List[str]]) -> List[Variable]:
-    """Util for parsing key=value input. Useful for commands accepting multiple input options."""
-    if not variables:
-        return []
-    result: List[Variable] = []
-    if not variables:
-        return result
-    for p in variables:
-        if "=" not in p:
-            raise ClickException(f"Invalid variable: '{p}'")
-
-        key, value = p.split("=", 1)
-        result.append(Variable(key.strip(), value.strip()))
-    return result
-
-
-class IdentifierType(click.ParamType):
-    name = "TEXT"
-
-    def convert(self, value, param, ctx):
-        return FQN.from_string(value)