rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-09-01 07:27:46 +00:00
Code Issues Projects Releases Wiki Activity

cleanup: remove duplicate apiserver import

Browse Source 
Remove duplicate import and make aliasing of other apiserver imports
consistent throughout steve.
This commit is contained in:
Colleen Murphy
2022-10-10 11:49:05 -07:00
parent 44e5b8dc3d
commit 95da447d90
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/handler/apiserver.go
View File

@@ -3,7 +3,6 @@ package handler
import (
"net/http"
"github.com/rancher/apiserver/pkg/server"
apiserver "github.com/rancher/apiserver/pkg/server"
"github.com/rancher/apiserver/pkg/types"
"github.com/rancher/apiserver/pkg/urlbuilder"
@@ -26,7 +25,7 @@ func New(cfg *rest.Config, sf schema.Factory, authMiddleware auth.Middleware, ne
a := &apiServer{
sf: sf,
server: server.DefaultAPIServer(),
server: apiserver.DefaultAPIServer(),
}
a.server.AccessControl = accesscontrol.NewAccessControl()
@@ -55,7 +54,7 @@ func New(cfg *rest.Config, sf schema.Factory, authMiddleware auth.Middleware, ne
type apiServer struct {
sf schema.Factory
server *server.Server
server *apiserver.Server
}
func (a *apiServer) common(rw http.ResponseWriter, req *http.Request) (*types.APIRequest, bool) {