diff --git a/changelogs/fragments/84490-allow-iptables-chain-creation-with-wait.yml b/changelogs/fragments/84490-allow-iptables-chain-creation-with-wait.yml index 330c39f24fe..8d8d3fcff2f 100644 --- a/changelogs/fragments/84490-allow-iptables-chain-creation-with-wait.yml +++ b/changelogs/fragments/84490-allow-iptables-chain-creation-with-wait.yml @@ -1,2 +1,2 @@ bugfixes: - - iptables - Allows the wait paramater to be used with iptables chain creation (https://github.com/ansible/ansible/issues/84490) + - iptables - Allows the wait parameter to be used with iptables chain creation (https://github.com/ansible/ansible/issues/84490) diff --git a/lib/ansible/_internal/__init__.py b/lib/ansible/_internal/__init__.py index eaf75bb1069..54f76d5a062 100644 --- a/lib/ansible/_internal/__init__.py +++ b/lib/ansible/_internal/__init__.py @@ -18,7 +18,7 @@ def get_controller_serialize_map() -> dict[type, t.Callable]: return { _lazy_containers._AnsibleLazyTemplateDict: _profiles._JSONSerializationProfile.discard_tags, _lazy_containers._AnsibleLazyTemplateList: _profiles._JSONSerializationProfile.discard_tags, - EncryptedString: str, # preserves tags since this is an intance of EncryptedString; if tags should be discarded from str, another entry will handle it + EncryptedString: str, # preserves tags since this is an instance of EncryptedString; if tags should be discarded from str, another entry will handle it } diff --git a/lib/ansible/_internal/_json/__init__.py b/lib/ansible/_internal/_json/__init__.py index 5827ddc4cb8..4e725e31a7d 100644 --- a/lib/ansible/_internal/_json/__init__.py +++ b/lib/ansible/_internal/_json/__init__.py @@ -152,7 +152,7 @@ class AnsibleVariableVisitor: result: _T # DTFIX-RELEASE: the visitor is ignoring dict/mapping keys except for debugging and schema-aware checking, it should be doing type checks on keys - # keep in mind the allowed types for keys is a more restrictive set than for values (str and taggged str only, not EncryptedString) + # keep in mind the allowed types for keys is a more restrictive set than for values (str and tagged str only, not EncryptedString) # DTFIX-RELEASE: some type lists being consulted (the ones from datatag) are probably too permissive, and perhaps should not be dynamic if (result := self._early_visit(value, value_type)) is not _sentinel: diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 63095bee382..c6073bd44e1 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -1002,7 +1002,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin): # tells the module to ignore options that are not in its argspec. module_args['_ansible_ignore_unknown_opts'] = ignore_unknown_opts - # allow user to insert string to add context to remote loggging + # allow user to insert string to add context to remote logging module_args['_ansible_target_log_info'] = C.config.get_config_value('TARGET_LOG_INFO', variables=task_vars) module_args['_ansible_tracebacks_for'] = _traceback.traceback_for() diff --git a/test/integration/targets/cache-plugins/test_inventory_cache.yml b/test/integration/targets/cache-plugins/test_inventory_cache.yml index 868b94b69a4..ea08851043d 100644 --- a/test/integration/targets/cache-plugins/test_inventory_cache.yml +++ b/test/integration/targets/cache-plugins/test_inventory_cache.yml @@ -2,7 +2,7 @@ gather_facts: no vars: cache_options_message: "Cache options were provided but may not reconcile correctly unless set via set_options" - no_parse_messsage: "No inventory was parsed, only implicit localhost is available" + no_parse_message: "No inventory was parsed, only implicit localhost is available" expected_host_name: host1 base_environment: ANSIBLE_INVENTORY_CACHE: true @@ -20,7 +20,7 @@ assert: that: - result.stderr is contains cache_options_message - - result.stderr is contains no_parse_messsage + - result.stderr is contains no_parse_message - result.stdout is not contains expected_host_name - name: cache plugin updated to use config manager should work @@ -32,5 +32,5 @@ assert: that: - result.stderr is not contains cache_options_message - - result.stderr is not contains no_parse_messsage + - result.stderr is not contains no_parse_message - result.stdout is contains expected_host_name