diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..f483c0e6 --- /dev/null +++ b/.flake8 @@ -0,0 +1,13 @@ +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2025 Felix Fontein + +[flake8] +extend-ignore = E203, E402, F401 +count = true +# TODO: decrease this to ~10 +max-complexity = 60 +# black's max-line-length is 89, but it doesn't touch long string literals. +# Since ansible-test's limit is 160, let's use that here. +max-line-length = 160 +statistics = true diff --git a/.mypy.ini b/.mypy.ini new file mode 100644 index 00000000..5104700a --- /dev/null +++ b/.mypy.ini @@ -0,0 +1,23 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +[mypy] +check_untyped_defs = True +disallow_untyped_defs = True + +# strict = True -- only try to enable once everything (including dependencies!) is typed +strict_equality = True +strict_bytes = True + +warn_redundant_casts = True +# warn_return_any = True +warn_unreachable = True + +[mypy-ansible.*] +# ansible-core has partial typing information +follow_untyped_imports = True + +[mypy-ansible_collections.community.internal_test_tools.*] +# community.internal_test_tools has no typing information +ignore_missing_imports = True diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 00000000..52711b61 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,636 @@ +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2025 Felix Fontein + +[MAIN] + +# Clear in-memory caches upon conclusion of linting. Useful if running pylint +# in a server-like mode. +clear-cache-post-run=no + +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# Specify a score threshold under which the program will exit with error. +fail-under=10 + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use, and will cap the count on Windows to +# avoid hangs. +jobs=0 + +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.7 + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type alias names. If left empty, type +# alias names will be checked with the set naming style. +#typealias-rgx= + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +#variable-rgx= + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + asyncSetUp, + __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=mcs + + +[DESIGN] + +# List of regular expressions of class ancestor names to ignore when counting +# public methods (see R0903) +exclude-too-few-public-methods= + +# List of qualified class names to ignore when counting class parents (see +# R0901) +ignored-parents= + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of positional arguments for function / method. +max-positional-arguments=5 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +overgeneral-exceptions=builtins.BaseException,builtins.Exception + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=160 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow explicit reexports by alias from a package __init__. +allow-reexport-from-package=no + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=raw-checker-failed, + bad-inline-option, + deprecated-pragma, + duplicate-code, + file-ignored, + import-outside-toplevel, + missing-class-docstring, + missing-function-docstring, + missing-module-docstring, + locally-disabled, + suppressed-message, + use-implicit-booleaness-not-comparison, + use-implicit-booleaness-not-comparison-to-string, + use-implicit-booleaness-not-comparison-to-zero, + superfluous-parens, + too-few-public-methods, + too-many-ancestors, + too-many-arguments, + too-many-boolean-expressions, + too-many-branches, + too-many-function-args, + too-many-instance-attributes, + too-many-lines, + too-many-locals, + too-many-nested-blocks, + too-many-positional-arguments, + too-many-public-methods, + too-many-return-statements, + too-many-statements, + ungrouped-imports, + useless-parent-delegation, + wrong-import-order, + wrong-import-position, + # To clean up: + abstract-method, + arguments-differ, + assignment-from-no-return, + attribute-defined-outside-init, + broad-exception-caught, + broad-exception-raised, + consider-iterating-dictionary, + consider-using-dict-comprehension, + consider-using-f-string, + consider-using-in, + consider-using-max-builtin, + consider-using-with, + cyclic-import, + fixme, + function-redefined, + import-error, + invalid-name, + keyword-arg-before-vararg, + line-too-long, + no-else-continue, + no-else-raise, + no-else-return, + no-member, + no-name-in-module, + not-an-iterable, + pointless-string-statement, + possibly-used-before-assignment, + protected-access, + raise-missing-from, + redefined-argument-from-local, + redefined-builtin, + redefined-outer-name, + simplifiable-if-expression, + subprocess-popen-preexec-fn, + super-init-not-called, + super-with-arguments, + unexpected-keyword-arg, + unnecessary-dunder-call, + unnecessary-pass, + unspecified-encoding, + unsupported-assignment-operation, + unused-argument, + unused-variable, + use-dict-literal, + use-list-literal, + useless-object-inheritance, + useless-return, + # Cannot remove yet due to inadequacy of rules + inconsistent-return-statements, # doesn't notice that fail_json() does not return + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable= + + +[METHOD_ARGS] + +# List of qualified names (i.e., library.method) which require a timeout +# parameter e.g. 'requests.api.get,requests.api.post' +timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error + +# Let 'consider-using-join' be raised when the separator to join on would be +# non-empty (resulting in expected fixes of the type: ``"- " + " - +# ".join(items)``) +suggest-join-with-non-empty-separator=yes + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= + +# Set the output format. Available formats are: text, parseable, colorized, +# json2 (improved json format), json (old json format) and msvs (visual +# studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes + + +[SIMILARITIES] + +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. No available dictionaries : You need to install +# both the python package and the system dependency for enchant to work. +spelling-dict= + +# List of comma separated words that should be considered directives if they +# appear at the beginning of a comment and should not be checked. +spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy: + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of names allowed to shadow builtins +allowed-redefined-builtins= + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io diff --git a/antsibull-nox.toml b/antsibull-nox.toml index 979f73eb..199c56bc 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -19,13 +19,22 @@ stable_branches = [ "stable-*" ] run_isort = true isort_config = ".isort.cfg" run_black = true -run_flake8 = false -run_pylint = false +run_flake8 = true +flake8_config = ".flake8" +run_pylint = true +pylint_rcfile = ".pylintrc" run_yamllint = true yamllint_config = ".yamllint" yamllint_config_plugins = ".yamllint-docs" yamllint_config_plugins_examples = ".yamllint-examples" -run_mypy = false +run_mypy = true +mypy_ansible_core_package = "ansible-core>=2.19.0" +mypy_config = ".mypy.ini" +# mypy_extra_deps = [ +# "cryptography", +# "types-mock", +# "types-PyYAML", +# ] [sessions.docs_check] validate_collection_refs="all" diff --git a/plugins/module_utils/_common.py b/plugins/module_utils/_common.py index 08f35cd8..b11d072a 100644 --- a/plugins/module_utils/_common.py +++ b/plugins/module_utils/_common.py @@ -387,7 +387,7 @@ class AnsibleDockerClientBase(Client): result = self.inspect_container(container=container_id) self.log("Completed container inspection") return result - except NotFound as dummy: + except NotFound: return None except Exception as exc: self.fail(f"Error inspecting container: {exc}") @@ -461,7 +461,7 @@ class AnsibleDockerClientBase(Client): self.log(f"Inspecting network Id {network_id}") result = self.inspect_network(network_id) self.log("Completed network inspection") - except NotFound as dummy: + except NotFound: return None except Exception as exc: self.fail(f"Error inspecting network: {exc}") diff --git a/plugins/module_utils/_common_api.py b/plugins/module_utils/_common_api.py index 86392762..4ad665c5 100644 --- a/plugins/module_utils/_common_api.py +++ b/plugins/module_utils/_common_api.py @@ -287,7 +287,7 @@ class AnsibleDockerClientBase(Client): result = self.get_json("/containers/{0}/json", container_id) self.log("Completed container inspection") return result - except NotFound as dummy: + except NotFound: return None except Exception as exc: self.fail(f"Error inspecting container: {exc}") @@ -369,7 +369,7 @@ class AnsibleDockerClientBase(Client): self.log(f"Inspecting network Id {network_id}") result = self.get_json("/networks/{0}", network_id) self.log("Completed network inspection") - except NotFound as dummy: + except NotFound: return None except Exception as exc: self.fail(f"Error inspecting network: {exc}") diff --git a/plugins/module_utils/_common_cli.py b/plugins/module_utils/_common_cli.py index 0b5ba89b..b1492823 100644 --- a/plugins/module_utils/_common_cli.py +++ b/plugins/module_utils/_common_cli.py @@ -229,8 +229,6 @@ class AnsibleDockerClientBase(object): check_rc=True, ) if tag: - lookup = f"{name}:{tag}" - lookup_digest = f"{name}@{tag}" response = images images = [] for image in response: diff --git a/plugins/module_utils/_module_container/base.py b/plugins/module_utils/_module_container/base.py index 001a1af7..0d350138 100644 --- a/plugins/module_utils/_module_container/base.py +++ b/plugins/module_utils/_module_container/base.py @@ -706,7 +706,7 @@ def _preprocess_mounts(module, values): if mount_dict["tmpfs_mode"] is not None: try: mount_dict["tmpfs_mode"] = int(mount_dict["tmpfs_mode"], 8) - except Exception as dummy: + except Exception: module.fail_json( msg=f'tmp_fs mode of mount "{target}" is not an octal string!' ) diff --git a/plugins/module_utils/_module_container/docker_api.py b/plugins/module_utils/_module_container/docker_api.py index 00c3acfb..1604eebc 100644 --- a/plugins/module_utils/_module_container/docker_api.py +++ b/plugins/module_utils/_module_container/docker_api.py @@ -419,7 +419,7 @@ class DockerAPIEngineDriver(EngineDriver): while True: try: client.delete_call("/containers/{0}", container_id, params=params) - except NotFound as dummy: + except NotFound: pass except APIError as exc: if ( @@ -548,7 +548,6 @@ class DockerAPIEngine(Engine): return {} return {options[0].name: value} - get_expected_values_ = None if get_expected_value: def get_expected_values_( @@ -566,6 +565,9 @@ class DockerAPIEngine(Engine): return values return {options[0].name: value} + else: + get_expected_values_ = None + def set_value(module, data, api_version, options, values): if len(options) != 1: raise AssertionError( @@ -578,7 +580,6 @@ class DockerAPIEngine(Engine): value = preprocess_for_set(module, api_version, value) data[config_name] = value - update_value = None if update_parameter: def update_value(module, data, api_version, options, values): @@ -593,6 +594,9 @@ class DockerAPIEngine(Engine): value = preprocess_for_set(module, api_version, value) data[update_parameter] = value + else: + update_value = None + return cls( get_value=get_value, preprocess_value=preprocess_value_, @@ -644,7 +648,6 @@ class DockerAPIEngine(Engine): return {} return {options[0].name: value} - get_expected_values_ = None if get_expected_value: def get_expected_values_( @@ -662,6 +665,9 @@ class DockerAPIEngine(Engine): return values return {options[0].name: value} + else: + get_expected_values_ = None + def set_value(module, data, api_version, options, values): if len(options) != 1: raise AssertionError( @@ -676,7 +682,6 @@ class DockerAPIEngine(Engine): value = preprocess_for_set(module, api_version, value) data["HostConfig"][host_config_name] = value - update_value = None if update_parameter: def update_value(module, data, api_version, options, values): @@ -691,6 +696,9 @@ class DockerAPIEngine(Engine): value = preprocess_for_set(module, api_version, value) data[update_parameter] = value + else: + update_value = None + return cls( get_value=get_value, preprocess_value=preprocess_value_, diff --git a/plugins/modules/docker_compose_v2.py b/plugins/modules/docker_compose_v2.py index 585193f4..e1cd7973 100644 --- a/plugins/modules/docker_compose_v2.py +++ b/plugins/modules/docker_compose_v2.py @@ -484,7 +484,7 @@ class ServicesManager(BaseComposeManager): self.fail(f"The key {key!r} for `scale` is not a string") try: value = check_type_int(value) - except TypeError as exc: + except TypeError: self.fail(f"The value {value!r} for `scale[{key!r}]` is not an integer") if value < 0: self.fail(f"The value {value!r} for `scale[{key!r}]` is negative") diff --git a/plugins/modules/docker_volume_info.py b/plugins/modules/docker_volume_info.py index c3171891..e051bd77 100644 --- a/plugins/modules/docker_volume_info.py +++ b/plugins/modules/docker_volume_info.py @@ -85,7 +85,7 @@ from ansible_collections.community.docker.plugins.module_utils._common_api impor def get_existing_volume(client, volume_name): try: return client.get_json("/volumes/{0}", volume_name) - except NotFound as dummy: + except NotFound: return None except Exception as exc: client.fail(f"Error inspecting volume: {exc}") diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py index c0278fc2..d2a7ca03 100644 --- a/tests/unit/plugins/connection/test_docker.py +++ b/tests/unit/plugins/connection/test_docker.py @@ -68,7 +68,6 @@ class TestDockerConnectionClass(unittest.TestCase): self, mock_new_docker_version, mock_old_docker_version ): self.dc._version = None - version = self.dc.docker_version # old version and new version fail @mock.patch( diff --git a/tests/unit/plugins/module_utils/test__logfmt.py b/tests/unit/plugins/module_utils/test__logfmt.py index efb1fa67..f45cde94 100644 --- a/tests/unit/plugins/module_utils/test__logfmt.py +++ b/tests/unit/plugins/module_utils/test__logfmt.py @@ -93,7 +93,7 @@ def test_parse_line_success(line, kwargs, result): @pytest.mark.parametrize("line, kwargs, message", FAILURE_TEST_CASES) -def test_parse_line_success(line, kwargs, message): +def test_parse_line_failure(line, kwargs, message): with pytest.raises(InvalidLogFmt) as exc: parse_line(line, **kwargs)