ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-21 11:19:00 +00:00
Code Activity

[PR #11879/77509be2 backport][stable-12] Replace .format() calls with f-strings across multiple plugins (#11881)

Browse source 
Replace .format() calls with f-strings across multiple plugins (#11879)

* Replace .format() calls with f-strings across multiple plugins



* Add changelog fragment for PR 11879



---------


(cherry picked from commit 77509be2aa)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
patchback[bot] 2026-04-19 12:49:29 +02:00 • committed by GitHub
parent 6458abb9c1
commit 748882dfa8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 88 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/modules/cobbler_sync.py
View file

@ -99,9 +99,9 @@ def main():
use_ssl = module.params["use_ssl"]
validate_certs = module.params["validate_certs"]
module.params["proto"] = "https" if use_ssl else "http"
proto = "https" if use_ssl else "http"
if not port:
module.params["port"] = "443" if use_ssl else "80"
port = "443" if use_ssl else "80"
result = dict(
changed=True,
@ -111,17 +111,13 @@ def main():
ssl_context = None if validate_certs or not use_ssl else ssl._create_unverified_context()
url = "{proto}://{host}:{port}/cobbler_api".format(**module.params)
url = f"{proto}://{module.params['host']}:{port}/cobbler_api"
conn = xmlrpc_client.ServerProxy(url, context=ssl_context)
try:
token = conn.login(username, password)
except xmlrpc_client.Fault as e:
module.fail_json(
msg="Failed to log in to Cobbler '{url}' as '{username}'. {error}".format(
url=url, error=f"{e}", **module.params
)
)
module.fail_json(msg=f"Failed to log in to Cobbler '{url}' as '{username}'. {e}")
except Exception as e:
module.fail_json(msg=f"Connection to '{url}' failed. {e}")

12
plugins/modules/cobbler_system.py
View file

@ -220,9 +220,9 @@ def main():
name = module.params["name"]
state = module.params["state"]
module.params["proto"] = "https" if use_ssl else "http"
proto = "https" if use_ssl else "http"
if not port:
module.params["port"] = "443" if use_ssl else "80"
port = "443" if use_ssl else "80"
result = dict(
changed=False,
@ -232,17 +232,13 @@ def main():
ssl_context = None if validate_certs or not use_ssl else ssl._create_unverified_context()
url = "{proto}://{host}:{port}/cobbler_api".format(**module.params)
url = f"{proto}://{module.params['host']}:{port}/cobbler_api"
conn = xmlrpc_client.ServerProxy(url, context=ssl_context)
try:
token = conn.login(username, password)
except xmlrpc_client.Fault as e:
module.fail_json(
msg="Failed to log in to Cobbler '{url}' as '{username}'. {error}".format(
url=url, error=f"{e}", **module.params
)
)
module.fail_json(msg=f"Failed to log in to Cobbler '{url}' as '{username}'. {e}")
except Exception as e:
module.fail_json(msg=f"Connection to '{url}' failed. {e}")

19
plugins/modules/manageiq_alert_profiles.py
View file

@ -135,8 +135,7 @@ class ManageIQAlertProfiles:
# now that it has been created, we can assign the alerts
self.assign_or_unassign(result["results"][0], alerts, "assign")
msg = "Profile {name} created successfully"
msg = msg.format(name=profile["name"])
msg = f"Profile {profile['name']} created successfully"
return dict(changed=True, msg=msg)
def delete_profile(self, profile):
@ -161,12 +160,14 @@ class ManageIQAlertProfiles:
try:
result = self.client.post(subcollection_url, resources=alerts, action=action)
if len(result["results"]) != len(alerts):
msg = "Failed to {action} alerts to profile '{name}',expected {expected} alerts to be {action}ed,but only {changed} were {action}ed"
msg = msg.format(action=action, name=profile["name"], expected=len(alerts), changed=result["results"])
msg = (
f"Failed to {action} alerts to profile '{profile['name']}', "
f"expected {len(alerts)} alerts to be {action}ed, "
f"but only {result['results']} were {action}ed"
)
self.module.fail_json(msg=msg)
except Exception as e:
msg = "Failed to {action} alerts to profile '{name}': {error}"
msg = msg.format(action=action, name=profile["name"], error=e)
msg = f"Failed to {action} alerts to profile '{profile['name']}': {e}"
self.module.fail_json(msg=msg)
return result["results"]
@ -220,8 +221,7 @@ class ManageIQAlertProfiles:
try:
self.client.post(old_profile["href"], resource=profile_dict, action="edit")
except Exception as e:
msg = "Updating profile '{name}' failed: {error}"
msg = msg.format(name=old_profile["name"], error=e)
msg = f"Updating profile '{old_profile['name']}' failed: {e}"
self.module.fail_json(msg=msg)
if changed:
@ -280,8 +280,7 @@ def main():
res_args = manageiq_alert_profiles.delete_profile(existing_profile)
else:
# This alert profile does not exist in ManageIQ, and that's okay
msg = "Alert profile '{name}' does not exist in ManageIQ"
msg = msg.format(name=name)
msg = f"Alert profile '{name}' does not exist in ManageIQ"
res_args = dict(changed=False, msg=msg)
module.exit_json(**res_args)

35
plugins/modules/manageiq_alerts.py
View file

@ -213,30 +213,25 @@ class ManageIQAlerts:
try:
result = self.client.post(self.alerts_url, action="create", resource=alert)
msg = "Alert {description} created successfully: {details}"
msg = msg.format(description=alert["description"], details=result)
msg = f"Alert {alert['description']} created successfully: {result}"
return dict(changed=True, msg=msg)
except Exception as e:
msg = "Creating alert {description} failed: {error}"
description = alert["description"]
if "Resource expression needs be specified" in str(e):
# Running on an older version of ManageIQ and trying to create a hash expression
msg = msg.format(
description=alert["description"], error="Your version of ManageIQ does not support hash_expression"
)
msg = f"Creating alert {description} failed: Your version of ManageIQ does not support hash_expression"
else:
msg = msg.format(description=alert["description"], error=e)
msg = f"Creating alert {description} failed: {e}"
self.module.fail_json(msg=msg)
def delete_alert(self, alert):
"""Delete an alert"""
try:
result = self.client.post(f"{self.alerts_url}/{alert['id']}", action="delete")
msg = "Alert {description} deleted: {details}"
msg = msg.format(description=alert["description"], details=result)
msg = f"Alert {alert['description']} deleted: {result}"
return dict(changed=True, msg=msg)
except Exception as e:
msg = "Deleting alert {description} failed: {error}"
msg = msg.format(description=alert["description"], error=e)
msg = f"Deleting alert {alert['description']} failed: {e}"
self.module.fail_json(msg=msg)
def update_alert(self, existing_alert, new_alert):
@ -254,27 +249,22 @@ class ManageIQAlerts:
# the result to the expected result.
if new_alert_obj == ManageIQAlert(result):
# success!
msg = "Alert {description} updated successfully: {details}"
msg = msg.format(description=existing_alert["description"], details=result)
msg = f"Alert {existing_alert['description']} updated successfully: {result}"
return dict(changed=True, msg=msg)
else:
# unexpected result
msg = "Updating alert {description} failed, unexpected result {details}"
msg = msg.format(description=existing_alert["description"], details=result)
msg = f"Updating alert {existing_alert['description']} failed, unexpected result {result}"
self.module.fail_json(msg=msg)
except Exception as e:
msg = "Updating alert {description} failed: {error}"
description = existing_alert["description"]
if "Resource expression needs be specified" in str(e):
# Running on an older version of ManageIQ and trying to update a hash expression
msg = msg.format(
description=existing_alert["description"],
error="Your version of ManageIQ does not support hash_expression",
)
msg = f"Updating alert {description} failed: Your version of ManageIQ does not support hash_expression"
else:
msg = msg.format(description=existing_alert["description"], error=e)
msg = f"Updating alert {description} failed: {e}"
self.module.fail_json(msg=msg)
@ -337,8 +327,7 @@ def main():
res_args = manageiq_alerts.delete_alert(existing_alert)
else:
# it doesn't exist, and that's okay
msg = "Alert '{description}' does not exist in ManageIQ"
msg = msg.format(description=description)
msg = f"Alert '{description}' does not exist in ManageIQ"
res_args = dict(changed=False, msg=msg)
module.exit_json(**res_args)

5
plugins/modules/oneview_san_manager.py
View file

@ -140,7 +140,6 @@ class SanManagerModule(OneViewModuleBase):
MSG_DELETED = "SAN Manager deleted successfully."
MSG_ALREADY_PRESENT = "SAN Manager is already present."
MSG_ALREADY_ABSENT = "SAN Manager is already absent."
MSG_SAN_MANAGER_PROVIDER_DISPLAY_NAME_NOT_FOUND = "The provider '{0}' was not found."
argument_spec = dict(
state=dict(type="str", default="present", choices=["absent", "present", "connection_information_set"]),
@ -161,7 +160,7 @@ class SanManagerModule(OneViewModuleBase):
else:
msg = 'A "name" or "connectionInfo" must be provided inside the "data" field for this operation. '
msg += 'If a "connectionInfo" is provided, the "Host" name is considered as the "name" for the resource.'
raise OneViewModuleValueError(msg.format())
raise OneViewModuleValueError(msg)
resource = self.resource_client.get_by_name(resource_name)
@ -211,7 +210,7 @@ class SanManagerModule(OneViewModuleBase):
provider_uri = self.resource_client.get_provider_uri(display_name)
if not provider_uri:
raise OneViewModuleValueError(self.MSG_SAN_MANAGER_PROVIDER_DISPLAY_NAME_NOT_FOUND.format(display_name))
raise OneViewModuleValueError(f"The provider '{display_name}' was not found.")
return provider_uri

2
plugins/modules/packet_device.py
View file

@ -286,7 +286,7 @@ except ImportError:
HAS_PACKET_SDK = False
NAME_RE = r"({0}|{0}{1}*{0})".format(r"[a-zA-Z0-9]", r"[a-zA-Z0-9\-]")
NAME_RE = r"([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])"
HOSTNAME_RE = rf"({NAME_RE}\.)*{NAME_RE}$"
MAX_DEVICES = 100

2
plugins/modules/packet_ip_subnet.py
View file

@ -158,7 +158,7 @@ except ImportError:
HAS_PACKET_SDK = False
NAME_RE = r"({0}|{0}{1}*{0})".format(r"[a-zA-Z0-9]", r"[a-zA-Z0-9\-]")
NAME_RE = r"([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])"
HOSTNAME_RE = rf"({NAME_RE}\.)*{NAME_RE}$"
PROJECT_MAX_DEVICES = 100

38
plugins/modules/pubnub_blocks.py
View file

@ -275,12 +275,14 @@ def pubnub_account(module, user):
account_name = params.get("account")
account = user.account(name=params.get("account"))
if account is None:
err_frmt = (
"It looks like there is no '{0}' account for "
"authorized user. Please make sure what correct "
"name has been passed during module configuration."
module.fail_json(
msg="Missing account.",
description=(
f"It looks like there is no '{account_name}' account for authorized user. "
"Please make sure what correct name has been passed during module configuration."
),
changed=False,
)
module.fail_json(msg="Missing account.", description=err_frmt.format(account_name), changed=False)
else:
account = user.accounts()[0]
@ -312,14 +314,15 @@ def pubnub_application(module, account):
module.fail_json(msg=exc_msg, description=exc_descr, changed=account.changed, module_cache=dict(account))
if application is None:
err_fmt = (
"There is no '{0}' application for {1}. Make sure what "
"correct application name has been passed. If application "
"doesn't exist you can create it on admin.pubnub.com."
)
email = account.owner.email
module.fail_json(
msg=err_fmt.format(params["application"], email), changed=account.changed, module_cache=dict(account)
msg=(
f"There is no '{params['application']}' application for {email}. "
"Make sure what correct application name has been passed. "
"If application doesn't exist you can create it on admin.pubnub.com."
),
changed=account.changed,
module_cache=dict(account),
)
return application
@ -346,13 +349,14 @@ def pubnub_keyset(module, account, application):
params = module.params
keyset = application.keyset(params["keyset"])
if keyset is None:
err_fmt = (
"There is no '{0}' keyset for '{1}' application. Make "
"sure what correct keyset name has been passed. If keyset "
"doesn't exist you can create it on admin.pubnub.com."
)
module.fail_json(
msg=err_fmt.format(params["keyset"], application.name), changed=account.changed, module_cache=dict(account)
msg=(
f"There is no '{params['keyset']}' keyset for '{application.name}' application. "
"Make sure what correct keyset name has been passed. "
"If keyset doesn't exist you can create it on admin.pubnub.com."
),
changed=account.changed,
module_cache=dict(account),
)
return keyset

3
plugins/modules/terraform.py
View file

@ -605,7 +605,8 @@ def main():
if vars is None:
return "null"
elif isinstance(vars, str):
return '"{string}"'.format(string=vars.replace("\\", "\\\\").replace('"', '\\"')).replace("\n", "\\n")
escaped = vars.replace("\\", "\\\\").replace('"', '\\"')
return f'"{escaped}"'.replace("\n", "\\n")
elif isinstance(vars, bool):
if vars:
return "true"