diff --git a/go.mod b/go.mod index 8569b9e..1f35084 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2 github.com/gin-gonic/gin v1.9.0 github.com/go-go-golems/clay v0.0.20 - github.com/go-go-golems/glazed v0.4.2 + github.com/go-go-golems/glazed v0.4.4 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.29.0 github.com/spf13/cobra v1.6.1 diff --git a/go.sum b/go.sum index 27af069..6437af5 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-go-golems/clay v0.0.20 h1:GRFIL1g355zWjjofmPvhPreE3AsZ8tXncu9cG2GPZMw= github.com/go-go-golems/clay v0.0.20/go.mod h1:N9idImzYUpWLZ7eMVAymHYt0cbYO2E99MqejejZOP8A= -github.com/go-go-golems/glazed v0.4.2 h1:k9nhirR+LQzxeszVInS2/4VV8oLEnAjDQYO1BzTqea0= -github.com/go-go-golems/glazed v0.4.2/go.mod h1:HcUz88LiTEPK8cWD5pWup0rjwzIDH4loaZnMVuT4Qfc= +github.com/go-go-golems/glazed v0.4.4 h1:DQETKCfHGP7IbU1AXERkPYo6/HYgcvO5wq9fXSm6uRY= +github.com/go-go-golems/glazed v0.4.4/go.mod h1:HcUz88LiTEPK8cWD5pWup0rjwzIDH4loaZnMVuT4Qfc= github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc= github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k= diff --git a/pkg/handlers/config/config.go b/pkg/handlers/config/config.go index 6c2d46d..0d7e897 100644 --- a/pkg/handlers/config/config.go +++ b/pkg/handlers/config/config.go @@ -98,6 +98,8 @@ type CommandDir struct { AdditionalData map[string]interface{} `yaml:"additionalData,omitempty"` Defaults *LayerParams `yaml:"defaults,omitempty"` Overrides *LayerParams `yaml:"overrides,omitempty"` + BlackList *LayerFlagNames `yaml:"blackList,omitempty"` + WhiteList *LayerFlagNames `yaml:"whiteList,omitempty"` Stream *bool `yaml:"stream,omitempty"` } @@ -275,6 +277,13 @@ func (t *Template) ExpandPaths() error { return nil } +type LayerFlagNames struct { + Layers []string `yaml:"layers,omitempty"` + LayerParams map[string][]string `yaml:"layerParams,omitempty"` + Flags []string `yaml:"flags,omitempty"` + Arguments []string `yaml:"arguments,omitempty"` +} + type LayerParams struct { Layers map[string]map[string]interface{} `yaml:"layers,omitempty"` Flags map[string]interface{} `yaml:"flags,omitempty"`