Provisioning: Fix cleanup (#111257)

This commit is contained in:
Stephanie Hingtgen
2025-09-17 10:11:25 -05:00
committed by GitHub
parent 27544655a9
commit 91008cc82e
2 changed files with 1 additions and 3 deletions
@@ -539,7 +539,7 @@ func (r *DualReadWriter) authorizeCreateFolder(ctx context.Context, _ string) er
func (r *DualReadWriter) deleteFolder(ctx context.Context, opts DualWriteOptions) (*ParsedResource, error) {
// if the ref is set, it is not the active branch, so just delete the files from the branch
// and do not delete the items from grafana itself
if r.shouldUpdateGrafanaDB(opts, nil) {
if !r.shouldUpdateGrafanaDB(opts, nil) {
err := r.repo.Delete(ctx, opts.Path, opts.Ref, opts.Message)
if err != nil {
return nil, fmt.Errorf("error deleting folder from repository: %w", err)
@@ -20,8 +20,6 @@ import (
)
func TestIntegrationProvisioning_DeleteResources(t *testing.T) {
// TODO: fix
t.Skip("Skipping this test while being worked on")
testutil.SkipIntegrationTestInShortMode(t)
helper := runGrafana(t)