From 1aca3d8159aa8e7ebc10f903fbd9b81361cbab0d Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:32:30 +0200 Subject: [PATCH 1/4] fix: remove message argument --- plugins/modules/grafana_dashboard.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/plugins/modules/grafana_dashboard.py b/plugins/modules/grafana_dashboard.py index 77a5a756..60cd5b86 100644 --- a/plugins/modules/grafana_dashboard.py +++ b/plugins/modules/grafana_dashboard.py @@ -81,8 +81,6 @@ description: - Set a commit message for the version history. - Only used when C(state) is C(present). - - C(message) alias is deprecated in Ansible 2.10, since it is used internally by Ansible Core Engine. - aliases: [ 'message' ] type: str extends_documentation_fragment: - community.grafana.basic_auth @@ -620,15 +618,7 @@ def main(): dashboard_id=dict(type="str"), dashboard_revision=dict(type="str", default="1"), overwrite=dict(type="bool", default=False), - commit_message=dict( - type="str", - aliases=["message"], - deprecated_aliases=[ - dict( - name="message", version="2.0.0", collection_name="community.grafana" - ) - ], - ), + commit_message=dict(type="str"), ) module = AnsibleModule( argument_spec=argument_spec, @@ -647,11 +637,6 @@ def main(): module.params["url"] = clean_url(module.params["url"]) - if "message" in module.params: - module.fail_json( - msg="'message' is reserved keyword, please change this parameter to 'commit_message'" - ) - try: if module.params["state"] == "present": result = grafana_create_dashboard(module, module.params) From 3ea35d0de8358216f181322fda61760a17d4029a Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:01:06 +0200 Subject: [PATCH 2/4] docs: changelog fragment --- changelogs/fragments/372-rm-dashboard-message-argument.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/372-rm-dashboard-message-argument.yml diff --git a/changelogs/fragments/372-rm-dashboard-message-argument.yml b/changelogs/fragments/372-rm-dashboard-message-argument.yml new file mode 100644 index 00000000..3f54afa5 --- /dev/null +++ b/changelogs/fragments/372-rm-dashboard-message-argument.yml @@ -0,0 +1,3 @@ +--- +removed_features: + - removed deprecated `message` argument in `grafana_dashboard` From 9874869c6ae126829b02b5a06ee4583df052f512 Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:21:17 +0200 Subject: [PATCH 3/4] ci: remove sanity ignore files active tested versions --- tests/sanity/ignore-2.15.txt | 1 - tests/sanity/ignore-2.16.txt | 1 - tests/sanity/ignore-2.17.txt | 4 ---- 3 files changed, 6 deletions(-) delete mode 100644 tests/sanity/ignore-2.15.txt delete mode 100644 tests/sanity/ignore-2.16.txt delete mode 100644 tests/sanity/ignore-2.17.txt diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt deleted file mode 100644 index 0a40a23d..00000000 --- a/tests/sanity/ignore-2.15.txt +++ /dev/null @@ -1 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt deleted file mode 100644 index 0a40a23d..00000000 --- a/tests/sanity/ignore-2.16.txt +++ /dev/null @@ -1 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.17.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang From 125308ef45f5998633364c19e84cbf628b7403b5 Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:25:55 +0200 Subject: [PATCH 4/4] ci: remove sanity ignore files active tested versions --- tests/sanity/ignore-2.18.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/sanity/ignore-2.18.txt diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt deleted file mode 100644 index 0a40a23d..00000000 --- a/tests/sanity/ignore-2.18.txt +++ /dev/null @@ -1 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name