Skip to content

Commit 2bcbee1

Browse files
Merge pull request #15877 from openshift-cherrypick-robot/cherry-pick-15822-to-release-4.19
[release-4.19] OCPBUGS-70135: Update client initialization in checkPackageManifestHandler
2 parents 89ae495 + b930bb4 commit 2bcbee1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pkg/olm/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (o *OLMHandler) OperandsList(user *auth.User, w http.ResponseWriter, r *htt
8282
w.Write(resp)
8383
}
8484

85-
func (o *OLMHandler) CheckPackageManifest(w http.ResponseWriter, r *http.Request) {
85+
func (o *OLMHandler) CheckPackageManifest(user *auth.User, w http.ResponseWriter, r *http.Request) {
8686
if r.Method != "GET" {
8787
w.Header().Set("Allow", "GET")
8888
serverutils.SendResponse(w, http.StatusMethodNotAllowed, serverutils.ApiError{Err: "Method unsupported, the only supported methods is GET"})
@@ -96,7 +96,7 @@ func (o *OLMHandler) CheckPackageManifest(w http.ResponseWriter, r *http.Request
9696
return
9797
}
9898

99-
client, _, err := o.getClientWithScheme(nil)
99+
client, _, err := o.getClientWithScheme(user)
100100
if err != nil {
101101
klog.Error(err)
102102
serverutils.SendResponse(w, http.StatusInternalServerError, serverutils.ApiError{Err: fmt.Sprint(err)})

pkg/server/server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,9 @@ func (s *Server) HTTPHandler() (http.Handler, error) {
469469

470470
handle(packageManifestEndpoint, http.StripPrefix(
471471
proxy.SingleJoiningSlash(s.BaseURL.Path, packageManifestEndpoint),
472-
authHandler(olmHandler.CheckPackageManifest),
472+
authHandlerWithUser(func(user *auth.User, w http.ResponseWriter, r *http.Request) {
473+
olmHandler.CheckPackageManifest(user, w, r)
474+
}),
473475
))
474476

475477
handle(operandsListEndpoint, http.StripPrefix(

0 commit comments

Comments
 (0)