public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provisioning: Fix issue with double prefix for github repository (#103781)

Browse Source
This commit is contained in:
Roberto Jiménez Sánchez
2025-04-10 20:57:42 +03:00
committed by GitHub
parent 45a55234e1
commit 2eaeff8ea7
11 changed files with 2038 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/provisioning/jobs/sync/incremental.go
+1 -1
View File
@@ -92,7 +92,7 @@ func IncrementalSync(ctx context.Context, repo repository.Versioned, previousRef
result.Resource = gvk.Kind
result.Group = gvk.Group
case repository.FileActionRenamed:
name, gvk, err := repositoryResources.RenameResourceFile(ctx, change.Path, change.PreviousRef, change.Path, change.Ref)
name, gvk, err := repositoryResources.RenameResourceFile(ctx, change.PreviousPath, change.PreviousRef, change.Path, change.Ref)
if err != nil {
result.Error = err
}
pkg/registry/apis/provisioning/jobs/sync/incremental_test.go
+1 -1
View File
@@ -220,7 +220,7 @@ func TestIncrementalSync(t *testing.T) {
progress.On("SetMessage", mock.Anything, "versioned changes replicated").Return()
// Mock resource rename
repoResources.On("RenameResourceFile", mock.Anything, "dashboards/new.json", "old-ref", "dashboards/new.json", "new-ref").
repoResources.On("RenameResourceFile", mock.Anything, "dashboards/old.json", "old-ref", "dashboards/new.json", "new-ref").
Return("renamed-dashboard", schema.GroupVersionKind{Kind: "Dashboard", Group: "dashboards"}, nil)
// Mock progress recording