Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"priorityResolution": false,
"projectKey": "default",
"environments": [],
"repositories": ["b-virtual"],
"repositories": ["b-virtual","a-local"],
"defaultDeploymentRepo": "a-local",
"hideUnauthorizedResources": false,
"artifactoryRequestsCanRetrieveRemoteArtifacts": false,
"resolveDockerTagsByTimestamp": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"priorityResolution": false,
"projectKey": "default",
"environments": [],
"repositories": ["b-local"],
"defaultDeploymentRepo": "b-local",
"hideUnauthorizedResources": false,
"artifactoryRequestsCanRetrieveRemoteArtifacts": false,
"resolveDockerTagsByTimestamp": false,
Expand Down
9 changes: 7 additions & 2 deletions artifactory/commands/utils/transferconfigbase.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,17 +224,22 @@ func (tcb *TransferConfigBase) transferVirtualRepositoriesToTarget(reposToTransf
return
}

// Create virtual repository without included repositories
// Create virtual repository without included repositories and default deployment repo
repositories := singleRepoParamsMap["repositories"]
delete(singleRepoParamsMap, "repositories")
defaultDeploymentRepo := singleRepoParamsMap["defaultDeploymentRepo"]
delete(singleRepoParamsMap, "defaultDeploymentRepo")
if err = tcb.createRepositoryAndAssignToProject(singleRepoParamsMap, repoToTransfer); err != nil {
return
}

// Restore included repositories to set them later on
// Restore included repositories and default deployment repo to set them later on
if repositories != nil {
singleRepoParamsMap["repositories"] = repositories
}
if defaultDeploymentRepo != nil {
singleRepoParamsMap["defaultDeploymentRepo"] = defaultDeploymentRepo
}
}

// Step 2 - Update all virtual repositories with the included repositories
Expand Down
2 changes: 2 additions & 0 deletions artifactory/commands/utils/transferconfigbase_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ func TestTransferVirtualRepositoriesToTarget(t *testing.T) {
if r.Method == http.MethodPut {
delete(expectedVirtualRepoAParamsMap, "repositories")
delete(expectedVirtualRepoBParamsMap, "repositories")
delete(expectedVirtualRepoAParamsMap, "defaultDeploymentRepo")
delete(expectedVirtualRepoBParamsMap, "defaultDeploymentRepo")
}

switch r.RequestURI {
Expand Down
Loading