diff --git a/plugins/modules/scaleway_container_namespace_info.py b/plugins/modules/scaleway_container_namespace_info.py index daf5d7b1d6d..a75ff6df361 100644 --- a/plugins/modules/scaleway_container_namespace_info.py +++ b/plugins/modules/scaleway_container_namespace_info.py @@ -73,20 +73,17 @@ region: fr-par registry_endpoint: "" registry_namespace_id: "" - secret_environment_variables: SENSITIVE_VALUE + secret_environment_variables: + - key: MY_SECRET_VAR + value: $argon2id$v=19$m=65536,t=1,p=2$tb6UwSPWx/rH5Vyxt9Ujfw$5ZlvaIjWwNDPxD9Rdght3NarJz4IETKjpvAU3mMSmFg status: pending ''' from ansible_collections.community.general.plugins.module_utils.scaleway import ( - SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, scaleway_argument_spec, Scaleway, - filter_sensitive_attributes + SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, scaleway_argument_spec, Scaleway ) from ansible.module_utils.basic import AnsibleModule -SENSITIVE_ATTRIBUTES = ( - "secret_environment_variables", -) - def info_strategy(api, wished_cn): cn_list = api.fetch_all_resources("namespaces") @@ -123,7 +120,7 @@ def core(module): summary = info_strategy(api=api, wished_cn=wished_container_namespace) - module.exit_json(changed=False, container_namespace=filter_sensitive_attributes(summary, SENSITIVE_ATTRIBUTES)) + module.exit_json(changed=False, container_namespace=summary) def main(): diff --git a/plugins/modules/scaleway_container_registry_info.py b/plugins/modules/scaleway_container_registry_info.py index c53e4057809..1e366e23ffd 100644 --- a/plugins/modules/scaleway_container_registry_info.py +++ b/plugins/modules/scaleway_container_registry_info.py @@ -79,15 +79,10 @@ ''' from ansible_collections.community.general.plugins.module_utils.scaleway import ( - SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, scaleway_argument_spec, Scaleway, - filter_sensitive_attributes + SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, scaleway_argument_spec, Scaleway ) from ansible.module_utils.basic import AnsibleModule -SENSITIVE_ATTRIBUTES = ( - "secret_environment_variables", -) - def info_strategy(api, wished_cn): cn_list = api.fetch_all_resources("namespaces") @@ -124,7 +119,7 @@ def core(module): summary = info_strategy(api=api, wished_cn=wished_container_namespace) - module.exit_json(changed=False, container_registry=filter_sensitive_attributes(summary, SENSITIVE_ATTRIBUTES)) + module.exit_json(changed=False, container_registry=summary) def main(): diff --git a/plugins/modules/scaleway_function_info.py b/plugins/modules/scaleway_function_info.py index b6f2eefa71a..5d1600f66c0 100644 --- a/plugins/modules/scaleway_function_info.py +++ b/plugins/modules/scaleway_function_info.py @@ -80,21 +80,18 @@ region: fr-par runtime: python310 runtime_message: "" - secret_environment_variables: SENSITIVE_VALUE + secret_environment_variables: + - key: MY_SECRET_VAR + value: $argon2id$v=19$m=65536,t=1,p=2$tb6UwSPWx/rH5Vyxt9Ujfw$5ZlvaIjWwNDPxD9Rdght3NarJz4IETKjpvAU3mMSmFg status: created timeout: 300s ''' from ansible_collections.community.general.plugins.module_utils.scaleway import ( - SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, scaleway_argument_spec, Scaleway, - filter_sensitive_attributes + SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, scaleway_argument_spec, Scaleway ) from ansible.module_utils.basic import AnsibleModule -SENSITIVE_ATTRIBUTES = ( - "secret_environment_variables", -) - def info_strategy(api, wished_fn): fn_list = api.fetch_all_resources("functions") @@ -131,7 +128,7 @@ def core(module): summary = info_strategy(api=api, wished_fn=wished_function) - module.exit_json(changed=False, function=filter_sensitive_attributes(summary, SENSITIVE_ATTRIBUTES)) + module.exit_json(changed=False, function=summary) def main():