Skip to content

🐛 Gitlab repository: switch to url.Path instead of url.RawPath #9481

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

Closed
wants to merge 1 commit into from
Closed

🐛 Gitlab repository: switch to url.Path instead of url.RawPath #9481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cmd/clusterctl/client/repository/repository_gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ func NewGitLabRepository(providerConfig config.Provider, configVariablesClient c
return nil, errors.Wrap(err, "invalid url")
}

urlSplit := strings.Split(strings.TrimPrefix(rURL.RawPath, "/"), "/")
urlSplit := strings.Split(strings.TrimPrefix(rURL.Path, "/"), "/")

// Check if the url is a Gitlab repository
if rURL.Scheme != httpsScheme ||
len(urlSplit) != 9 ||
!strings.HasPrefix(rURL.RawPath, gitlabPackagesAPIPrefix) ||
!strings.HasPrefix(rURL.Path, gitlabPackagesAPIPrefix) ||
urlSplit[4] != gitlabPackagesAPIPackages ||
urlSplit[5] != gitlabPackagesAPIGeneric {
return nil, errors.New("invalid url: a GitLab repository url should be in the form https://{host}/api/v4/projects/{projectSlug}/packages/generic/{packageName}/{defaultVersion}/{componentsPath}")
Expand Down
4 changes: 2 additions & 2 deletions cmd/clusterctl/client/repository/repository_gitlab_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ func Test_gitLabRepository_getFile(t *testing.T) {
defer server.Close()
client := server.Client()

providerURL := fmt.Sprintf("%s/api/v4/projects/group%%2Fproject/packages/generic/my-package/v0.4.1/file.yaml", server.URL)
providerURL := fmt.Sprintf("%s/api/v4/projects/group/project/packages/generic/my-package/v0.4.1/file.yaml", server.URL)
providerConfig := config.NewProvider("test", providerURL, clusterctlv1.CoreProviderType)

mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
if r.URL.RawPath == "/api/v4/projects/group%2Fproject/packages/generic/my-package/v0.4.1/file.yaml" {
if r.URL.Path == "/api/v4/projects/group/project/packages/generic/my-package/v0.4.1/file.yaml" {
w.Header().Set("Content-Type", "application/octet-stream")
w.Header().Set("Content-Disposition", "attachment; filename=file.yaml")
fmt.Fprint(w, "content")
Expand Down