diff --git a/artifactory/commands/utils/transferconfigbase.go b/artifactory/commands/utils/transferconfigbase.go index 7bef0a76e..cc5963246 100644 --- a/artifactory/commands/utils/transferconfigbase.go +++ b/artifactory/commands/utils/transferconfigbase.go @@ -209,39 +209,21 @@ func (tcb *TransferConfigBase) transferSpecificRepositoriesToTarget(reposToTrans // Transfer virtual repositories // reposToTransfer - Repositories names to transfer func (tcb *TransferConfigBase) transferVirtualRepositoriesToTarget(reposToTransfer []services.RepositoryDetails) (err error) { - allReposParams := make(map[string]interface{}) var singleRepoParamsMap map[string]interface{} var singleRepoParams interface{} - // Step 1 - Get and create all virtual repositories with the included repositories removed + // Get and create all virtual repositories for _, repoToTransfer := range reposToTransfer { // Get repository params if err = tcb.SourceArtifactoryManager.GetRepository(repoToTransfer.Key, &singleRepoParams); err != nil { return } - allReposParams[repoToTransfer.Key] = singleRepoParams singleRepoParamsMap, err = InterfaceToMap(singleRepoParams) if err != nil { return } - - // Create virtual repository without included repositories - repositories := singleRepoParamsMap["repositories"] - delete(singleRepoParamsMap, "repositories") if err = tcb.createRepositoryAndAssignToProject(singleRepoParamsMap, repoToTransfer); err != nil { return } - - // Restore included repositories to set them later on - if repositories != nil { - singleRepoParamsMap["repositories"] = repositories - } - } - - // Step 2 - Update all virtual repositories with the included repositories - for repoKey, repoParams := range allReposParams { - if err = tcb.TargetArtifactoryManager.UpdateRepositoryWithParams(repoParams, repoKey); err != nil { - return - } } return } diff --git a/artifactory/commands/utils/transferconfigbase_test.go b/artifactory/commands/utils/transferconfigbase_test.go index ac091f28c..4b7c5ccf1 100644 --- a/artifactory/commands/utils/transferconfigbase_test.go +++ b/artifactory/commands/utils/transferconfigbase_test.go @@ -220,11 +220,6 @@ func TestTransferVirtualRepositoriesToTarget(t *testing.T) { expectedVirtualRepoAParamsMap := getRepoParamsMap(t, virtualRepoA) expectedVirtualRepoBParamsMap := getRepoParamsMap(t, virtualRepoB) - if r.Method == http.MethodPut { - delete(expectedVirtualRepoAParamsMap, "repositories") - delete(expectedVirtualRepoBParamsMap, "repositories") - } - switch r.RequestURI { case "/api/repositories/a-virtual": assert.Equal(t, expectedVirtualRepoAParamsMap, getRepoParamsMap(t, body))