Datasource test updates and minor fixes

CHANGELOG.rst

@@ -4,6 +4,19 @@ Grafana.Grafana Release Notes
 
 .. contents:: Topics
 
+v2.1.33
+======
+
+Release Summary
+---------------
+
+Update modules for Datasource Tests and minor fixes
+
+Minor Changes
+-------------
+
+- Update modules for datasource tests and minor fixes
+
 v2.1.3
 ======
 

README.md

@@ -128,7 +128,7 @@ Before the [GitHub Release Workflow](https://github.com/grafana/grafana-ansible-
 is run, Contributors should push the new version on Ansible Galaxy Manually.
 
 We currently are not planning any deprecations or new major releases. The current landscape includes minor version updates for
-module's documentation in `2.1.4`.
+module's documentation in `2.1.5`.
 
 To generate changelogs for a new release, Refer [Generating Changelogs](https://docs.ansible.com/ansible/latest/dev_guide/developing_collections_changelogs.html#generating-changelogs)
 

changelogs/.plugin-cache.yaml

@@ -1,4 +1,4 @@
 objects:
   role: {}
 plugins:
   become: {}
@@ -56,4 +56,4 @@
   strategy: {}
   test: {}
   vars: {}
-version: 2.1.3
+version: 2.1.4

changelogs/changelog.yaml

@@ -1,4 +1,4 @@
 ancestor: null
 releases:
   0.0.1:
     changes:
@@ -15,7 +15,7 @@
   0.0.4:
     changes:
       bugfixes:
       - Fix an issue with `cloud_stack` idempotency
     release_date: '2022-08-10'
   0.0.5:
     changes:
@@ -24,7 +24,7 @@
   0.0.6:
     changes:
       minor_changes:
       - Idempotency updates to cloud_api_key and datasource modules
     release_date: '2022-08-10'
   0.0.7:
     changes:
@@ -45,7 +45,7 @@
   1.0.3:
     changes:
       minor_changes:
       - Add a fail method to modules source code if `requests` library is not present
       - Fixed markup for arg option in Documentation
       - Updated Documentation with `notes` to specify if the check_mode feature is
         supported by modules
@@ -54,38 +54,38 @@
   1.0.4:
     changes:
       bugfixes:
       - Fixed cases where cloud_stack and alert_contact_point modules do not return
         a tuple when nothing in loop matches
       major_changes:
       - All modules except dashboard and datasource modules now support idempotency
       minor_changes:
       - All modules use `missing_required_lib`` to compose the message for module.fail_json()
         when required library is missing from host
       release_summary: Bug fixes and idempotency fixes for modules
     release_date: '2022-11-01'
   1.0.5:
     changes:
       minor_changes:
       - Added Note to datasource and dashboard module about not supporting Idempotency
       release_summary: Add Note to modules which don't support Idempotency
     release_date: '2022-11-10'
   1.1.0:
     changes:
       major_changes:
       - Added Role for Grafana Agent
       release_summary: Added Role to deploy Grafana Agent on linux hosts
     release_date: '2022-11-22'
   1.1.1:
     changes:
       minor_changes:
       - Updated the return message in grafana.grafana.folder module
       release_summary: Updated return description and value for grafana.grafana.folder
         module
     release_date: '2023-02-08'
   2.0.0:
     changes:
       major_changes:
       - Added Lint support
       - Configs for server, metrics, logs, traces, and integrations
       - Installation of the latest version
       - Local installations when internet connection is not allowed
@@ -132,3 +132,9 @@
       - indentation and Lint fixes to modules
       release_summary: Update modules to fix failing Sanity Tests
     release_date: '2023-06-27'
+  2.1.4:
+    changes:
+      minor_changes:
+      - Datasource test updates and minor fixes
+      release_summary: Update Datasource Tests and minor fixes
+    release_date: '2023-06-27'

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: grafana
 name: grafana
-version: 2.1.3
+version: 2.1.4
 readme: README.md
 authors:
   - Grafana Labs <grafana.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "grafana-ansible-collection",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

plugins/modules/datasource.py

@@ -161,12 +161,12 @@ def absent_datasource(module):
     if module.params['grafana_url'][-1] == '/':
         module.params['grafana_url'] = module.params['grafana_url'][:-1]
 
-    api_url = module.params['grafana_url'] + '/api/datasources/name' + module.params['dataSource']['name']
+    api_url = module.params['grafana_url'] + '/api/datasources/name/' + module.params['dataSource']['name']
 
     result = requests.delete(api_url, headers={"Authorization": 'Bearer ' + module.params['grafana_api_key']})
 
     if result.status_code == 200:
-        return False, True, result.json()
+        return False, True, {"status": result.status_code, 'response': result.json()['message']}
     else:
         return True, False, {"status": result.status_code, 'response': result.json()['message']}
 

tests/integration/targets/datasource/tasks/main.yml

@@ -22,3 +22,27 @@
     that:
       - create_result.changed == true
       - create_result.output.message == "Datasource added" or create_result.output.message == "Datasource updated"
+
+- name: Delete a Data Source
+  grafana.grafana.datasource:
+    dataSource:
+      name: ansible-integration
+      type: influxdb
+      url: https://grafana.github.com/grafana-ansible-collection
+      user: user
+      secureJsonData:
+        password: password
+      database: db-name
+      id: 123
+      uid: ansibletest
+      access: proxy
+    grafana_url: "{{ grafana_url }}"
+    grafana_api_key: "{{ grafana_api_key }}"
+    state: absent
+  register: delete_result
+
+- name: Delete Check
+  ansible.builtin.assert:
+    that:
+      - delete_result.changed == true
+      - delete_result.output.response == "Data source deleted"