diff --git a/go.mod b/go.mod index 07d4f8a4..fe8a7416 100644 --- a/go.mod +++ b/go.mod @@ -23,10 +23,10 @@ require ( github.com/rancher/apiserver v0.6.0 github.com/rancher/dynamiclistener v0.6.2 github.com/rancher/kubernetes-provider-detector v0.1.5 - github.com/rancher/lasso v0.2.1 + github.com/rancher/lasso v0.2.2 github.com/rancher/norman v0.6.0 github.com/rancher/remotedialer v0.4.5-rc.1 - github.com/rancher/wrangler/v3 v3.2.0-rc.3 + github.com/rancher/wrangler/v3 v3.2.1-rc.5 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.10.0 github.com/urfave/cli/v2 v2.27.5 diff --git a/go.sum b/go.sum index 2aae7e2b..fb58e559 100644 --- a/go.sum +++ b/go.sum @@ -224,14 +224,14 @@ github.com/rancher/dynamiclistener v0.6.2 h1:F0SEJhvO2aFe0eTvKGlQoy5x7HtwK8oJbyI github.com/rancher/dynamiclistener v0.6.2/go.mod h1:ncmVR7qR8kR1o6xNkTcVS2mZ9WtlljimBilIlNjdyzc= github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM7QmfO4OedvFE3QwXiH60I= github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0= -github.com/rancher/lasso v0.2.1 h1:SZTqMVQn8cAOqvwGBd1/EYOIJ/MGN+UfJrOWvHd4jHU= -github.com/rancher/lasso v0.2.1/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM= +github.com/rancher/lasso v0.2.2 h1:oKP5d4+eSupwHftLMTWo6QS1tYYZ5XK+ZjP+VNhwmk8= +github.com/rancher/lasso v0.2.2/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM= github.com/rancher/norman v0.6.0 h1:8CyY9cVcw0L+YYZRGvXHPMENefLaDkmi6vpscrVjXew= github.com/rancher/norman v0.6.0/go.mod h1:CQ0/1CoEqbeJXvOXuRQvsmiBd7QIgxZG5IvQFOPAHOg= github.com/rancher/remotedialer v0.4.5-rc.1 h1:LwGrOqt6hrKjf9Er5LBEKP6xk21RFF7PO2d0+E+mavk= github.com/rancher/remotedialer v0.4.5-rc.1/go.mod h1:x31ZR9714VzudfHVke40+WN5wDSDckxjRGr1bWgpgc0= -github.com/rancher/wrangler/v3 v3.2.0-rc.3 h1:MySHWLxLLrGrM2sq5YYp7Ol1kQqYt9lvIzjGR50UZ+c= -github.com/rancher/wrangler/v3 v3.2.0-rc.3/go.mod h1:0C5QyvSrQOff8gQQzpB/L/FF03EQycjR3unSJcKCHno= +github.com/rancher/wrangler/v3 v3.2.1-rc.5 h1:hbhOcF0YyQty7PzTpEQpRdH4DZ74bWDkCp2a4TrUeRA= +github.com/rancher/wrangler/v3 v3.2.1-rc.5/go.mod h1:RV8kkv5br5HaxXWamIbr95pOjvVeoC5CeBldcdw5Fv0= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/pkg/schema/factory.go b/pkg/schema/factory.go index c75c1345..bc81e0c3 100644 --- a/pkg/schema/factory.go +++ b/pkg/schema/factory.go @@ -11,7 +11,6 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/v3/pkg/schemas" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/authentication/user" ) @@ -145,14 +144,6 @@ func (c *Collection) schemasForSubject(access *accesscontrol.AccessSet) (*types. s = s.DeepCopy() attributes.SetAccess(s, verbAccess) - if s.ResourceFields == nil { - s.ResourceFields = make(map[string]schemas.Field) - } - s.ResourceFields["resourcePermissions"] = schemas.Field{ - Type: "map[json]", - Description: "Per-resource access permissions", - } - if verbAccess.AnyVerb("list", "get") { s.ResourceMethods = append(s.ResourceMethods, allowed(http.MethodGet)) s.CollectionMethods = append(s.CollectionMethods, allowed(http.MethodGet))