github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-08-31 21:00:22 +00:00
Code Issues Projects Releases Wiki Activity

Switch schema ID to gvk and plural name to gvr

Browse Source
This commit is contained in:
Darren Shepherd
2019-09-11 11:03:22 -07:00
parent ef235af49c
commit 9e4f93989f
6 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/server/publicapi/apiserver.go
View File

@@ -2,10 +2,10 @@ package publicapi
import (
"net/http"
"strings"
"github.com/sirupsen/logrus"
"github.com/rancher/naok/pkg/accesscontrol"
"github.com/rancher/naok/pkg/attributes"
k8sproxy "github.com/rancher/naok/pkg/proxy"
"github.com/rancher/naok/pkg/resources/schema"
"github.com/rancher/naok/pkg/server/router"
@@ -53,11 +53,12 @@ func (a *apiServer) common(rw http.ResponseWriter, req *http.Request) (*types.AP
schemas, err := a.sf.Schemas(user)
if err != nil {
logrus.Errorf("HTTP request failed: %v", err)
rw.Write([]byte(err.Error()))
rw.WriteHeader(http.StatusInternalServerError)
}
urlBuilder, err := urlbuilder.New(req, a, schemas)
urlBuilder, err := urlbuilder.NewPrefixed(req, schemas, "v1")
if err != nil {
rw.Write([]byte(err.Error()))
rw.WriteHeader(http.StatusInternalServerError)
@@ -72,14 +73,6 @@ func (a *apiServer) common(rw http.ResponseWriter, req *http.Request) (*types.AP
}, true
}
func (a *apiServer) Schema(base string, schema *types.Schema) string {
gvr := attributes.GVR(schema)
if gvr.Resource == "" {
return urlbuilder.ConstructBasicURL(base, "v1", schema.PluralName)
}
return urlbuilder.ConstructBasicURL(base, "v1", strings.ToLower(schema.ID))
}
type APIFunc func(schema.Factory, *types.APIRequest)
func (a *apiServer) apiHandler(apiFunc APIFunc) http.Handler {