Dashboard with org id: Additional validation (#804)

In the tests deploying a dashboard in an specific org, additionally validate that the given dashboard is NOT in the default org
This is a sanity check to make sure the OrgID logic does not get broken in the future
If the dashboard exists when passing the orgID but does not when using the default org, it means that the org attribute works as expected

Author: julienduchesne

provider/resource_dashboard_test.go

@@ -226,9 +226,20 @@ func testAccDashboardCheckExists(rn string, dashboard *gapi.Dashboard) resource.
 		if rs.Primary.ID == "" {
 			return fmt.Errorf("resource id not set")
 		}
+		orgID, dashboardUID := splitOSSOrgID(rs.Primary.ID)
 
-		client, _, dashboardID := clientFromOSSOrgID(testAccProvider.Meta(), rs.Primary.ID)
-		gotDashboard, err := client.DashboardByUID(dashboardID)
+		client := testAccProvider.Meta().(*common.Client).GrafanaAPI
+		// If the org ID is set, check that the dashboard doesn't exist in the default org
+		if orgID > 0 {
+			dashboard, err := client.DashboardByUID(dashboardUID)
+			if err == nil || dashboard != nil {
+				return fmt.Errorf("dashboard %s exists in the default org", dashboardUID)
+			}
+			client = client.WithOrgID(orgID)
+		}
+
+		// Check that the dashboard is in the expected org
+		gotDashboard, err := client.DashboardByUID(dashboardUID)
 		if err != nil {
 			return fmt.Errorf("error getting dashboard: %s", err)
 		}
@@ -248,15 +259,22 @@ func testAccDashboardCheckExistsInFolder(dashboard *gapi.Dashboard, folder *gapi
 
 func testAccDashboardCheckDestroy(dashboard *gapi.Dashboard, orgID int64) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
+		// Check that the dashboard was deleted from the default organization
 		client := testAccProvider.Meta().(*common.Client).GrafanaAPI
+		dashboard, err := client.DashboardByUID(dashboard.Model["uid"].(string))
+		if dashboard != nil || err == nil {
+			return fmt.Errorf("dashboard still exists")
+		}
+
+		// If the dashboard was created in an organization, check that it was deleted from that organization
 		if orgID != 0 {
 			client = client.WithOrgID(orgID)
+			dashboard, err = client.DashboardByUID(dashboard.Model["uid"].(string))
+			if dashboard != nil || err == nil {
+				return fmt.Errorf("dashboard still exists")
+			}
 		}
 
-		_, err := client.DashboardByUID(dashboard.Model["uid"].(string))
-		if err == nil {
-			return fmt.Errorf("dashboard still exists")
-		}
 		return nil
 	}
 }