From db650d6c19501ccade7ede211b92bdb6628d32ed Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 13 Aug 2019 19:00:29 -0700 Subject: [PATCH] Switch schema IDs to be dot separated --- pkg/resources/schema/converter/k8stonorman.go | 8 ++++---- pkg/server/routes.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/resources/schema/converter/k8stonorman.go b/pkg/resources/schema/converter/k8stonorman.go index f5a74b8..98094c6 100644 --- a/pkg/resources/schema/converter/k8stonorman.go +++ b/pkg/resources/schema/converter/k8stonorman.go @@ -10,16 +10,16 @@ import ( func gvkToSchemaID(gvk schema.GroupVersionKind) string { 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 { 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) { diff --git a/pkg/server/routes.go b/pkg/server/routes.go index 0d4e056..5f28913 100644 --- a/pkg/server/routes.go +++ b/pkg/server/routes.go @@ -12,12 +12,12 @@ import ( type APIFunc func(*types.APIRequest) 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/{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/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 }