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

modules s[a-e]*: use f-strings (#10976)

Browse source 
* modules s[a-e]*: use f-strings

* add changelog frag
This commit is contained in:
Alexei Znamensky 2025-10-26 22:34:24 +13:00 • committed by GitHub
parent 32dd5f04c5
commit 73452acf84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 243 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

83
plugins/modules/scaleway_compute.py
View file

@ -205,29 +205,29 @@ SCALEWAY_TRANSITIONS_STATES = (
def check_image_id(compute_api, image_id):
response = compute_api.get(path="images/%s" % image_id)
response = compute_api.get(path=f"images/{image_id}")
if not response.ok:
msg = 'Error in getting image %s on %s : %s' % (image_id, compute_api.module.params.get('api_url'), response.json)
msg = f"Error in getting image {image_id} on {compute_api.module.params.get('api_url')} : {response.json}"
compute_api.module.fail_json(msg=msg)
def fetch_state(compute_api, server):
compute_api.module.debug("fetch_state of server: %s" % server["id"])
response = compute_api.get(path="servers/%s" % server["id"])
compute_api.module.debug(f"fetch_state of server: {server['id']}")
response = compute_api.get(path=f"servers/{server['id']}")
if response.status_code == 404:
return "absent"
if not response.ok:
msg = 'Error during state fetching: (%s) %s' % (response.status_code, response.json)
msg = f'Error during state fetching: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
try:
compute_api.module.debug("Server %s in state: %s" % (server["id"], response.json["server"]["state"]))
compute_api.module.debug(f"Server {server['id']} in state: {response.json['server']['state']}")
return response.json["server"]["state"]
except KeyError:
compute_api.module.fail_json(msg="Could not fetch state in %s" % response.json)
compute_api.module.fail_json(msg=f"Could not fetch state in {response.json}")
def wait_to_complete_state_transition(compute_api, server, wait=None):
@ -245,7 +245,7 @@ def wait_to_complete_state_transition(compute_api, server, wait=None):
compute_api.module.debug("We are going to wait for the server to finish its transition")
if fetch_state(compute_api, server) not in SCALEWAY_TRANSITIONS_STATES:
compute_api.module.debug("It seems that the server is not in transition anymore.")
compute_api.module.debug("Server in state: %s" % fetch_state(compute_api, server))
compute_api.module.debug(f"Server in state: {fetch_state(compute_api, server)}")
break
time.sleep(wait_sleep_time)
else:
@ -264,14 +264,14 @@ def public_ip_payload(compute_api, public_ip):
# We check that the IP we want to attach exists, if so its ID is returned
response = compute_api.get("ips")
if not response.ok:
msg = 'Error during public IP validation: (%s) %s' % (response.status_code, response.json)
msg = f'Error during public IP validation: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
ip_list = []
try:
ip_list = response.json["ips"]
except KeyError:
compute_api.module.fail_json(msg="Error in getting the IP information from: %s" % response.json)
compute_api.module.fail_json(msg=f"Error in getting the IP information from: {response.json}")
lookup = [ip["id"] for ip in ip_list]
if public_ip in lookup:
@ -301,13 +301,13 @@ def create_server(compute_api, server):
response = compute_api.post(path="servers", data=data)
if not response.ok:
msg = 'Error during server creation: (%s) %s' % (response.status_code, response.json)
msg = f'Error during server creation: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
try:
target_server = response.json["server"]
except KeyError:
compute_api.module.fail_json(msg="Error in getting the server information from: %s" % response.json)
compute_api.module.fail_json(msg=f"Error in getting the server information from: {response.json}")
wait_to_complete_state_transition(compute_api=compute_api, server=target_server)
@ -327,10 +327,10 @@ def start_server(compute_api, server):
def perform_action(compute_api, server, action):
response = compute_api.post(path="servers/%s/action" % server["id"],
response = compute_api.post(path=f"servers/{server['id']}/action",
data={"action": action})
if not response.ok:
msg = 'Error during server %s: (%s) %s' % (action, response.status_code, response.json)
msg = f'Error during server {action}: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
wait_to_complete_state_transition(compute_api=compute_api, server=server)
@ -340,9 +340,9 @@ def perform_action(compute_api, server, action):
def remove_server(compute_api, server):
compute_api.module.debug("Starting remove server strategy")
response = compute_api.delete(path="servers/%s" % server["id"])
response = compute_api.delete(path=f"servers/{server['id']}")
if not response.ok:
msg = 'Error during server deletion: (%s) %s' % (response.status_code, response.json)
msg = f'Error during server deletion: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
wait_to_complete_state_transition(compute_api=compute_api, server=server)
@ -369,7 +369,7 @@ def present_strategy(compute_api, wished_server):
changed = True
if compute_api.module.check_mode:
return changed, {"status": "Server %s attributes would be changed." % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} attributes would be changed."}
target_server = server_change_attributes(compute_api=compute_api, target_server=target_server, wished_server=wished_server)
@ -390,7 +390,7 @@ def absent_strategy(compute_api, wished_server):
changed = True
if compute_api.module.check_mode:
return changed, {"status": "Server %s would be made absent." % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} would be made absent."}
# A server MUST be stopped to be deleted.
while fetch_state(compute_api=compute_api, server=target_server) != "stopped":
@ -398,8 +398,7 @@ def absent_strategy(compute_api, wished_server):
response = stop_server(compute_api=compute_api, server=target_server)
if not response.ok:
err_msg = 'Error while stopping a server before removing it [{0}: {1}]'.format(response.status_code,
response.json)
err_msg = f'Error while stopping a server before removing it [{response.status_code}: {response.json}]'
compute_api.module.fail_json(msg=err_msg)
wait_to_complete_state_transition(compute_api=compute_api, server=target_server, wait=True)
@ -407,10 +406,10 @@ def absent_strategy(compute_api, wished_server):
response = remove_server(compute_api=compute_api, server=target_server)
if not response.ok:
err_msg = 'Error while removing server [{0}: {1}]'.format(response.status_code, response.json)
err_msg = f'Error while removing server [{response.status_code}: {response.json}]'
compute_api.module.fail_json(msg=err_msg)
return changed, {"status": "Server %s deleted" % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} deleted"}
def running_strategy(compute_api, wished_server):
@ -432,21 +431,21 @@ def running_strategy(compute_api, wished_server):
changed = True
if compute_api.module.check_mode:
return changed, {"status": "Server %s attributes would be changed before running it." % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} attributes would be changed before running it."}
target_server = server_change_attributes(compute_api=compute_api, target_server=target_server, wished_server=wished_server)
current_state = fetch_state(compute_api=compute_api, server=target_server)
if current_state not in ("running", "starting"):
compute_api.module.debug("running_strategy: Server in state: %s" % current_state)
compute_api.module.debug(f"running_strategy: Server in state: {current_state}")
changed = True
if compute_api.module.check_mode:
return changed, {"status": "Server %s attributes would be changed." % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} attributes would be changed."}
response = start_server(compute_api=compute_api, server=target_server)
if not response.ok:
msg = 'Error while running server [{0}: {1}]'.format(response.status_code, response.json)
msg = f'Error while running server [{response.status_code}: {response.json}]'
compute_api.module.fail_json(msg=msg)
return changed, target_server
@ -476,7 +475,7 @@ def stop_strategy(compute_api, wished_server):
if compute_api.module.check_mode:
return changed, {
"status": "Server %s attributes would be changed before stopping it." % target_server["id"]}
"status": f"Server {target_server['id']} attributes would be changed before stopping it."}
target_server = server_change_attributes(compute_api=compute_api, target_server=target_server, wished_server=wished_server)
@ -484,19 +483,19 @@ def stop_strategy(compute_api, wished_server):
current_state = fetch_state(compute_api=compute_api, server=target_server)
if current_state not in ("stopped",):
compute_api.module.debug("stop_strategy: Server in state: %s" % current_state)
compute_api.module.debug(f"stop_strategy: Server in state: {current_state}")
changed = True
if compute_api.module.check_mode:
return changed, {"status": "Server %s would be stopped." % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} would be stopped."}
response = stop_server(compute_api=compute_api, server=target_server)
compute_api.module.debug(response.json)
compute_api.module.debug(response.ok)
if not response.ok:
msg = 'Error while stopping server [{0}: {1}]'.format(response.status_code, response.json)
msg = f'Error while stopping server [{response.status_code}: {response.json}]'
compute_api.module.fail_json(msg=msg)
return changed, target_server
@ -523,13 +522,13 @@ def restart_strategy(compute_api, wished_server):
if compute_api.module.check_mode:
return changed, {
"status": "Server %s attributes would be changed before rebooting it." % target_server["id"]}
"status": f"Server {target_server['id']} attributes would be changed before rebooting it."}
target_server = server_change_attributes(compute_api=compute_api, target_server=target_server, wished_server=wished_server)
changed = True
if compute_api.module.check_mode:
return changed, {"status": "Server %s would be rebooted." % target_server["id"]}
return changed, {"status": f"Server {target_server['id']} would be rebooted."}
wait_to_complete_state_transition(compute_api=compute_api, server=target_server)
@ -537,16 +536,14 @@ def restart_strategy(compute_api, wished_server):
response = restart_server(compute_api=compute_api, server=target_server)
wait_to_complete_state_transition(compute_api=compute_api, server=target_server)
if not response.ok:
msg = 'Error while restarting server that was running [{0}: {1}].'.format(response.status_code,
response.json)
msg = f'Error while restarting server that was running [{response.status_code}: {response.json}].'
compute_api.module.fail_json(msg=msg)
if fetch_state(compute_api=compute_api, server=target_server) in ("stopped",):
response = restart_server(compute_api=compute_api, server=target_server)
wait_to_complete_state_transition(compute_api=compute_api, server=target_server)
if not response.ok:
msg = 'Error while restarting server that was stopped [{0}: {1}].'.format(response.status_code,
response.json)
msg = f'Error while restarting server that was stopped [{response.status_code}: {response.json}].'
compute_api.module.fail_json(msg=msg)
return changed, target_server
@ -568,7 +565,7 @@ def find(compute_api, wished_server, per_page=1):
"per_page": per_page})
if not response.ok:
msg = 'Error during server search: (%s) %s' % (response.status_code, response.json)
msg = f'Error during server search: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
search_results = response.json["servers"]
@ -587,14 +584,14 @@ PATCH_MUTABLE_SERVER_ATTRIBUTES = (
def server_attributes_should_be_changed(compute_api, target_server, wished_server):
compute_api.module.debug("Checking if server attributes should be changed")
compute_api.module.debug("Current Server: %s" % target_server)
compute_api.module.debug("Wished Server: %s" % wished_server)
compute_api.module.debug(f"Current Server: {target_server}")
compute_api.module.debug(f"Wished Server: {wished_server}")
debug_dict = {
x: (target_server[x], wished_server[x])
for x in PATCH_MUTABLE_SERVER_ATTRIBUTES
if x in target_server and x in wished_server
}
compute_api.module.debug("Debug dict %s" % debug_dict)
compute_api.module.debug(f"Debug dict {debug_dict}")
try:
for key in PATCH_MUTABLE_SERVER_ATTRIBUTES:
if key in target_server and key in wished_server:
@ -626,16 +623,16 @@ def server_change_attributes(compute_api, target_server, wished_server):
elif not isinstance(target_server[key], dict):
patch_payload[key] = wished_server[key]
response = compute_api.patch(path="servers/%s" % target_server["id"],
response = compute_api.patch(path=f"servers/{target_server['id']}",
data=patch_payload)
if not response.ok:
msg = 'Error during server attributes patching: (%s) %s' % (response.status_code, response.json)
msg = f'Error during server attributes patching: ({response.status_code}) {response.json}'
compute_api.module.fail_json(msg=msg)
try:
target_server = response.json["server"]
except KeyError:
compute_api.module.fail_json(msg="Error in getting the server information from: %s" % response.json)
compute_api.module.fail_json(msg=f"Error in getting the server information from: {response.json}")
wait_to_complete_state_transition(compute_api=compute_api, server=target_server)