From e3a12f1e541c1519e3d611b549e9f8262219b878 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 13:16:09 +0100 Subject: [PATCH] [PR #6111/3fb1ff0b backport][stable-5] Fix influxdb_user grants in check mode (#6213) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix influxdb_user grants in check mode (#6111) * Fix influxdb_user grants in check mode When running in check mode, `influxdb_user` will return error when the user doesn't exist yet, instead of reporting `changed` state. * Update changelogs/fragments/6111-influxdb_user-check-mode.yaml Co-authored-by: Felix Fontein --------- Co-authored-by: Felix Fontein (cherry picked from commit 3fb1ff0b720eb28ea7014597ce4defb79956b597) Co-authored-by: Petr Tichý --- changelogs/fragments/6111-influxdb_user-check-mode.yaml | 2 ++ plugins/modules/database/influxdb/influxdb_user.py | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 changelogs/fragments/6111-influxdb_user-check-mode.yaml diff --git a/changelogs/fragments/6111-influxdb_user-check-mode.yaml b/changelogs/fragments/6111-influxdb_user-check-mode.yaml new file mode 100644 index 0000000000..4789c2ba76 --- /dev/null +++ b/changelogs/fragments/6111-influxdb_user-check-mode.yaml @@ -0,0 +1,2 @@ +bugfixes: + - influxdb_user - fix running in check mode when the user does not exist yet (https://github.com/ansible-collections/community.general/pull/6111). diff --git a/plugins/modules/database/influxdb/influxdb_user.py b/plugins/modules/database/influxdb/influxdb_user.py index 25bc2a95ce..b66c89401e 100644 --- a/plugins/modules/database/influxdb/influxdb_user.py +++ b/plugins/modules/database/influxdb/influxdb_user.py @@ -168,8 +168,14 @@ def drop_user(module, client, user_name): def set_user_grants(module, client, user_name, grants): changed = False + current_grants = [] try: current_grants = client.get_list_privileges(user_name) + except influx.exceptions.InfluxDBClientError as e: + if not module.check_mode or 'user not found' not in e.content: + module.fail_json(msg=e.content) + + try: parsed_grants = [] # Fix privileges wording for i, v in enumerate(current_grants):