[release-12.0.1] K8s: Dashboards: Fix provisioned dashboard cleanup (#104504) (#104525)

K8s: Dashboards: Fix provisioned dashboard cleanup (#104504)

pkg/registry/apis/dashboard/legacy/sql_dashboards.go

@@ -303,19 +303,15 @@ func (a *dashboardSqlAccess) scanRow(rows *sql.Rows, history bool) (*dashboardRo
 		}
 
 		if origin_name.String != "" {
-			// if the reader cannot be found, it may be an orphaned provisioned dashboard
+			meta.SetSourceProperties(utils.SourceProperties{
-			resolvedPath := a.provisioning.GetDashboardProvisionerResolvedPath(origin_name.String)
+				Path:            origin_path.String,
-			if resolvedPath != "" {
+				Checksum:        origin_hash.String,
-				meta.SetSourceProperties(utils.SourceProperties{
+				TimestampMillis: origin_ts.Int64,
-					Path:            origin_path.String,
+			})
-					Checksum:        origin_hash.String,
+			meta.SetManagerProperties(utils.ManagerProperties{
-					TimestampMillis: origin_ts.Int64,
+				Kind:     utils.ManagerKindClassicFP, // nolint:staticcheck
-				})
+				Identity: origin_name.String,
-				meta.SetManagerProperties(utils.ManagerProperties{
+			})
-					Kind:     utils.ManagerKindClassicFP, // nolint:staticcheck
-					Identity: origin_name.String,
-				})
-			}
 		} else if plugin_id.String != "" {
 			meta.SetManagerProperties(utils.ManagerProperties{
 				Kind:     utils.ManagerKindPlugin,

pkg/services/dashboards/service/dashboard_service.go

@@ -1153,8 +1153,11 @@ func (dr *DashboardServiceImpl) UnprovisionDashboard(ctx context.Context, dashbo
 				UpdatedAt: time.Now(),
 				Dashboard: dash.Data,
 			}, nil, true)
+			if err != nil {
+				return err
+			}
 
-			return err
+			return dr.dashboardStore.UnprovisionDashboard(ctx, dashboardId)
 		}
 
 		return dashboards.ErrDashboardNotFound

pkg/services/dashboards/service/dashboard_service_test.go

@@ -1118,6 +1118,7 @@ func TestUnprovisionDashboard(t *testing.T) {
 			},
 			"spec": map[string]any{},
 		}}
+		fakeStore.On("UnprovisionDashboard", mock.Anything, int64(1)).Return(nil).Once()
 		k8sCliMock.On("Get", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(dash, nil)
 		dashWithoutAnnotations := &unstructured.Unstructured{Object: map[string]any{
 			"apiVersion": dashboardv0.APIVERSION,
@@ -1168,6 +1169,7 @@ func TestUnprovisionDashboard(t *testing.T) {
 		err := service.UnprovisionDashboard(ctx, 1)
 		require.NoError(t, err)
 		k8sCliMock.AssertExpectations(t)
+		fakeStore.AssertExpectations(t)
 	})
 }