Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Code Issues Releases Activity

chore(code): reduce divergence with EE EE-4344 (#7748)

Browse source
This commit is contained in:
andres-portainer 2022-09-28 14:56:32 -03:00 • committed by GitHub
parent e9384a6987
commit cb79dc18f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 259 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/http/handler/helm/helm_list.go
View file

@ -38,8 +38,6 @@ func (handler *Handler) helmList(w http.ResponseWriter, r *http.Request) *httper
KubernetesClusterAccess: clusterAccess,
}
params := r.URL.Query()
// optional namespace. The library defaults to "default"
namespace, _ := request.RetrieveQueryParameter(r, "namespace", true)
if namespace != "" {
@ -47,12 +45,12 @@ func (handler *Handler) helmList(w http.ResponseWriter, r *http.Request) *httper
}
// optional filter
if filter := params.Get("filter"); filter != "" {
if filter, _ := request.RetrieveQueryParameter(r, "filter", true); filter != "" {
listOpts.Filter = filter
}
// optional selector
if selector := params.Get("selector"); selector != "" {
if selector, _ := request.RetrieveQueryParameter(r, "selector", true); selector != "" {
listOpts.Selector = selector
}

2
api/http/handler/helm/helm_repo_search_test.go
View file

@ -9,7 +9,6 @@ import (
"testing"
"github.com/portainer/libhelm/binary/test"
helper "github.com/portainer/portainer/api/internal/testhelpers"
"github.com/stretchr/testify/assert"
)
@ -32,6 +31,7 @@ func Test_helmRepoSearch(t *testing.T) {
h.ServeHTTP(rr, req)
is.Equal(http.StatusOK, rr.Code, "Status should be 200 OK")
body, err := io.ReadAll(rr.Body)
is.NoError(err, "ReadAll should not return error")
is.NotEmpty(body, "Body should not be empty")

2
api/http/handler/helm/helm_show.go
View file

@ -5,11 +5,11 @@ import (
"net/http"
"net/url"
"github.com/pkg/errors"
"github.com/portainer/libhelm/options"
httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/request"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)

1
api/http/handler/helm/user_helm_repos.go
View file

@ -56,6 +56,7 @@ func (handler *Handler) userCreateHelmRepo(w http.ResponseWriter, r *http.Reques
if err != nil {
return httperror.BadRequest("Invalid Helm repository URL", err)
}
// lowercase, remove trailing slash
p.URL = strings.TrimSuffix(strings.ToLower(p.URL), "/")