From b973c305bf9e78d5d9bc71633bb557235054a7da Mon Sep 17 00:00:00 2001 From: linuxdaemon Date: Mon, 20 May 2024 20:55:37 +0000 Subject: [PATCH] style: clean up issues --- pyproject.toml | 2 - src/gvm_sync_targets/cli/__init__.py | 15 +-- .../models/targets_response_test.py | 99 +++++++++++++++---- 3 files changed, 87 insertions(+), 29 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 32e2e2c..dd67719 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -113,13 +113,11 @@ extend-safe-fixes = [ "D200", ] ignore = [ - "TRY003", # TODO(aspen): Switch to custom exceptions "ANN101", # Due to be deprecated in ruff "ANN102", # Due to be deprecated in ruff "COM812", # Conflicts with formatter "ISC001", # Conflicts with formatter "EXE002", # pre-commit does it better, works with SMB shares - "FA100", "D", ] select = ["ALL"] diff --git a/src/gvm_sync_targets/cli/__init__.py b/src/gvm_sync_targets/cli/__init__.py index 9e15502..cf78532 100644 --- a/src/gvm_sync_targets/cli/__init__.py +++ b/src/gvm_sync_targets/cli/__init__.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT import logging -from typing import TextIO +from typing import TYPE_CHECKING, TextIO import click from gvm.connections import DebugConnection, UnixSocketConnection @@ -11,9 +11,11 @@ from gvm_sync_targets import __version__ from gvm_sync_targets.models import GetTargetsResponse, ModelTransform -from gvm_sync_targets.models.targets_response import CreateTargetResponse from gvm_sync_targets.util import get_all_hosts, read_lines +if TYPE_CHECKING: + from gvm_sync_targets.models.targets_response import CreateTargetResponse + @click.group( context_settings={ @@ -82,10 +84,11 @@ def gvm_sync_targets( target = resp.targets[0] click.echo(target) - if target.tasks: - task_ids = [task.uuid for task in target.tasks.tasks] - else: - task_ids = [] + task_ids = ( + [task.uuid for task in target.tasks.tasks] + if target.tasks + else [] + ) for task_id in task_ids: gmp.modify_task(task_id, target_id=new_target.uuid) diff --git a/tests/gvm_sync_targets/models/targets_response_test.py b/tests/gvm_sync_targets/models/targets_response_test.py index 9ef8007..bfdf3b0 100644 --- a/tests/gvm_sync_targets/models/targets_response_test.py +++ b/tests/gvm_sync_targets/models/targets_response_test.py @@ -85,27 +85,63 @@ 0 - 0 - 0 - 0 + + + 0 + + + + 0 + + + + 0 + 0 0 - Scan Config Default1 + Scan Config Default + 1 adminUnnamed 2024-05-15T20:41:23Z 2024-05-15T20:41:23Z 11 - Everything + + Everything + 1.2.3.4, 1::1 - 41 - All IANA assigned TCP0 - SSH auth220 - 00 - 00 - 00 - Scan Config Default1 + + 41 + + All IANA assigned TCP + 0 + + + SSH auth + 22 + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + 0 + 0 + Scan Config Default + 1 first=1 rows=10 sort=name @@ -227,25 +263,46 @@ 0 0 - 0 + + 0 + 0 0 - Scan Config Default1 + Scan Config Default + 1 adminUnnamed 2024-05-15T20:41:23Z 2024-05-15T20:41:23Z 11 - Everything + + Everything + 1.2.3.4, 1::1 41 - All IANA assigned TCP0 - SSH auth220 - 00 - 00 - 00 - Scan Config Default1 + + All IANA assigned TCP0 + + + SSH auth220 + + + 0 + + + 0 + + + 0 + + + 0 + + 0 + 0 + Scan Config Default + 1 first=1 rows=10 sort=name