change parameter order and add indentation

ansible-collections · Apr 3, 2024 · 987a496 · 987a496
1 parent 0fc3c24
commit 987a496
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -11,3 +11,4 @@ action_groups:
     - grafana_plugin
     - grafana_team
     - grafana_user
+    - grafana_silence
diff --git a/plugins/modules/grafana_silence.py b/plugins/modules/grafana_silence.py
@@ -85,10 +85,10 @@
       starts_at: "2029-07-29T08:45:45.000Z"
       ends_at: "2029-07-29T08:55:45.000Z"
       matchers:
-        - isEqual: true
-          isRegex: true
-          name: environment
-          value: test
+          - isEqual: true
+            isRegex: true
+            name: environment
+            value: test
       state: present
 
 - name: Delete a silence
@@ -100,10 +100,10 @@
       starts_at: "2029-07-29T08:45:45.000Z"
       ends_at: "2029-07-29T08:55:45.000Z"
       matchers:
-        - isEqual: true
-          isRegex: true
-          name: environment
-          value: test
+          - isEqual: true
+            isRegex: true
+            name: environment
+            value: test
       state: absent
 """
 

diff --git a/tests/integration/targets/grafana_silence/runme.sh b/tests/integration/targets/grafana_silence/runme.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -eux
+
+ansible-playbook site.yml
diff --git a/tests/integration/targets/grafana_silence/site.yml b/tests/integration/targets/grafana_silence/site.yml
@@ -0,0 +1,6 @@
+---
+- name: Run tests for grafana_team
+  hosts: localhost
+  tasks:
+    - ansible.builtin.include_role:
+        name: ../../grafana_silence
diff --git a/tests/unit/modules/grafana/grafana_silence/test_grafana_silence.py b/tests/unit/modules/grafana/grafana_silence/test_grafana_silence.py
@@ -139,7 +139,6 @@ def test_create_silence_new_silence(self, mock_fetch_url, mock_get_version):
                 {
                     "comment": "a testcomment",
                     "created_by": "me",
-                    "starts_at": "2029-07-29T08:45:45.000Z",
                     "ends_at": "2029-07-29T08:55:45.000Z",
                     "matchers": [
                         {
@@ -149,6 +148,7 @@ def test_create_silence_new_silence(self, mock_fetch_url, mock_get_version):
                             "value": "test",
                         }
                     ],
+                    "starts_at": "2029-07-29T08:45:45.000Z",
                 },
                 sort_keys=True,
             ),