Reapplying dashboards fails (#353)

* Reapplying dashboards fails * Correct test, add another * Add required test file
grafana · Feb 28, 2024 · 9d7ae73 · 9d7ae73
1 parent 3890263
commit 9d7ae73
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/integration/dashboard_test.go b/integration/dashboard_test.go
@@ -60,6 +60,40 @@ func TestDashboard(t *testing.T) {
 		})
 	})
 
+	t.Run("Re-apply dashboard - no folder", func(t *testing.T) {
+		runTest(t, GrizzlyTest{
+			TestDir:       dir,
+			RunOnContexts: allContexts,
+			Commands: []Command{
+				{
+					Command:        "apply no-folder.yml",
+					ExpectedOutput: "Dashboard.no-folder no differences\n",
+				},
+				{
+					Command:                "get Dashboard.no-folder",
+					ExpectedOutputContains: "folder: general",
+				},
+			},
+		})
+	})
+
+	t.Run("Re-apply changed dashboard - no folder", func(t *testing.T) {
+		runTest(t, GrizzlyTest{
+			TestDir:       dir,
+			RunOnContexts: allContexts,
+			Commands: []Command{
+				{
+					Command:        "apply no-folder-mk2.yml",
+					ExpectedOutput: "Dashboard.no-folder updated\n",
+				},
+				{
+					Command:                "get Dashboard.no-folder",
+					ExpectedOutputContains: "folder: general",
+				},
+			},
+		})
+	})
+
 	t.Run("Diff dashboard - success", func(t *testing.T) {
 		runTest(t, GrizzlyTest{
 			TestDir:       dir,

diff --git a/integration/testdata/dashboards/no-folder-mk2.yml b/integration/testdata/dashboards/no-folder-mk2.yml
@@ -0,0 +1,12 @@
+apiVersion: grizzly.grafana.com/v1alpha1
+kind: Dashboard
+metadata:
+  name: no-folder
+spec:
+  schemaVersion: 17
+  tags:
+    - templated
+  timezone: browser
+  title: No Folder
+  uid: no-folder
+  editable: true