Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enabling flatenning on empty namespace #19321

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Enabling flatenning on empty namespace #19321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21281d0
Enabling flatenning on empty namespace
NicoForce Sep 6, 2023
ce70a25
readding var types
NicoForce Sep 7, 2023
349db94
Merge branch 'main' into 19319-allow-flatenning-on-empty-namespace
NicoForce Oct 16, 2023
0a6432f
Merge branch 'main' into 19319-allow-flatenning-on-empty-namespace
NicoForce Oct 18, 2023
4f0b6ec
Merge branch 'main' into 19319-allow-flatenning-on-empty-namespace
NicoForce Oct 24, 2023
8a56174
Merge branch 'main' into 19319-allow-flatenning-on-empty-namespace
NicoForce Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/controller/replication/flow/stage.go
View file
Open in desktop
Expand Up @@ -190,10 +190,6 @@ func getResourceReferences(res *model.Resource) string {
// repository:a/b/c/image namespace:n replaceCount: 3 -> n/image
// repository:a/b/c/image namespace:n replaceCount: 4 -> error
func replaceNamespace(repository string, namespace string, replaceCount int8, dstRepoComponentPathType string) (string, error) {
if len(namespace) == 0 {
return repository, nil
}

srcRepoPathComponents := strings.Split(repository, "/")
srcLength := len(srcRepoPathComponents)

Expand All @@ -205,6 +201,8 @@ func replaceNamespace(repository string, namespace string, replaceCount int8, ds
return "", errors.New(nil).WithCode(errors.BadRequestCode).
WithMessage("the source repository %q contains only %d path components %v excepting the last one, but the destination namespace flattening level is %d",
repository, srcLength-1, srcRepoPathComponents[:srcLength-1], replaceCount)
case len(namespace) == 0:
dstRepoPrefix = strings.Join(srcRepoPathComponents[replaceCount:srcLength-1], "/")
default:
dstRepoPrefix = namespace + "/" + strings.Join(srcRepoPathComponents[replaceCount:srcLength-1], "/")
}
Expand Down
62 changes: 51 additions & 11 deletions src/controller/replication/flow/stage_test.go
View file
Open in desktop
Expand Up @@ -116,20 +116,12 @@ func (s *stageTestSuite) TestAssembleDestinationResources() {
}

func (s *stageTestSuite) TestReplaceNamespace() {
// empty namespace
// replace count <0, repository contains no "/"
var (
repository string = "c"
namespace string = ""
replaceCount int8 = 0
namespace string = "n"
replaceCount int8 = -1
)
result, err := replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("c", result)

// replace count <0, repository contains no "/"
repository = "c"
namespace = "n"
replaceCount = -1
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("n/c", result)
Expand Down Expand Up @@ -195,6 +187,54 @@ func (s *stageTestSuite) TestReplaceNamespace() {
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("n/a", result)

// replace count = 0 with empty namespace
repository = "a/b/c"
namespace = ""
replaceCount = 0
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("a/b/c", result)

// replace count = 1 with empty namespace
repository = "a/b/c"
namespace = ""
replaceCount = 1
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("b/c", result)

// replace count = 2 with empty namespace
repository = "a/b/c"
namespace = ""
replaceCount = 2
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("c", result)

// replace count <0, repository contains no "/" with empty namespace
repository = "c"
namespace = ""
replaceCount = -1
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("c", result)

// replace count <0, repository contains only one "/" with empty namespace
repository = "b/c"
namespace = ""
replaceCount = -1
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("c", result)

// replace count <0, repository contains more than one "/" with empty namespace
repository = "a/b/c"
namespace = ""
replaceCount = -1
result, err = replaceNamespace(repository, namespace, replaceCount, "")
s.Require().Nil(err)
s.Equal("c", result)
}

func TestStage(t *testing.T) {
Expand Down