xsoar-cli 2.1.0__tar.gz → 2.2.0__tar.gz

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/CHANGELOG.md

@@ -8,6 +8,38 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Added
 
+- `config set-version-check` command to enable or disable the version update check on CLI startup. Accepts `--enable` or `--disable`.
+- `plugins init` command to create the plugins directory and generate an example plugin.
+
+### Changed
+
+- **Breaking:** Plugins must explicitly import `XSOARPlugin` (`from xsoar_cli.plugins import XSOARPlugin`). The base class is no longer injected automatically and so old plugins require modification. See the [plugin README](src/xsoar_cli/plugins/README.md) for details.
+- Plugin commands (`list`, `info`, `validate`) now report a clear error when the plugins directory has not been initialized.
+- Plugin registration failures no longer prevent remaining plugins from loading.
+- `content get-detached --type` is now required. The `all` choice has been removed; specify `scripts` or `playbooks` explicitly.
+- `integration dump`, `rbac getroles`, `rbac getusers`, and `rbac getusergroups` no longer emit a trailing blank line after JSON output.
+- `config show` now uses `click.echo()` instead of `print()`, improving behavior when piping output to other tools.
+
+### Removed
+
+- The plugins directory is no longer automatically created on CLI startup. Run `xsoar-cli plugins init` to create it explicitly.
+
+### Fixed
+
+- `content get-detached` no longer fails when invoked without `--type` due to a stale default value that referenced the removed `all` choice.
+- Content bundle download (`get_content_bundle`) now raises on HTTP errors instead of silently proceeding and failing with a confusing `tarfile` error.
+
+## [2.1.1] - 2026-04-08
+
+### Changed
+
+- `manifest generate` now uses an `--output-dir` option (default: current directory) instead of a positional path argument. The output file is always named `xsoar_config.json`. Prompts for confirmation if the file already exists.
+- `manifest update`, `manifest validate`, `manifest diff`, and `manifest deploy` now support file path tab completion for the manifest argument.
+
+## [2.1.0] - 2026-04-08
+
+### Added
+
 - `completions install` command to generate and install shell completion scripts for Bash, Zsh (including Oh My Zsh), and Fish. Auto-detects the current shell from `$SHELL`, overridable with `--shell`.
 - `completions uninstall` command to remove previously installed completion scripts.
 - Shell completion no longer triggers the version update check or logging setup, which previously leaked output into completion results.
@@ -27,6 +59,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Added
 
 - `content download` subcommand for downloading individual content items by name. Supports playbooks and layouts (`xsoar-cli content download --type playbook|layout <name>`).
+- `content download --output` option to specify the content repository root directory. Useful when running xsoar-cli from outside the content repository.
+- `content download` automatically runs `demisto-sdk format` on downloaded files to ensure they conform to the content repository standard.
+- `content download` re-attaches downloaded content items to their pack after writing, so they no longer appear as detached in XSOAR.
+- `content download` resolves the content item's pack ID and writes to the correct `Packs/<pack_id>/` directory. Prompts for fallback to the current working directory if the pack directory does not exist.
 
 ## [2.0.0] - 2026-04-07
 
@@ -72,4 +108,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Removed
 
-- `config validate --stacktrace` option. Use `--verbose` / `-v` instead.
+- `config validate --stacktrace` option. Use `--verbose` / `-v` instead.

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/CLAUDE.md

@@ -64,6 +64,7 @@ src/xsoar_cli/            # Main package (src layout)
       azure.py            # AzureArtifactProvider (Azure Blob Storage)
   commands/               # CLI command groups
     case/                 # Case operations command group
+    completions/          # Shell autocompletion command group
     config/               # Config management command group
     content/              # Content download/list command group
     graph/                # Dependency graph command group
@@ -124,9 +125,6 @@ Always use `--no-pager` when running git commands (e.g. `git --no-pager log`, `g
 ```sh
 # Install dependencies
 uv sync
-uv pip install -r requirements.txt
-uv pip install -r requirements_dev.txt
-uv pip install -e .
 
 # Run all tests
 uv run pytest

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/CONTRIBUTING.md

@@ -44,40 +44,16 @@ For other platforms and installation options, see the [uv installation docs](htt
 
 ### 3. Set Up Development Environment
 
-**Recommended: uv**
-
-You may find that you will need to make modifications in [xsoar-client](https://github.com/tlium/xsoar-client) and/or [xsoar-dependency-graph](https://github.com/tlium/xsoar-dependency-graph) in order
-to fix bugs or add new features to `xsoar-cli`. If you need to work on `xsoar-client` or `xsoar-dependency-graph`, install them in editable mode from your local Git clones:
-
-```bash
-uv pip install -e /path/to/your/xsoar-client
-uv pip install -e /path/to/your/xsoar-dependency-graph
-```
-
 ```bash
 # Install dependencies and xsoar-cli in editable mode
 uv sync
 uv pip install -e .
 ```
-**Alternative: pip/venv**
 
-```bash
-# Create and activate a virtual environment
-python -m venv venv
-source venv/bin/activate
-
-# Install development dependencies
-pip install -r requirements_dev.txt
-
-# Install xsoar-cli in editable mode
-pip install -e .
-```
-
-If you need to work on the supporting libraries, install them in editable mode as well:
+You may need to make modifications in [xsoar-dependency-graph](https://github.com/tlium/xsoar-dependency-graph) to fix bugs or add new features to `xsoar-cli`. If so, install it in editable mode from your local Git clone:
 
 ```bash
-pip install -e /path/to/your/xsoar-client
-pip install -e /path/to/your/xsoar-dependency-graph
+uv pip install -e /path/to/your/xsoar-dependency-graph
 ```
 
 ## Development Workflow
@@ -115,16 +91,15 @@ pip install -e /path/to/your/xsoar-dependency-graph
 
 #### Lazy imports
 
-Heavy third-party packages like `xsoar_client`, `xsoar_dependency_graph` and `demisto_client` pull in large dependency trees (boto3, azure-storage-blob, matplotlib, networkx, etc.) that are expensive to load. To keep everyday invocations like `--help` and `--version` fast, these imports are placed inside the functions that need them rather than at the top of the file. Each lazy import is marked with the comment `# Lazy import for performance reasons`.
+Heavy third-party packages like `xsoar_dependency_graph` and `demisto_client` pull in large dependency trees (boto3, azure-storage-blob, matplotlib, networkx, etc.) that are expensive to load. To keep everyday invocations like `--help` and `--version` fast, these imports are placed inside the functions that need them rather than at the top of the file. Each lazy import is marked with the comment `# Lazy import for performance reasons`.
 
-Type hints for the deferred types still appear in function signatures. To avoid quoting them as strings, modules that use this pattern include `from __future__ import annotations` and a `TYPE_CHECKING` block at the top:
+Type hints for the deferred types still appear in function signatures. To keep them clean, use a `TYPE_CHECKING` block at the top of the module:
 
 ```python
-from __future__ import annotations
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from xsoar_client.xsoar_client import Client
+    from xsoar_cli.xsoar_client.client import Client
 ```
 
 See `configuration.py` for a complete example.

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/PKG-INFO

@@ -1,6 +1,7 @@
 Metadata-Version: 2.4
 Name: xsoar-cli
-Version: 2.1.0
+Version: 2.2.0
+Summary: A command-line interface for managing Palo Alto Networks XSOAR (Cortex XSOAR)
 Project-URL: Documentation, https://github.com/tlium/xsoar-cli#readme
 Project-URL: Issues, https://github.com/tlium/xsoar-cli/issues
 Project-URL: Source, https://github.com/tlium/xsoar-cli

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.1.0'
-__version_tuple__ = version_tuple = (2, 1, 0)
+__version__ = version = '2.2.0'
+__version_tuple__ = version_tuple = (2, 2, 0)
 
 __commit_id__ = commit_id = None

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "xsoar-cli"
 dynamic = ["version"]
-description = ''
+description = 'A command-line interface for managing Palo Alto Networks XSOAR (Cortex XSOAR)'
 readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/cli.py

@@ -83,13 +83,29 @@ def _load_plugins() -> tuple[list[str], PluginManager]:
     """Captures core command names, then loads and registers plugins. Returns both."""
     core_commands = list(cli.commands.keys())
     manager = PluginManager()
-    try:
-        manager.load_all_plugins(ignore_errors=True)
-        for plugin_name, error in manager.get_failed_plugins().items():
-            click.echo(f"Warning: plugin '{plugin_name}' failed to load: {error}", err=True)
-        manager.register_plugin_commands(cli)
-    except Exception as e:
-        click.echo(f"Warning: failed to register plugin commands: {e}", err=True)
+
+    if not manager.plugins_dir_exists:
+        logging.getLogger(__name__).debug("Plugins directory not found, skipping plugin loading")
+        return core_commands, manager
+
+    manager.load_all_plugins(ignore_errors=True)
+
+    # Report load failures on stderr. These warnings run at module level before
+    # logging is configured, so logger.warning would be invisible. Plugin load
+    # failures are important enough to surface unconditionally.
+    load_failures = set(manager.get_failed_plugins().keys())
+    for plugin_name, error in manager.get_failed_plugins().items():
+        click.echo(f"Warning: plugin '{plugin_name}' failed to load: {error}", err=True)
+
+    manager.register_plugin_commands(cli)
+
+    # Registration failures are recorded in failed_plugins by the manager
+    # (skip-and-record pattern). Report only the new ones added during registration.
+    for plugin_name, error in manager.get_failed_plugins().items():
+        if plugin_name in load_failures:
+            continue  # Already reported above
+        click.echo(f"Warning: plugin '{plugin_name}' failed to register: {error}", err=True)
+
     return core_commands, manager
 
 

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/case/commands.py

@@ -8,7 +8,10 @@ from requests.exceptions import HTTPError
 from xsoar_cli.error_handling.connection import ConnectionErrorHandler
 from xsoar_cli.error_handling.http import HTTPErrorHandler
 from xsoar_cli.utilities.config_file import get_xsoar_config, load_config
-from xsoar_cli.utilities.validators import validate_environments
+from xsoar_cli.utilities.validators import validate_environments, validate_xsoar_connectivity
+
+if TYPE_CHECKING:
+    from xsoar_cli.xsoar_client.client import Client
 
 logger = logging.getLogger(__name__)
 
@@ -22,12 +25,9 @@ def parse_string_to_dict(input_string: str | None, delimiter: str) -> dict:
     return {key.strip(): value.strip() for key, value in valid_pairs}
 
 
-if TYPE_CHECKING:
-    from xsoar_cli.xsoar_client.client import Client
-
-
-@click.group(help="Create, retrieve, and clone cases")
+@click.group()
 def case() -> None:
+    """Create, retrieve, and clone cases"""
     pass
 
 
@@ -36,6 +36,7 @@ def case() -> None:
 @click.option("--environment", default=None, help="Default environment set in config file.")
 @click.pass_context
 @load_config
+@validate_xsoar_connectivity
 def get(ctx: click.Context, casenumber: int, environment: str | None) -> None:
     """Retrieve and display a single case.
 
@@ -82,7 +83,12 @@ def clone(ctx: click.Context, casenumber: int, source: str, dest: str) -> None:
         click.echo(f"Error: cannot find environments {source} and/or {dest} in config")
         ctx.exit(1)
 
-    # Test connectivity to both environments before proceeding
+    # Test connectivity to both environments before proceeding. This is the only function that does
+    # explicit connectivity testing and error handling due to the fact that it is the only function
+    # that operates on multiple environments. If later a new command or sub-command is added to
+    # xsoar-cli that operates on multiple environments, then a new decorator should be created to
+    # handle connectivity testing for multiple environments (@validate_xsoar_connectivity only tests
+    # a single environment)
     config = get_xsoar_config(ctx)
     for env_name in (source, dest):
         logger.debug("Testing XSOAR connectivity for environment '%s'", env_name)
@@ -159,6 +165,7 @@ def clone(ctx: click.Context, casenumber: int, source: str, dest: str) -> None:
 @click.argument("name", type=str, default="Test case created from xsoar-cli")
 @click.pass_context
 @load_config
+@validate_xsoar_connectivity
 def create(  # noqa: PLR0913
     ctx: click.Context,
     environment: str | None,

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/completions/commands.py

@@ -73,8 +73,9 @@ def _resolve_shell(shell_name: str | None) -> str:
     return detected
 
 
-@click.group(help="Install and manage shell completion for xsoar-cli.")
+@click.group()
 def completions() -> None:
+    """Install and manage shell completion for xsoar-cli"""
     pass
 
 

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/config/README.md

@@ -101,3 +101,21 @@ Set the Azure Blob Storage SAS token for an environment in the configuration fil
 xsoar-cli config set-azure-token my-sas-token
 xsoar-cli config set-azure-token --environment prod my-sas-token
 ```
+
+## Set Version Check
+
+Enable or disable the version update check on CLI startup. When enabled, the CLI checks PyPI for newer versions and prints a notice to stderr.
+
+**Syntax:** `xsoar-cli config set-version-check [OPTIONS]`
+
+**Options:**
+- `--enable` - Enable the version update check
+- `--disable` - Disable the version update check
+
+One of `--enable` or `--disable` must be provided.
+
+**Examples:**
+```
+xsoar-cli config set-version-check --enable
+xsoar-cli config set-version-check --disable
+```

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/config/commands.py

@@ -5,9 +5,6 @@ from typing import TYPE_CHECKING
 
 import click
 
-if TYPE_CHECKING:
-    from xsoar_cli.xsoar_client.client import Client
-
 from xsoar_cli.utilities.config_file import (
     get_config_file_contents,
     get_config_file_path,
@@ -15,6 +12,9 @@ from xsoar_cli.utilities.config_file import (
     load_config,
 )
 
+if TYPE_CHECKING:
+    from xsoar_cli.xsoar_client.client import Client
+
 logger = logging.getLogger(__name__)
 
 
@@ -47,8 +47,9 @@ def get_config_file_template_contents() -> dict:
     }
 
 
-@click.group(help="Create, validate, and manage CLI configuration")
+@click.group()
 def config() -> None:
+    """Create, validate, and manage CLI configuration"""
     pass
 
 
@@ -67,8 +68,7 @@ def show(ctx: click.Context, masked: bool) -> None:
             if "azure_storage_access_token" in config["server_config"][key]:
                 config["server_config"][key]["azure_storage_access_token"] = "*****"  # noqa: S105
 
-    print(json.dumps(config, indent=4))
-    ctx.exit()
+    click.echo(json.dumps(config, indent=4))
 
 
 @click.command()
@@ -203,8 +203,28 @@ def set_azure_token(ctx: click.Context, environment: str, sastoken: str) -> None
     logger.info("Azure SAS token updated for environment '%s'", environment)
 
 
+@click.command()
+@click.option("--enable", "action", flag_value="enable", help="Enable the version update check on CLI startup.")
+@click.option("--disable", "action", flag_value="disable", help="Disable the version update check on CLI startup.")
+@click.pass_context
+@load_config
+def set_version_check(ctx: click.Context, action: str | None) -> None:  # noqa: ARG001
+    """Enable or disable the version update check on CLI startup."""
+    if action is None:
+        raise click.UsageError("Specify either --enable or --disable.")
+    config_file = get_config_file_path()
+    config_data = json.loads(config_file.read_text())
+    # skip_version_check is the inverse: enabling the check means skip=False.
+    config_data["skip_version_check"] = action == "disable"
+    config_file.write_text(json.dumps(config_data, indent=4))
+    state = "enabled" if action == "enable" else "disabled"
+    logger.info("Version check %s", state)
+    click.echo(f"Version check {state}.")
+
+
 config.add_command(create)
 config.add_command(validate)
 config.add_command(show)
 config.add_command(set_credentials)
 config.add_command(set_azure_token)
+config.add_command(set_version_check)

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/content/commands.py

@@ -19,7 +19,8 @@ logger = logging.getLogger(__name__)
 
 @click.group()
 def content() -> None:
-    """Inspect and manage content items."""
+    """Inspect and manage content items"""
+    pass
 
 
 @click.command()
@@ -27,21 +28,20 @@ def content() -> None:
 @click.option(
     "--type",
     "content_type",
-    type=click.Choice(["scripts", "playbooks", "all"], case_sensitive=False),
-    default="all",
-    show_default=True,
+    type=click.Choice(["scripts", "playbooks"], case_sensitive=False),
+    required=True,
     help="Type of content items to retrieve.",
 )
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def get_detached(ctx: click.Context, environment: str | None, content_type: str) -> None:
     """List detached content items."""
     config = get_xsoar_config(ctx)
     xsoar_client: Client = config.get_client(environment)
     response = xsoar_client.content.get_detached(content_type)
-    click.echo(json.dumps(response.json(), indent=4))
-    click.echo(f"Getting detached content items ({content_type=})")
+    data = json.loads(response)
+    click.echo(json.dumps(data, indent=4))
 
 
 # We name the command in the decorator here to avoid shadowing the builtin list.
@@ -59,7 +59,7 @@ def get_detached(ctx: click.Context, environment: str | None, content_type: str)
 @click.option("--verbose", is_flag=True, default=False, help="Output the full unfiltered response.")
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def list_content(ctx: click.Context, environment: str | None, content_type: str, detail: bool, verbose: bool) -> None:
     """
     List detached content items. The purpose of this function is to list out available commands,
@@ -98,7 +98,7 @@ def list_content(ctx: click.Context, environment: str | None, content_type: str,
 @click.argument("name", type=str)
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def download(ctx: click.Context, environment: str | None, content_type: str, output_path: str | None, name: str) -> None:
     """Download a content item by name.
 

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/graph/commands.py

@@ -67,8 +67,9 @@ def _build_content_graph(
     return cg
 
 
-@click.group(help="(BETA) Create dependency graphs from one or more content packs")
+@click.group()
 def graph() -> None:
+    """(BETA) Create dependency graphs from one or more content packs"""
     pass
 
 
@@ -76,7 +77,7 @@ def graph() -> None:
 @click.command()
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def generate(ctx: click.Context, packs: tuple[Path], repo_path: str, upstream_repo_path: str, environment: str | None) -> None:
     """BETA
 
@@ -99,7 +100,7 @@ def generate(ctx: click.Context, packs: tuple[Path], repo_path: str, upstream_re
 @_common_graph_options
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def export(
     ctx: click.Context,
     packs: tuple[Path],

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/integration/commands.py

@@ -14,25 +14,25 @@ logger = logging.getLogger(__name__)
 
 
 @click.group()
-@click.pass_context
-def integration(ctx: click.Context) -> None:
+def integration() -> None:
     """(BETA) Save/load integration configuration for an integration instance."""
+    pass
 
 
 @click.command()
 @click.option("--environment", default=None, help="Default environment set in config file.")
-@click.option("--all", is_flag=True, default=False)
+@click.option("--all", "all_integrations", is_flag=True, default=False, help="Dump all integrations")
 @click.argument("name", type=str, required=False, default=None)
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
-def dump(ctx: click.Context, environment: str | None, name: str | None, all: bool) -> None:
+@validate_xsoar_connectivity
+def dump(ctx: click.Context, environment: str | None, name: str | None, all_integrations: bool) -> None:
     """Dump integration instance configuration to stdout as JSON."""
     config = get_xsoar_config(ctx)
     xsoar_client: Client = config.get_client(environment)
     logger.debug("Dumping integration config (environment: '%s')", environment or config.default_environment)
     integrations = xsoar_client.integrations.get_instances()
-    if all:
+    if all_integrations:
         logger.debug("Fetching config for all integrations (environment: '%s')", environment or config.default_environment)
         integration_data = integrations
     else:
@@ -41,11 +41,11 @@ def dump(ctx: click.Context, environment: str | None, name: str | None, all: boo
     if not integration_data:
         click.echo(f"Cannot find integration instance '{name}'")
         ctx.exit(1)
-    click.echo(json.dumps(integration_data, sort_keys=True, indent=4) + "\n")
+    click.echo(json.dumps(integration_data, sort_keys=True, indent=4))
 
 
 @click.command()
-def load(ctx: click.Context) -> None:
+def load() -> None:
     """Load integration instance configuration into XSOAR from a JSON file. Not yet implemented."""
     logger.debug("integration loadconfig command not implemented")
     click.echo("Command not implemented")

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/manifest/README.md

@@ -4,20 +4,19 @@ Content pack deployment management commands using a declarative configuration fi
 
 ## Generate
 
-Generate a new manifest file from currently installed content packs. Assumes all packs are marketplace packs (no custom packs).
+Generate a new manifest file from currently installed content packs. Assumes all packs are marketplace packs (no custom packs). The output file is always named `xsoar_config.json`. Prompts for confirmation if the file already exists.
 
-**Syntax:** `xsoar-cli manifest generate [OPTIONS] MANIFEST_PATH`
+**Syntax:** `xsoar-cli manifest generate [OPTIONS]`
 
 **Options:**
 - `--environment TEXT` - Target environment (default: uses default environment from config)
-
-**Arguments:**
-- `MANIFEST_PATH` - Path where the new manifest file will be created
+- `--output-dir DIRECTORY` - Directory to write xsoar_config.json to (default: current directory)
 
 **Examples:**
 ```
-xsoar-cli manifest generate ./xsoar_config.json
-xsoar-cli manifest generate --environment prod ./xsoar_config.json
+xsoar-cli manifest generate
+xsoar-cli manifest generate --output-dir /path/to/repo
+xsoar-cli manifest generate --environment prod
 ```
 
 ## Validate

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/manifest/commands.py

@@ -116,20 +116,34 @@ def _check_pack_availability(
 @click.group()
 def manifest() -> None:
     """Various commands to interact/update/deploy content packs defined in the xsoar_config.json manifest."""
+    pass
+
+
+MANIFEST_FILENAME = "xsoar_config.json"
 
 
 @click.command()
 @click.option("--environment", default=None, help="Default environment set in config file.")
-@click.argument("manifest_path", type=str)
+@click.option(
+    "--output-dir",
+    type=click.Path(exists=True, file_okay=False),
+    default=".",
+    show_default=True,
+    help="Directory to write xsoar_config.json to.",
+)
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
-def generate(ctx: click.Context, environment: str | None, manifest_path: str) -> None:
+@validate_xsoar_connectivity
+def generate(ctx: click.Context, environment: str | None, output_dir: str) -> None:
     """Generate a new xsoar_config.json manifest from installed content packs.
 
     This command assumes that you do not have any custom content packs uploaded to XSOAR.
     All packs will be added as "marketplace_packs" in the manifest.
     """
+    manifest_path = str(Path(output_dir) / MANIFEST_FILENAME)
+    if Path(manifest_path).is_file():
+        click.confirm(f"{manifest_path} already exists. Overwrite?", abort=True)
+
     config = get_xsoar_config(ctx)
     xsoar_client: Client = config.get_client(environment)
     logger.info("Generating manifest from installed packs (environment: '%s')", environment or config.default_environment)
@@ -151,11 +165,11 @@ def generate(ctx: click.Context, environment: str | None, manifest_path: str) ->
 
 @click.command()
 @click.option("--environment", default=None, help="Default environment set in config file.")
-@click.argument("manifest", type=str)
+@click.argument("manifest", type=click.Path(exists=True))
 @click.pass_context
 @load_config
 @validate_artifacts_provider
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def update(ctx: click.Context, environment: str | None, manifest: str) -> None:
     """Update manifest on disk with latest available content pack versions."""
     # Lazy import for performance reasons
@@ -239,11 +253,11 @@ def update(ctx: click.Context, environment: str | None, manifest: str) -> None:
     default="diff",
     help="Validate the full manifest, or only the definitions that diff with installed versions",
 )
-@click.argument("manifest", type=str)
+@click.argument("manifest", type=click.Path(exists=True))
 @click.pass_context
 @load_config
 @validate_artifacts_provider
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def validate(ctx: click.Context, environment: str | None, mode: str, manifest: str) -> None:
     """Validate manifest JSON and content pack availability.
 
@@ -304,10 +318,10 @@ def validate(ctx: click.Context, environment: str | None, mode: str, manifest: s
 
 @click.command()
 @click.option("--environment", default=None, help="Default environment set in config file.")
-@click.argument("manifest", type=str)
+@click.argument("manifest", type=click.Path(exists=True))
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def diff(ctx: click.Context, manifest: str, environment: str | None) -> None:
     """Prints out the differences (if any) between what is defined in the xsoar_config.json manifest and what is actually
     installed on the XSOAR server."""
@@ -362,11 +376,11 @@ def diff(ctx: click.Context, manifest: str, environment: str | None) -> None:
 @click.option("--environment", default=None, help="Default environment set in config file.")
 @click.option("--verbose", is_flag=True, default=False)
 @click.option("--yes", is_flag=True, default=False)
-@click.argument("manifest", type=str)
+@click.argument("manifest", type=click.Path(exists=True))
 @click.pass_context
 @load_config
 @validate_artifacts_provider
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def deploy(ctx: click.Context, environment: str | None, manifest: str, verbose: bool, yes: bool) -> None:  # noqa: FBT001
     """Deploy content packs to the server as defined in the xsoar_config.json manifest.
 

{xsoar_cli-2.1.0 → xsoar_cli-2.2.0}/src/xsoar_cli/commands/pack/commands.py

@@ -13,9 +13,9 @@ logger = logging.getLogger(__name__)
 
 
 @click.group()
-@click.pass_context
-def pack(ctx: click.Context) -> None:
+def pack() -> None:
     """Various content pack related commands."""
+    pass
 
 
 @click.command()
@@ -23,7 +23,7 @@ def pack(ctx: click.Context) -> None:
 @click.argument("pack_id", type=str)
 @click.pass_context
 @load_config
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def delete(ctx: click.Context, environment: str | None, pack_id: str) -> None:
     """Delete a content pack from the server."""
     config = get_xsoar_config(ctx)
@@ -45,7 +45,7 @@ def delete(ctx: click.Context, environment: str | None, pack_id: str) -> None:
 @click.pass_context
 @load_config
 @validate_artifacts_provider
-@validate_xsoar_connectivity()
+@validate_xsoar_connectivity
 def get_outdated(ctx: click.Context, environment: str | None) -> None:
     """Print a list of outdated content packs."""
     config = get_xsoar_config(ctx)