github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-08-23 15:28:33 +00:00
Code Issues Projects Releases Wiki Activity

Switch schema IDs to be dot separated

Browse Source
This commit is contained in:
Darren Shepherd 2019-08-13 19:00:29 -07:00
parent ad67c46055
commit db650d6c19
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/resources/schema/converter/k8stonorman.go
View File

@ -10,16 +10,16 @@ import (
func gvkToSchemaID(gvk schema.GroupVersionKind) string { func gvkToSchemaID(gvk schema.GroupVersionKind) string {
if gvk.Group == "" { if gvk.Group == "" {
return fmt.Sprintf("apis/core/%s/%s", gvk.Version, gvk.Kind) return fmt.Sprintf("core.%s.%s", gvk.Version, gvk.Kind)
} }
return fmt.Sprintf("apis/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind) return fmt.Sprintf("%s.%s.%s", gvk.Group, gvk.Version, gvk.Kind)
} }
func GVRToSchemaID(gvk schema.GroupVersionResource) string { func GVRToSchemaID(gvk schema.GroupVersionResource) string {
if gvk.Group == "" { if gvk.Group == "" {
return fmt.Sprintf("apis/core/%s/%s", gvk.Version, gvk.Resource) return fmt.Sprintf("core.%s.%s", gvk.Version, gvk.Resource)
} }
return fmt.Sprintf("apis/%s/%s/%s", gvk.Group, gvk.Version, gvk.Resource) return fmt.Sprintf("%s.%s.%s", gvk.Group, gvk.Version, gvk.Resource)
} }
func ToSchemas(client discovery.DiscoveryInterface) (map[string]*types.Schema, error) { func ToSchemas(client discovery.DiscoveryInterface) (map[string]*types.Schema, error) {

8
pkg/server/routes.go
View File

@ -12,12 +12,12 @@ import (
type APIFunc func(*types.APIRequest) type APIFunc func(*types.APIRequest)
func (a *apiServer) routes() error { func (a *apiServer) routes() error {
a.Path("/v1/{type}").Handler(a.handle(nil))
a.Path("/v1/{type:schemas}/{name:.*}").Handler(a.handle(nil)) a.Path("/v1/{type:schemas}/{name:.*}").Handler(a.handle(nil))
a.Path("/v1/{group}.{version}.{resource}").Handler(a.handle(a.k8sAPI))
a.Path("/v1/{group}.{version}.{resource}/{nameorns}").Handler(a.handle(a.k8sAPI))
a.Path("/v1/{group}.{version}.{resource}/{namespace}/{name}").Handler(a.handle(a.k8sAPI))
a.Path("/v1/{type}").Handler(a.handle(nil))
a.Path("/v1/{type}/{name}").Handler(a.handle(nil)) a.Path("/v1/{type}/{name}").Handler(a.handle(nil))
a.Path("/v1/apis/{group}/{version}/{resource}").Handler(a.handle(a.k8sAPI))
a.Path("/v1/apis/{group}/{version}/{resource}/{nameorns}").Handler(a.handle(a.k8sAPI))
a.Path("/v1/apis/{group}/{version}/{resource}/{namespace}/{name}").Handler(a.handle(a.k8sAPI))
return nil return nil
} }