diff --git a/components/cli/cli/command/container/exec.go b/components/cli/cli/command/container/exec.go index 46775f3048..258f3a860a 100644 --- a/components/cli/cli/command/container/exec.go +++ b/components/cli/cli/command/container/exec.go @@ -24,6 +24,7 @@ type execOptions struct { user string privileged bool env opts.ListOpts + workdir string container string command []string } @@ -58,6 +59,8 @@ func NewExecCommand(dockerCli command.Cli) *cobra.Command { flags.BoolVarP(&options.privileged, "privileged", "", false, "Give extended privileges to the command") flags.VarP(&options.env, "env", "e", "Set environment variables") flags.SetAnnotation("env", "version", []string{"1.25"}) + flags.StringVarP(&options.workdir, "workdir", "w", "", "Working directory inside the container") + flags.SetAnnotation("workdir", "version", []string{"1.35"}) return cmd } @@ -190,6 +193,7 @@ func parseExec(opts execOptions, configFile *configfile.ConfigFile) *types.ExecC Cmd: opts.command, Detach: opts.detach, Env: opts.env.GetAll(), + WorkingDir: opts.workdir, } // If -d is not set, attach to everything by default diff --git a/components/cli/cli/command/system/version.go b/components/cli/cli/command/system/version.go index 9cca599fe3..d063045d5c 100644 --- a/components/cli/cli/command/system/version.go +++ b/components/cli/cli/command/system/version.go @@ -1,34 +1,52 @@ package system import ( + "fmt" "runtime" + "sort" + "text/template" "time" - "golang.org/x/net/context" - "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/templates" "github.com/docker/docker/api/types" "github.com/spf13/cobra" + "golang.org/x/net/context" ) -var versionTemplate = `Client: - Version: {{.Client.Version}} - API version: {{.Client.APIVersion}}{{if ne .Client.APIVersion .Client.DefaultAPIVersion}} (downgraded from {{.Client.DefaultAPIVersion}}){{end}} - Go version: {{.Client.GoVersion}} - Git commit: {{.Client.GitCommit}} - Built: {{.Client.BuildTime}} - OS/Arch: {{.Client.Os}}/{{.Client.Arch}}{{if .ServerOK}} +var versionTemplate = `{{with .Client -}} +Client:{{if ne .Platform.Name ""}} {{.Platform.Name}}{{end}} + Version: {{.Version}} + API version: {{.APIVersion}}{{if ne .APIVersion .DefaultAPIVersion}} (downgraded from {{.DefaultAPIVersion}}){{end}} + Go version: {{.GoVersion}} + Git commit: {{.GitCommit}} + Built: {{.BuildTime}} + OS/Arch: {{.Os}}/{{.Arch}} +{{- end}} -Server: - Version: {{.Server.Version}} - API version: {{.Server.APIVersion}} (minimum version {{.Server.MinAPIVersion}}) - Go version: {{.Server.GoVersion}} - Git commit: {{.Server.GitCommit}} - Built: {{.Server.BuildTime}} - OS/Arch: {{.Server.Os}}/{{.Server.Arch}} - Experimental: {{.Server.Experimental}}{{end}}` +{{- if .ServerOK}}{{with .Server}} + +Server:{{if ne .Platform.Name ""}} {{.Platform.Name}}{{end}} + {{- range $component := .Components}} + {{$component.Name}}: + {{- if eq $component.Name "Engine" }} + Version: {{.Version}} + API version: {{index .Details "ApiVersion"}} (minimum version {{index .Details "MinAPIVersion"}}) + Go version: {{index .Details "GoVersion"}} + Git commit: {{index .Details "GitCommit"}} + Built: {{index .Details "BuildTime"}} + OS/Arch: {{index .Details "Os"}}/{{index .Details "Arch"}} + Experimental: {{index .Details "Experimental"}} + {{- else }} + Version: {{$component.Version}} + {{- $detailsOrder := getDetailsOrder $component}} + {{- range $key := $detailsOrder}} + {{$key}}: {{index $component.Details $key}} + {{- end}} + {{- end}} + {{- end}} +{{- end}}{{end}}` type versionOptions struct { format string @@ -41,6 +59,8 @@ type versionInfo struct { } type clientVersion struct { + Platform struct{ Name string } `json:",omitempty"` + Version string APIVersion string `json:"ApiVersion"` DefaultAPIVersion string `json:"DefaultAPIVersion,omitempty"` @@ -77,15 +97,27 @@ func NewVersionCommand(dockerCli *command.DockerCli) *cobra.Command { return cmd } +func reformatDate(buildTime string) string { + t, errTime := time.Parse(time.RFC3339Nano, buildTime) + if errTime == nil { + return t.Format(time.ANSIC) + } + return buildTime +} + func runVersion(dockerCli *command.DockerCli, opts *versionOptions) error { ctx := context.Background() templateFormat := versionTemplate + tmpl := templates.New("version") if opts.format != "" { templateFormat = opts.format + } else { + tmpl = tmpl.Funcs(template.FuncMap{"getDetailsOrder": getDetailsOrder}) } - tmpl, err := templates.Parse(templateFormat) + var err error + tmpl, err = tmpl.Parse(templateFormat) if err != nil { return cli.StatusError{StatusCode: 64, Status: "Template parsing error: " + err.Error()} @@ -103,22 +135,41 @@ func runVersion(dockerCli *command.DockerCli, opts *versionOptions) error { Arch: runtime.GOARCH, }, } - - serverVersion, err := dockerCli.Client().ServerVersion(ctx) - if err == nil { - vd.Server = &serverVersion - } + vd.Client.Platform.Name = cli.PlatformName // first we need to make BuildTime more human friendly - t, errTime := time.Parse(time.RFC3339Nano, vd.Client.BuildTime) - if errTime == nil { - vd.Client.BuildTime = t.Format(time.ANSIC) - } + vd.Client.BuildTime = reformatDate(vd.Client.BuildTime) - if vd.ServerOK() { - t, errTime = time.Parse(time.RFC3339Nano, vd.Server.BuildTime) - if errTime == nil { - vd.Server.BuildTime = t.Format(time.ANSIC) + sv, err := dockerCli.Client().ServerVersion(ctx) + if err == nil { + vd.Server = &sv + foundEngine := false + for _, component := range sv.Components { + if component.Name == "Engine" { + foundEngine = true + buildTime, ok := component.Details["BuildTime"] + if ok { + component.Details["BuildTime"] = reformatDate(buildTime) + } + break + } + } + + if !foundEngine { + vd.Server.Components = append(vd.Server.Components, types.ComponentVersion{ + Name: "Engine", + Version: sv.Version, + Details: map[string]string{ + "ApiVersion": sv.APIVersion, + "MinAPIVersion": sv.MinAPIVersion, + "GitCommit": sv.GitCommit, + "GoVersion": sv.GoVersion, + "Os": sv.Os, + "Arch": sv.Arch, + "BuildTime": reformatDate(vd.Server.BuildTime), + "Experimental": fmt.Sprintf("%t", sv.Experimental), + }, + }) } } @@ -128,3 +179,12 @@ func runVersion(dockerCli *command.DockerCli, opts *versionOptions) error { dockerCli.Out().Write([]byte{'\n'}) return err } + +func getDetailsOrder(v types.ComponentVersion) []string { + out := make([]string, 0, len(v.Details)) + for k := range v.Details { + out = append(out, k) + } + sort.Strings(out) + return out +} diff --git a/components/cli/cli/compose/loader/loader.go b/components/cli/cli/compose/loader/loader.go index a1e13c5050..7629477519 100644 --- a/components/cli/cli/compose/loader/loader.go +++ b/components/cli/cli/compose/loader/loader.go @@ -98,7 +98,7 @@ func loadSections(config map[string]interface{}, configDetails types.ConfigDetai { key: "networks", fnc: func(config map[string]interface{}) error { - cfg.Networks, err = LoadNetworks(config) + cfg.Networks, err = LoadNetworks(config, configDetails.Version) return err }, }, @@ -425,17 +425,30 @@ func transformUlimits(data interface{}) (interface{}, error) { // LoadNetworks produces a NetworkConfig map from a compose file Dict // the source Dict is not validated if directly used. Use Load() to enable validation -func LoadNetworks(source map[string]interface{}) (map[string]types.NetworkConfig, error) { +func LoadNetworks(source map[string]interface{}, version string) (map[string]types.NetworkConfig, error) { networks := make(map[string]types.NetworkConfig) err := transform(source, &networks) if err != nil { return networks, err } for name, network := range networks { - if network.External.External && network.External.Name == "" { - network.External.Name = name - networks[name] = network + if !network.External.External { + continue } + switch { + case network.External.Name != "": + if network.Name != "" { + return nil, errors.Errorf("network %s: network.external.name and network.name conflict; only use network.name", name) + } + if versions.GreaterThanOrEqualTo(version, "3.5") { + logrus.Warnf("network %s: network.external.name is deprecated in favor of network.name", name) + } + network.Name = network.External.Name + network.External.Name = "" + case network.Name == "": + network.Name = name + } + networks[name] = network } return networks, nil } diff --git a/components/cli/cli/compose/loader/loader_test.go b/components/cli/cli/compose/loader/loader_test.go index d609311abc..c2df0f8252 100644 --- a/components/cli/cli/compose/loader/loader_test.go +++ b/components/cli/cli/compose/loader/loader_test.go @@ -636,7 +636,8 @@ networks: }, Networks: map[string]types.NetworkConfig{ "front": { - External: types.External{External: true, Name: "front"}, + External: types.External{External: true}, + Name: "front", Internal: true, Attachable: true, }, @@ -800,7 +801,7 @@ volumes: assert.Contains(t, err.Error(), "external_volume") } -func TestInvalidExternalNameAndNameCombination(t *testing.T) { +func TestLoadVolumeInvalidExternalNameAndNameCombination(t *testing.T) { _, err := loadYAML(` version: "3.4" volumes: @@ -1172,17 +1173,13 @@ func TestFullExample(t *testing.T) { }, "external-network": { - External: types.External{ - Name: "external-network", - External: true, - }, + Name: "external-network", + External: types.External{External: true}, }, "other-external-network": { - External: types.External{ - Name: "my-cool-network", - External: true, - }, + Name: "my-cool-network", + External: types.External{External: true}, }, } @@ -1516,7 +1513,7 @@ configs: assert.Equal(t, "invalid", actual.Services[0].Isolation) } -func TestInvalidSecretExternalNameAndNameCombination(t *testing.T) { +func TestLoadSecretInvalidExternalNameAndNameCombination(t *testing.T) { _, err := loadYAML(` version: "3.5" secrets: @@ -1556,3 +1553,65 @@ func TestLoadSecretsWarnOnDeprecatedExternalNameVersion35(t *testing.T) { assert.Equal(t, expected, secrets) assert.Contains(t, buf.String(), "secret.external.name is deprecated") } + +func TestLoadNetworksWarnOnDeprecatedExternalNameVersion35(t *testing.T) { + buf, cleanup := patchLogrus() + defer cleanup() + + source := map[string]interface{}{ + "foo": map[string]interface{}{ + "external": map[string]interface{}{ + "name": "oops", + }, + }, + } + networks, err := LoadNetworks(source, "3.5") + require.NoError(t, err) + expected := map[string]types.NetworkConfig{ + "foo": { + Name: "oops", + External: types.External{External: true}, + }, + } + assert.Equal(t, expected, networks) + assert.Contains(t, buf.String(), "network.external.name is deprecated") + +} + +func TestLoadNetworksWarnOnDeprecatedExternalNameVersion34(t *testing.T) { + buf, cleanup := patchLogrus() + defer cleanup() + + source := map[string]interface{}{ + "foo": map[string]interface{}{ + "external": map[string]interface{}{ + "name": "oops", + }, + }, + } + networks, err := LoadNetworks(source, "3.4") + require.NoError(t, err) + expected := map[string]types.NetworkConfig{ + "foo": { + Name: "oops", + External: types.External{External: true}, + }, + } + assert.Equal(t, expected, networks) + assert.Equal(t, "", buf.String()) +} + +func TestLoadNetworkInvalidExternalNameAndNameCombination(t *testing.T) { + _, err := loadYAML(` +version: "3.5" +networks: + foo: + name: user_specified_name + external: + name: external_name +`) + + require.Error(t, err) + assert.Contains(t, err.Error(), "network.external.name and network.name conflict; only use network.name") + assert.Contains(t, err.Error(), "foo") +} diff --git a/components/cli/cli/compose/schema/bindata.go b/components/cli/cli/compose/schema/bindata.go index e234c2cddd..f51ed9f043 100644 --- a/components/cli/cli/compose/schema/bindata.go +++ b/components/cli/cli/compose/schema/bindata.go @@ -113,7 +113,7 @@ func dataConfig_schema_v31Json() (*asset, error) { return a, nil } -var _dataConfig_schema_v32Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\xcd\x73\xdc\x28\x16\xbf\xf7\x5f\xa1\x52\x72\x8b\x3f\x52\xbb\xa9\xad\xda\xdc\xf6\xb8\xa7\x99\xf3\xb8\x3a\x2a\x1a\xbd\x56\x13\x4b\x40\x00\xb5\xdd\x49\xf9\x7f\x9f\xd2\x67\x03\x02\x81\xba\xe5\x38\x33\x35\x27\xdb\xe2\xf7\x80\xf7\xfd\x1e\xe0\x1f\x9b\x24\x49\xdf\x4b\x7c\x80\x0a\xa5\x9f\x93\xf4\xa0\x14\xff\x7c\x7f\xff\x55\x32\x7a\xdb\x7d\xbd\x63\xa2\xb8\xcf\x05\xda\xab\xdb\x8f\x9f\xee\xbb\x6f\xef\xd2\x9b\x86\x8e\xe4\x0d\x09\x66\x74\x4f\x8a\xac\x1b\xc9\x8e\xff\xbe\xfb\xd7\x5d\x43\xde\x41\xd4\x89\x43\x03\x62\xbb\xaf\x80\x55\xf7\x4d\xc0\xb7\x9a\x08\x68\x88\x1f\xd2\x23\x08\x49\x18\x4d\xb7\x37\x9b\x66\x8c\x0b\xc6\x41\x28\x02\x32\xfd\x9c\x34\x9b\x4b\x92\x11\x32\x7c\xd0\xa6\x95\x4a\x10\x5a\xa4\xed\xe7\x97\x76\x86\x24\x49\x25\x88\x23\xc1\xda\x0c\xe3\x56\xdf\xdd\x9f\xe7\xbf\x1f\x61\x37\xf6\xac\xda\x66\xdb\xef\x1c\x29\x05\x82\xfe\x3e\xdd\x5b\x3b\xfc\xe5\x01\xdd\x7e\xff\xdf\xed\x1f\x1f\x6f\xff\x7b\x97\xdd\x6e\x3f\xbc\x37\x86\x1b\xf9\x0a\xd8\x77\xcb\xe7\xb0\x27\x94\x28\xc2\xe8\xb8\x7e\x3a\x22\x5f\xfa\xdf\x5e\xc6\x85\x51\x9e\xb7\x60\x54\x1a\x6b\xef\x51\x29\xc1\xe4\x99\x82\x7a\x62\xe2\x31\xc4\xf3\x08\x7b\x23\x9e\xfb\xf5\x1d\x3c\x9b\xec\x1c\x59\x59\x57\x41\x0d\x0e\xa8\x37\x62\xa6\x5b\x7e\x1d\xfd\x49\xc0\x02\x54\xd8\x64\x3b\xd4\x9b\x59\x6c\xb3\xfc\x75\x0c\x6f\x06\xa6\x67\xb1\x1d\x42\x5b\xbb\xdd\xa0\xe1\xde\x2e\x51\xb9\xdc\xcb\x2f\xab\x51\x58\x1e\x29\xe5\xc0\x4b\x76\x6a\xbe\x79\xe4\xd1\x01\x2a\xa0\x2a\x1d\x45\x90\x24\xe9\xae\x26\x65\x6e\x4b\x94\x51\xf8\xad\x99\xe2\x41\xfb\x98\x24\x3f\xec\x48\xa6\xcd\xd3\x8e\x1b\x7f\xf9\x15\x3e\x8e\x7b\x78\x19\xc7\x31\xa3\x0a\x9e\x55\xcb\xd4\xfc\xd2\x9d\x08\x18\x7e\x04\xb1\x27\x25\xc4\x52\x20\x51\xc8\x19\x91\x95\x44\xaa\x8c\x89\x2c\x27\x58\x39\xe9\x31\xc2\x07\xc8\xf6\x82\x55\xc1\x59\xf6\x59\xb7\x0f\x99\xbe\x58\xf3\x4c\x26\x0e\x1b\xe6\x48\xaa\xfd\xb5\xdd\x38\x26\x4c\x31\xe2\x19\xca\x73\x43\x20\x48\x08\x74\x4a\x6f\x92\x94\x28\xa8\xa4\x5b\x56\x49\x5a\x53\xf2\xad\x86\xff\xf7\x10\x25\x6a\xb0\xe7\xcd\x05\xe3\xeb\x4f\x5c\x08\x56\xf3\x8c\x23\xd1\x58\xea\xbc\x1e\x53\xcc\xaa\x0a\xd1\xb5\xcc\x77\x09\x1f\x11\x92\x67\x54\x21\x42\x41\x64\x14\x55\x21\x8b\x6c\xdc\x17\x68\x2e\xb3\xae\x72\x88\xb5\x24\x63\x82\xb1\x8c\x58\x55\x1f\x39\x9d\xf3\x90\x6e\x9a\xc6\x47\x9a\xbd\xa5\x16\x61\x26\x01\x09\x7c\xb8\x90\x9e\x55\x88\xd0\x18\xd9\x01\x55\xe2\xc4\x19\xe9\xec\xe5\x97\x33\x04\xa0\xc7\x6c\x0c\x4a\x8b\xc5\x00\xf4\x48\x04\xa3\xd5\xe0\x0d\x71\x91\x4a\xa3\x7f\xe6\x4c\x82\x2d\x18\x8b\x41\x7d\x68\x64\xd5\x90\xc9\x40\xf1\x30\x30\x7e\x93\xa4\xb4\xae\x76\x20\x9a\x62\xd8\x40\xee\x99\xa8\x50\xb3\xd9\x61\x6d\x6d\xd8\x90\xb4\xc3\xf2\x74\x01\xea\x3c\x34\xf5\x01\x2a\xb3\x92\xd0\xc7\xf5\x4d\x1c\x9e\x95\x40\xd9\x81\x49\x75\x49\x32\x48\x0f\x80\x4a\x75\xc0\x07\xc0\x8f\x33\xe4\x3a\xca\xa0\x66\x52\xc5\x18\x39\xa9\x50\x11\x06\x71\x1c\x82\x94\x68\x07\xe5\x45\x7c\xae\x2a\x7c\x6d\x5a\x56\x14\x0d\xd4\x67\x71\x93\x12\xa8\x1f\x0e\x15\x0f\xb9\x20\x47\x10\xb1\x95\x00\xe3\xe7\xca\xcd\x1e\x0c\x57\x32\x49\xb8\x8c\x35\xa0\x5f\xee\xba\x2a\x76\xc6\xab\xda\xdf\xca\x32\xdd\xda\xe5\x42\x62\xe5\x7d\xd7\x17\x8b\xc3\xb8\x82\xc2\xd0\x4a\x85\x70\x53\x37\x08\x90\x1e\xbd\x9e\xa1\x7d\x9b\x94\x55\x2c\xf7\x19\xe8\x04\x6c\xcb\xc6\x1b\xa9\x17\x27\xc2\xe4\xa2\x42\x34\x4a\x75\xc1\x4e\x24\xc0\x8d\x6f\x7b\xb1\xdb\x3c\x6f\x37\x6c\x62\x2d\x0e\x95\x04\x49\x08\x3b\xbb\x57\x90\xc6\x6c\x84\x1f\x3f\x45\xda\x84\x8b\xf6\x3f\xb3\xb4\x1e\x52\xef\x9c\xf1\x35\x72\x60\xaa\xf3\x56\x5a\x77\x73\x6d\x64\x1b\xf0\xb6\x57\x2e\xe1\x39\xc9\xfd\xb1\xa2\x8d\x10\xba\x83\x71\x26\xd4\xc4\xbb\x96\xa7\x7b\x9f\x05\xeb\xe2\x1a\xe2\xd4\x39\xe1\x77\x8b\x4f\xa4\x31\x51\x77\x14\xd1\xd4\xff\x82\xfe\x11\xf6\x8c\x74\x26\x4a\x39\xd0\x0a\x89\x02\xcc\x36\x84\x50\x05\x05\x08\x0f\x01\xaf\x77\x25\x91\x07\xc8\x97\xd0\x08\xa6\x18\x66\x65\x9c\x63\x38\xfb\xd8\x78\x67\x30\x27\xdc\x5e\x5d\x9b\x71\x41\x8e\xa4\x84\xc2\xe2\x78\xc7\x58\x09\x88\x1a\x89\x42\x00\xca\x33\x46\xcb\x53\x04\x52\x2a\x24\x82\xed\x9f\x04\x5c\x0b\xa2\x4e\x19\xe3\x6a\xf5\xaa\x50\x1e\xaa\x4c\x92\xef\x60\xfa\xde\xd9\xea\xfb\x89\xb6\xd6\x86\xac\x83\xb1\xe4\xb5\xdc\xcf\x67\xb6\xaf\xe4\x36\x92\xd5\x02\x5f\xe7\x38\xb3\xf8\xda\x0c\x72\xf3\xe0\x62\x09\x78\xe2\xf0\xbd\x0a\x43\x35\xd4\xac\xab\x38\x03\xb5\x3c\x49\xac\x2e\xab\xad\xa5\xca\x09\xcd\x18\x07\x1a\xf4\x0d\xa9\x18\xcf\x0a\x81\x30\x64\x1c\x04\x61\x4e\x51\x18\x01\x36\xaf\x05\x6a\xd6\x9f\x4e\x23\x49\x41\x91\x3b\xee\x68\x50\x55\xf1\xfd\x85\x87\x00\x4a\x85\x9d\xbd\x2e\x49\x45\xfc\x4e\xe3\xb0\xda\x88\x7a\xad\xab\xd5\xdc\x25\xda\x4c\x79\x16\x15\xb2\x67\x3a\x84\xf9\x06\x21\xa2\x33\x38\x20\xb1\x20\x75\xb4\x8e\xb9\xf7\xe4\x27\x57\xdf\xe0\xdc\x97\x71\xc5\xd5\xce\x77\xd3\x6f\x64\xeb\xc4\x2f\x2a\xbd\xec\x6d\x6c\xbd\xd5\x8f\xdb\xa9\x6a\x19\x6c\xe2\x5a\x0c\x95\x73\x0d\xc8\x08\x9d\xde\xd5\x24\x7f\x89\x08\x6d\xe8\xa8\x85\x3b\x74\x13\x11\xc7\xfb\x95\x22\x63\xe7\x6b\x47\xfd\xe8\x8a\x40\xa3\xc1\x8c\x4a\x22\x15\x50\x7c\x8a\x5f\x68\x47\x26\xa7\xc4\x53\xa1\xcc\xf7\x5d\x71\x5d\x57\x8b\x42\x45\x17\x6f\xa3\x1b\x9d\x78\x5f\xed\xaf\xf1\x7e\x0a\x2b\x94\x61\xc6\x3d\xaa\x89\x67\x63\x69\x9a\xb5\x8e\x2e\x66\xea\x50\x5f\xc8\x78\x62\xe2\xb1\x49\x48\x39\x71\x47\x8e\x8d\x45\xb2\xe0\xe6\xd3\x3a\xeb\x1b\x26\x70\x5d\xe9\xe9\xd0\xe0\x15\xe8\xfc\xf5\x62\x0f\xf2\x5e\xfd\x11\x89\x76\xd6\xa5\x97\x2b\xd1\x36\x99\x41\x1c\xc3\xf9\x5e\x80\x12\xc4\xba\x4a\x18\x8a\x26\x3d\xb7\x83\xfc\x35\x0f\xdc\x15\xa9\x80\xd5\xee\x30\xb4\xd1\x0d\xa7\x27\x4a\xb5\xab\xd1\x80\x52\x35\xa4\xad\xd3\x87\x51\xa9\x43\x5f\x1e\x54\x5c\x4c\xc2\x02\x9a\xb7\x57\x1b\x51\xd9\x4d\x00\x2f\x09\x46\x32\x54\x41\x5c\x71\x0a\x5c\xf3\x1c\x29\xc8\xba\x77\x34\x8b\x6a\xb6\x99\x62\x8d\x23\x81\xca\x12\x4a\x22\xab\x98\xe2\x27\xcd\xa1\x44\xce\xe8\x1f\xac\x7b\x5b\xf2\x3d\x22\x65\x2d\x20\x43\xd8\x1b\xa6\x2d\x8a\x8a\x51\xa2\x98\x33\x9c\xc4\x2d\x59\xa1\xe7\x6c\x58\xb6\x85\x84\x5a\x12\xb3\x1b\x8f\x3d\xc0\xd5\x2c\xa1\xcb\xdd\xcb\xca\xea\x19\x15\x9d\x8b\x74\x8f\xc5\x0c\x2b\x4e\x58\x17\x20\x9b\xb0\x33\x9e\xaf\x07\xe9\x57\x95\x82\x42\x42\x65\x9c\x95\xa4\x2b\x17\xd6\x10\x05\x66\xb4\xdb\x47\x8c\xe5\x5c\x69\xaa\x8d\xdd\x34\xcd\x4e\xc5\x55\xd0\xab\x5b\x82\x27\x42\x73\xf6\xb4\x60\xc1\xf5\xa4\xcd\x4b\x84\xc1\x8a\xa2\xd7\x0a\x5a\x2a\x81\x08\x55\x8b\xef\x9d\xae\x65\xeb\x8a\x1a\x61\x34\xe4\x40\x2e\x19\x71\xc1\xea\xc0\x97\x3f\x30\xaf\x83\xb7\x33\x15\x54\x4c\xb8\x2b\xe5\x2b\x78\x1c\x9e\xc6\x05\x58\x1c\x60\x2b\xe4\xca\xa8\xeb\xbc\x1e\x95\x31\xbe\xfe\x79\x42\xf8\xca\x6e\x1b\xee\x66\x09\x47\xd5\x5a\xde\x11\x7d\xc1\x99\x3a\x93\x75\x32\xdf\xf7\x26\xfe\xde\x37\xb4\xeb\xf0\xde\x7b\x84\xac\x77\xd4\xd3\x2e\x4e\xbb\x86\x35\x8f\xbd\x57\x0c\x7a\xc3\xdb\x04\x8f\x56\x1f\xc6\x4a\xfc\x66\x94\xd5\x36\x5a\xc5\xde\x87\x01\xeb\xed\xbf\x6d\x0a\xec\x43\x40\x57\xf7\x80\x94\x42\xf8\x10\xd5\x68\x2c\xac\x2e\xaf\x88\x43\x93\x76\xd8\x19\x86\x7a\xd4\x3f\x51\xe8\x6f\x62\xb3\x3f\xcf\xbe\xfa\x47\xc4\xc1\xd7\xbb\x2d\xea\xe2\x3c\x1e\xf1\x64\xf5\x17\xd0\xd9\x5b\xab\xc2\xbc\x65\xd0\x54\x32\x3d\x74\x98\x93\xe4\xd2\x67\xba\x5b\x73\x1b\x36\xcc\xf1\x7f\x1e\x66\x32\x9d\xbb\x83\x1c\x20\x9e\x43\x2e\x6b\xd1\x5e\x88\xf3\x9c\xaf\x18\x6c\xee\x3e\xcc\x94\x0c\x73\x4f\x96\x5e\x29\xd7\xae\x70\xbf\xeb\xd6\xa9\xd5\x67\x0c\xd2\x9d\xbe\xdd\xf7\xf8\xbf\x46\x3f\x79\xc9\xdf\xf0\x49\x4f\x93\x43\xb1\x1f\xe6\x89\x7e\xf7\x0a\x7f\x6b\xc8\xc7\x82\x74\x0f\x00\xb5\xe8\xbe\xd5\x5b\x2f\x9f\x1a\x9d\xef\xfb\xed\xfb\x84\xe1\x9d\xbd\xe7\x8a\x73\xa3\xff\x6c\xff\x27\x62\xf3\xb2\xf9\x33\x00\x00\xff\xff\x33\x66\x86\x98\x8c\x35\x00\x00") +var _dataConfig_schema_v32Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x4b\x93\xdc\x28\x12\xbe\xd7\xaf\x50\xc8\xbe\xb9\x1f\x8e\x5d\xc7\x46\xac\x6f\x7b\xdc\xd3\xcc\x79\x3a\xca\x0a\x0a\x65\xa9\x70\x4b\x80\x01\x55\x77\xd9\xd1\xff\x7d\x42\xcf\x02\x04\x02\x75\xa9\xdc\x9e\x89\x39\xd9\x2d\x32\x13\xf2\xc9\x97\x40\xfd\xd8\x24\x49\xfa\x5e\xe2\x03\x54\x28\xfd\x9c\xa4\x07\xa5\xf8\xe7\xfb\xfb\xaf\x92\xd1\xdb\xee\xeb\x1d\x13\xc5\x7d\x2e\xd0\x5e\xdd\x7e\xfc\x74\xdf\x7d\x7b\x97\xde\x34\x7c\x24\x6f\x58\x30\xa3\x7b\x52\x64\xdd\x48\x76\xfc\xf7\xdd\xbf\xee\x1a\xf6\x8e\x44\x9d\x38\x34\x44\x6c\xf7\x15\xb0\xea\xbe\x09\xf8\x56\x13\x01\x0d\xf3\x43\x7a\x04\x21\x09\xa3\xe9\xf6\x66\xd3\x8c\x71\xc1\x38\x08\x45\x40\xa6\x9f\x93\x66\x71\x49\x32\x92\x0c\x1f\x34\xb1\x52\x09\x42\x8b\xb4\xfd\xfc\xd2\x4a\x48\x92\x54\x82\x38\x12\xac\x49\x18\x97\xfa\xee\xfe\x2c\xff\x7e\x24\xbb\xb1\xa5\x6a\x8b\x6d\xbf\x73\xa4\x14\x08\xfa\xfb\x74\x6d\xed\xf0\x97\x07\x74\xfb\xfd\x7f\xb7\x7f\x7c\xbc\xfd\xef\x5d\x76\xbb\xfd\xf0\xde\x18\x6e\xec\x2b\x60\xdf\x4d\x9f\xc3\x9e\x50\xa2\x08\xa3\xe3\xfc\xe9\x48\xf9\xd2\xff\xef\x65\x9c\x18\xe5\x79\x4b\x8c\x4a\x63\xee\x3d\x2a\x25\x98\x3a\x53\x50\x4f\x4c\x3c\x86\x74\x1e\xc9\xde\x48\xe7\x7e\x7e\x87\xce\xa6\x3a\x47\x56\xd6\x55\xd0\x83\x03\xd5\x1b\x29\xd3\x4d\xbf\x8e\xff\x24\x60\x01\x2a\x1c\xb2\x1d\xd5\x9b\x45\x6c\x33\xfd\x65\x0a\x6f\x06\xa5\x67\x69\x3b\x0a\x6d\xee\x76\x81\x46\x7a\xbb\x4c\xe5\x4a\x2f\xbf\xad\x46\x63\x79\xac\x94\x03\x2f\xd9\xa9\xf9\xe6\xb1\x47\x47\x50\x01\x55\xe9\x68\x82\x24\x49\x77\x35\x29\x73\xdb\xa2\x8c\xc2\x6f\x8d\x88\x07\xed\x63\x92\xfc\xb0\x2b\x99\x26\xa7\x1d\x37\xfe\xf2\x3b\x7c\x1c\xf7\xe8\x32\x8e\x63\x46\x15\x3c\xab\x56\xa9\xf9\xa9\x3b\x13\x30\xfc\x08\x62\x4f\x4a\x88\xe5\x40\xa2\x90\x33\x26\x2b\x89\x54\x19\x13\x59\x4e\xb0\x72\xf2\x63\x84\x0f\x90\xed\x05\xab\x82\x52\xf6\x59\xb7\x0e\x99\xbe\x58\x72\x26\x82\xc3\x81\x39\xb2\x6a\x7f\x6d\x37\x0e\x81\x29\x46\x3c\x43\x79\x6e\x18\x04\x09\x81\x4e\xe9\x4d\x92\x12\x05\x95\x74\xdb\x2a\x49\x6b\x4a\xbe\xd5\xf0\xff\x9e\x44\x89\x1a\x6c\xb9\xb9\x60\x7c\x7d\xc1\x85\x60\x35\xcf\x38\x12\x4d\xa4\xce\xfb\x31\xc5\xac\xaa\x10\x5d\x2b\x7c\x97\xe8\x11\x61\x79\x46\x15\x22\x14\x44\x46\x51\x15\x8a\xc8\x26\x7d\x81\xe6\x32\xeb\x90\x43\x6c\x24\x19\x02\x46\x18\xb1\xaa\x3f\x72\x3a\x97\x21\x9d\x98\x26\x47\x9a\xb5\xa5\x16\x63\x26\x01\x09\x7c\x78\x25\x3f\xab\x10\xa1\x31\xb6\x03\xaa\xc4\x89\x33\xd2\xc5\xcb\x2f\x17\x08\x40\x8f\xd9\x58\x94\x16\x9b\x01\xe8\x91\x08\x46\xab\x21\x1b\xe2\x2a\x95\xc6\xff\xcc\x99\x04\xdb\x30\x96\x82\xfa\xd0\xa8\xaa\x61\x93\x81\xe3\x61\x50\xfc\x26\x49\x69\x5d\xed\x40\x34\x60\xd8\xa0\xdc\x33\x51\xa1\x66\xb1\xc3\xdc\xda\xb0\x61\x69\x47\xe4\xe9\x06\xd4\x75\x68\xf0\x01\x2a\xb3\x92\xd0\xc7\xf5\x43\x1c\x9e\x95\x40\xd9\x81\x49\xf5\x9a\xcd\x20\x3d\x00\x2a\xd5\x01\x1f\x00\x3f\xce\xb0\xeb\x54\x06\x37\x93\x2a\x26\xc8\x49\x85\x8a\x30\x11\xc7\x21\x92\x12\xed\xa0\x7c\x95\x9e\xab\x1a\x5f\x13\xcb\x8a\xa2\x21\xf5\x45\xdc\x04\x02\xf5\xc3\x21\xf0\x90\x0b\x72\x04\x11\x8b\x04\x18\x3f\x23\x37\x7b\x30\x8c\x64\x92\x30\x8c\x35\x48\xbf\xdc\x75\x28\x76\x26\xab\xda\xff\x95\x65\xba\xb5\xe1\x42\x62\xed\xfb\xae\x2f\x96\x86\x71\x80\xc2\xf0\x4a\x85\x70\x83\x1b\x04\x48\x8f\x5f\xcf\xa4\x7d\x9b\x94\x55\x2c\xf7\x05\xe8\x84\xd8\xb6\x8d\xb7\x52\x2f\xde\x08\x93\x57\x01\xd1\x28\xd7\x05\x3b\x91\x80\x36\xbe\xe5\xc5\x2e\xf3\xbc\xdc\x70\x88\xb5\x74\xa8\x24\x48\x42\x38\xd9\xbd\x86\x34\xa4\x11\x7e\xfc\x14\x19\x13\x2e\xde\xff\xcc\xf2\x7a\x58\xbd\x32\xe3\x31\x72\x40\xd4\x79\x29\x6d\xba\xb9\x16\xb2\x0d\x64\xdb\x95\x21\x3c\x27\xb9\xbf\x56\xb4\x15\x42\x4f\x30\xce\x84\x9a\x64\xd7\xf2\xed\xde\x17\xc1\xba\xb9\x86\x3a\x75\xde\xf0\xbb\xc9\x27\xd6\x98\xb8\x3b\x8a\x69\x9a\x7f\xc1\xfc\x08\x67\x46\x3a\x53\xa5\x1c\xd4\x0a\x89\x02\xcc\x36\x84\x50\x05\x05\x08\x0f\x03\xaf\x77\x25\x91\x07\xc8\x97\xf0\x08\xa6\x18\x66\x65\x5c\x62\x38\xfb\xd8\xf8\x64\x30\x05\x6e\x2f\xc6\x66\x5c\x90\x23\x29\xa1\xb0\x34\xde\x31\x56\x02\xa2\xc6\x46\x21\x00\xe5\x19\xa3\xe5\x29\x82\x52\x2a\x24\x82\xed\x9f\x04\x5c\x0b\xa2\x4e\x19\xe3\x6a\x75\x54\x28\x0f\x55\x26\xc9\x77\x30\x73\xef\x1c\xf5\xbd\xa0\xad\xb5\x20\xeb\x60\x2c\xb9\x56\xfa\xf9\xc2\xf6\x4a\x69\x23\x59\x2d\xf0\x65\x89\x33\x4b\x5f\x9b\x45\x6e\x9e\xb8\x58\x42\x3c\x49\xf8\xde\x85\x21\x0c\x35\x9b\x2a\xce\x42\x2d\x4f\x12\xab\xd7\x61\x6b\xa9\x72\x42\x33\xc6\x81\x06\x73\x43\x2a\xc6\xb3\x42\x20\x0c\x19\x07\x41\x98\xd3\x14\x46\x81\xcd\x6b\x81\x9a\xf9\xa7\x62\x24\x29\x28\x72\xd7\x1d\x8d\x54\x55\x7c\xff\xca\x43\x00\xa5\xc2\xc9\x5e\x97\xa4\x22\xfe\xa4\x71\x44\x6d\x04\x5e\xeb\xb0\x9a\x1b\xa2\xcd\xc0\xb3\xa8\x92\x3d\xd3\x21\xcc\x37\x08\x11\x9d\xc1\x01\x89\x05\x5b\x47\x9b\x98\x7b\xcf\xfe\xe4\xea\x1b\x9c\xeb\x32\xae\xb8\x5a\x79\x37\xfd\x42\xb6\x4e\xfa\x45\xd0\xcb\x5e\xc6\xd6\x8b\x7e\xdc\x49\x55\xcb\x60\x13\xd7\xd2\x50\x39\xd7\x80\x8c\xa4\xd3\xbb\x9a\xe4\x2f\x51\xa1\x0d\x1f\xb5\xe4\x0e\xdf\x44\xd4\xf1\x7e\xa6\xc8\xda\x79\xed\xaa\x1f\x8d\x08\x34\x1e\xcc\xa8\x24\x52\x01\xc5\xa7\xf8\x89\x76\x64\x72\x4a\x3c\x35\xca\x7c\xdf\x15\xd7\x75\xb5\x54\xa8\xe8\xea\x6d\x74\xa3\x13\x9f\xab\xfd\x35\xde\x4f\x51\x85\x32\xcc\xb8\xc7\x35\xf1\x6a\x5c\x19\xc0\x5a\x27\x1d\x33\xb0\xd5\x57\x61\x9e\x98\x78\x6c\xf6\xaf\x9c\xb8\x0b\xcd\xc6\x62\x59\x70\x51\x6a\x1d\x0d\x0e\x02\x5c\x37\x80\x3a\x69\xf0\xc6\x74\xfe\x36\xb2\x27\xf2\xde\x14\x12\x89\x76\xd6\x1d\x99\x6b\x5f\x6e\x36\x12\x71\x0c\xc3\x03\x01\x4a\x10\xeb\xe6\x61\xc0\x58\x3a\x14\x00\xf9\x6b\x9e\xcf\x2b\x52\x01\xab\xdd\x55\x6b\xa3\x07\x4e\xcf\x94\x6a\x37\xa9\x01\xa7\x6a\x94\xb6\x4f\x1f\x46\xa7\x0e\x6d\x7c\xd0\x71\x31\xfb\x1b\xd0\xbc\xbd\x09\x89\xda\x0c\x05\xf0\x92\x60\x24\x43\x80\xe3\x82\x43\xe3\x9a\xe7\x48\x41\xd6\x3d\xbb\x59\x04\xf1\x66\xb0\x1d\x47\x02\x95\x25\x94\x44\x56\x31\x58\x29\xcd\xa1\x44\xce\xcd\x22\x08\x93\x5b\xf6\x3d\x22\x65\x2d\x20\x43\xd8\x5b\xd5\x2d\x8e\x8a\x51\xa2\x98\xb3\x9c\xc4\x4d\x59\xa1\xe7\x6c\x98\xb6\x25\x09\x75\x30\x66\xf3\x1e\x7b\xde\xab\x45\x42\xb7\xd5\x2f\x43\xe1\x33\x2e\x3a\x63\x7a\x4f\xc4\x0c\x33\x4e\x54\x17\x20\x9b\xb2\x33\x1e\xc7\x07\xf9\x57\xb5\x82\x42\x42\x65\x9c\x95\xa4\x43\x17\x6b\x98\x02\x33\xda\xad\x23\x26\x72\x2e\x0c\xd5\x26\x6e\x9a\xde\xa8\xe2\x2a\x98\xd5\x2d\xc3\x13\xa1\x39\x7b\x5a\x30\xe1\x7a\xd6\xe6\x25\xc2\x60\x55\xd1\x4b\x0d\x2d\x95\x40\x84\xaa\xc5\xd7\x54\x97\xaa\x75\x01\x46\x18\x03\x39\xb0\x97\x8c\x74\x41\x74\xe0\xdb\x3f\x30\xaf\x83\x97\x39\x15\x54\x4c\xb8\x81\xf5\x05\x3a\x0e\x2f\xe9\x02\x2a\x0e\x64\x2b\xec\x95\x51\xb7\x7f\x3d\x55\xc6\xf8\xfa\xc7\x0f\xe1\x1b\xbe\x6d\xb8\xf9\x25\x1c\x55\x6b\x65\x47\xf4\x7d\x68\xea\xdc\xac\x93\xf9\x36\x39\xf1\xb7\xca\xa1\x55\x87\xd7\xde\x53\xc8\x7a\x47\x3d\xdd\xe5\x75\x9b\x8c\x15\x8b\xde\xf0\x94\xc1\xe3\xd5\x87\x11\x89\xdf\x8c\xb6\xda\x46\xbb\xd8\xfb\x8e\x60\xbd\xf5\xb7\x4d\x81\x7d\x66\xe8\xea\x1e\x90\x52\x08\x1f\xa2\x1a\x8d\x85\xe8\xf2\x82\x3a\x34\xe9\x9e\x9d\x65\xa8\xa7\xfa\xa7\x0a\xfd\x4d\x62\xf6\xe7\xc5\x57\xff\xe6\x38\xf8\xd8\xb7\xa5\x7a\xf5\x3e\x1e\xf1\xc2\xf5\x17\xf0\xd9\x5b\xbb\xc2\xbc\x94\xd0\x5c\x32\x3d\x74\x98\xb3\xe4\xd2\x57\xbd\x5b\x73\x19\x36\x99\xe3\x67\x21\xe6\x66\x3a\x77\x65\x39\x90\x78\x0e\xb9\xac\x49\x7b\x23\xce\x6b\xbe\x62\xb1\xb9\xfb\x30\x03\x19\xe6\x5e\x38\x5d\x69\xaf\x5d\xe1\x3a\xd8\xed\x53\xab\xcf\x18\xac\x3b\x7d\xea\xef\xc9\x7f\x8d\x7f\xf2\xf0\xbf\xd1\x93\x9e\x26\x87\x62\x3f\xcc\x0b\x80\xee\xd1\xfe\xd6\xb0\x8f\x45\xd2\xbd\x17\xd4\xaa\xfb\x56\x6f\xbd\x7c\x6e\x74\xfe\x1c\xc0\xbe\x7e\x18\x9e\xe5\x7b\x6e\x44\x37\xfa\xbf\xed\x4f\x28\x36\x2f\x9b\x3f\x03\x00\x00\xff\xff\x08\xbb\xeb\x9c\xbb\x35\x00\x00") func dataConfig_schema_v32JsonBytes() ([]byte, error) { return bindataRead( @@ -133,7 +133,7 @@ func dataConfig_schema_v32Json() (*asset, error) { return a, nil } -var _dataConfig_schema_v33Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\xcb\x93\xdb\x2c\x12\xbf\xfb\xaf\x50\xe9\xfb\x6e\x99\x47\xaa\x92\xda\xaa\xcd\x6d\x8f\x7b\xda\x3d\xef\x94\xa3\xc2\xa8\x6d\x93\x41\x40\x00\x79\xc6\x49\xcd\xff\xbe\xa5\xa7\x01\x81\xc0\xb6\x26\x33\xbb\x5f\x4e\x33\x96\x7e\x0d\x74\x37\xfd\xa2\xd1\xcf\x55\x96\xe5\x7f\x2a\xbc\x87\x0a\xe5\x5f\xb2\x7c\xaf\xb5\xf8\x72\x7f\xff\x4d\x71\x76\xdb\x3d\xbd\xe3\x72\x77\x5f\x4a\xb4\xd5\xb7\x1f\x3f\xdf\x77\xcf\xfe\xc8\x6f\x1a\x3a\x52\x36\x24\x98\xb3\x2d\xd9\x15\xdd\x9b\xe2\xf0\xe9\xee\xd3\x5d\x43\xde\x41\xf4\x51\x40\x03\xe2\x9b\x6f\x80\x75\xf7\x4c\xc2\xf7\x9a\x48\x68\x88\x1f\xf2\x03\x48\x45\x38\xcb\xd7\x37\xab\xe6\x9d\x90\x5c\x80\xd4\x04\x54\xfe\x25\x6b\x16\x97\x65\x23\x64\x78\x60\x0c\xab\xb4\x24\x6c\x97\xb7\x8f\x5f\xda\x11\xb2\x2c\x57\x20\x0f\x04\x1b\x23\x8c\x4b\xfd\xe3\xfe\x34\xfe\xfd\x08\xbb\x71\x47\x35\x16\xdb\x3e\x17\x48\x6b\x90\xec\xdf\xd3\xb5\xb5\xaf\xbf\x3e\xa0\xdb\x1f\xff\xb8\xfd\xcf\xc7\xdb\xbf\xdf\x15\xb7\xeb\x0f\x7f\x5a\xaf\x1b\xf9\x4a\xd8\x76\xd3\x97\xb0\x25\x8c\x68\xc2\xd9\x38\x7f\x3e\x22\x5f\xfa\xff\x5e\xc6\x89\x51\x59\xb6\x60\x44\xad\xb9\xb7\x88\x2a\xb0\x79\x66\xa0\x9f\xb8\x7c\x8c\xf1\x3c\xc2\xde\x88\xe7\x7e\x7e\x0f\xcf\x36\x3b\x07\x4e\xeb\x2a\xaa\xc1\x01\xf5\x46\xcc\x74\xd3\x2f\xa3\x3f\x05\x58\x82\x8e\x6f\xd9\x0e\xf5\x66\x3b\xb6\x99\x7e\x19\x86\x3b\xaf\x11\x63\x78\x40\xbd\x11\xc3\xdd\xf4\xd7\x31\xbc\x1a\x98\x9e\xc5\x76\x08\x63\xee\x76\x81\x96\x3f\xf3\x89\xca\xe7\x4f\xc2\xb2\x1a\x85\x15\x90\x52\x09\x82\xf2\x63\xf3\x2c\x20\x8f\x0e\x50\x01\xd3\xf9\x28\x82\x2c\xcb\x37\x35\xa1\xa5\x2b\x51\xce\xe0\x5f\xcd\x10\x0f\xc6\xc3\x2c\xfb\xe9\xba\x6e\x63\x9c\xf6\xbd\xf5\x2b\xac\xf0\xf1\x7d\x80\x97\xf1\x3d\xe6\x4c\xc3\xb3\x6e\x99\x9a\x9f\xba\x13\x01\xc7\x8f\x20\xb7\x84\x42\x2a\x05\x92\xdd\x2e\x0e\x88\x8c\x12\xa5\x0b\x2e\x8b\x92\x60\xed\xa5\xa7\x68\x03\xf4\xaa\x11\x30\xc2\x7b\x28\xb6\x92\x57\xd1\x51\xb6\x45\xc7\x89\xca\x5f\x9c\x71\x26\x03\xc7\xb7\xf6\x48\x6a\xfc\x5a\xaf\x3c\x03\xe6\x18\x89\x02\x95\xa5\x25\x52\x24\x25\x3a\xe6\x37\x59\x4e\x34\x54\xca\x2f\xed\x2c\xaf\x19\xf9\x5e\xc3\x3f\x7b\x88\x96\x35\xb8\xe3\x96\x92\x8b\xe5\x07\xde\x49\x5e\x8b\x42\x20\xd9\xec\xf5\xf9\x9d\x90\x63\x5e\x55\x88\x2d\x65\x00\xe7\xf0\x91\x20\xf9\x89\x9b\xcd\x4c\xab\xea\xe7\x30\x5f\x8d\xb3\x59\xcb\x0a\x70\x13\xe7\x67\x6a\xd2\x71\xa3\x8e\x9b\x75\xe3\x15\x79\x2d\x71\xaa\x95\x36\x73\x22\xb9\x83\x54\x3f\x90\x65\x79\x4d\xca\x74\xf0\xee\x1c\x70\xc5\x4b\x7b\xdd\xac\xae\x36\x20\x27\x26\x69\x5b\xd6\xf4\xf7\x7a\xe5\x7b\xe3\x68\x5f\x23\xc2\x40\x16\x0c\x55\x31\x59\xe5\x58\x42\x09\x4c\x13\x44\x0b\x25\x00\x5b\xf0\x41\x53\x33\x9a\xc9\x93\xbc\x66\x2e\x61\x47\x94\x96\x47\x2f\xf2\xc4\x85\xb9\xb0\x12\x04\xb0\x52\x15\x5d\x0d\x90\xea\xe0\xac\x01\xc6\x82\x60\x51\x37\x51\xb2\x39\xc7\xdd\x0d\xd3\xb8\xee\x66\x6d\xb9\x43\x58\x28\x40\x12\xef\x2f\xa4\xe7\x15\x22\x2c\x45\xa9\xc0\xb4\x3c\x0a\x4e\x3a\x37\xf6\xee\xfc\x13\xb0\x43\x31\xee\x9b\xb3\xc5\x00\xec\x40\x24\x67\xd5\xe0\xa4\xd3\x02\xa8\x41\xff\x2c\xb8\x82\xeb\x9d\x63\x4f\xf1\x30\x30\x7e\x33\xda\xf4\xda\x96\x5e\xbe\xe5\xb2\x42\xcd\x62\x87\xb9\x4d\x1b\xb6\xa6\x9a\xee\x3c\x53\x80\x26\x0f\x4d\xe2\x8b\x68\x41\x09\x7b\x5c\x7e\x8b\xc3\xb3\x96\xa8\xd8\x73\xa5\x2f\xc9\x51\xf2\x3d\x20\xaa\xf7\x78\x0f\xf8\x71\x86\xdc\x44\x59\xd4\x5c\xe9\x94\x4d\x4e\x2a\xb4\x8b\x83\x04\x8e\x41\x2e\xce\xc5\xf2\x45\x85\x6f\x0c\xcb\x77\xbb\x06\x1a\xda\x71\x93\xdc\xbe\x7f\x1d\xcb\x8a\x4b\x49\x0e\x20\x53\x53\x5c\x2e\x4e\x25\x89\xfb\x32\x25\x9a\x47\xeb\x33\x0b\xfa\xf5\xae\x2b\xcf\x66\xac\xaa\xfd\x8f\xd2\x7c\x3d\x0d\x99\xd3\xa0\xe9\x3e\x71\x38\x4c\xcb\x73\x2d\xad\x54\x08\x37\xe9\xac\x04\x15\xd0\xeb\x09\xda\x1f\x78\x14\x93\x98\x7f\xc2\x4e\xc0\x93\xc0\x1a\xf2\xd4\x67\x07\xc2\xec\xa2\x0a\x2b\x49\x75\xd1\x12\x3b\xc2\x4d\x68\x79\xa9\xcb\x3c\x2d\x37\xbe\xc5\x5a\x1c\xa2\x04\x29\x88\x1b\x7b\x50\x90\xd6\x68\x44\x1c\x3e\x27\xee\x09\x1f\xed\xdf\x66\x69\x03\xa4\xc1\x31\xd3\x4b\xb7\xc8\x50\x66\x8a\x4a\xa9\x77\x21\xeb\x78\xd2\xfa\x9a\x95\xa5\xb0\x13\x6f\xdb\x57\xb4\x1e\xc2\x34\x30\xc1\xa5\xfe\x25\xb5\xd0\xc9\x4f\x9d\x02\x7e\x37\xf9\xb4\x3c\x72\xd5\x9d\x44\xf4\x3a\x35\xd5\x8c\x97\xf2\xa0\x3d\x15\x15\x61\x1a\x76\x4d\x29\xe3\x0f\x02\xf5\x86\x12\xb5\x87\xf2\x1c\x1a\xc9\x35\xc7\x9c\xa6\x19\x86\xf7\x80\x26\xdd\x18\x66\xea\xab\x8b\x72\x33\x21\xc9\x81\x50\xd8\x39\x1c\x6f\x38\xa7\x80\x98\x15\x28\x24\xa0\xb2\xe0\x8c\x1e\x13\x90\x4a\x23\x19\x3d\x95\x50\x80\x6b\x49\xf4\xb1\xe0\x42\x2f\x9e\x15\xaa\x7d\x55\x28\xf2\x03\x6c\xdb\x3b\xed\xfa\x7e\xa0\xb5\xb3\x20\xe7\x88\x3b\xfb\x7d\x14\xf1\x97\x39\x8a\x50\x47\x85\xf5\x65\xb9\xb5\xd2\x25\x61\x05\x17\xc0\xa2\xb6\xa1\x34\x17\xc5\x4e\x22\x0c\x85\x00\x49\xb8\x57\x14\x96\x83\x2d\x6b\x89\x9a\xf9\xa7\xc3\x28\xb2\x63\xc8\xef\x77\x0c\xa8\xae\xc4\xf6\xc2\x43\x00\xad\xe3\xc6\x5e\x53\x52\x91\xb0\xd1\x78\x76\x6d\x42\xbe\xd6\xe5\x6a\xfe\x14\x6d\x26\x3d\x4b\x72\xd9\x33\x15\xc2\x7c\x81\x90\x50\x19\xec\x91\x3c\x23\x74\xb4\x86\xb9\x0d\xc4\x27\x5f\xdd\xe0\x5d\x97\xd5\xac\x6e\xc7\xbb\xe9\x17\xb2\xf6\xe2\xcf\x4a\xbd\xdc\x65\xac\x83\xd9\x8f\xdf\xa8\x6a\x15\x2d\xe2\x5a\x0c\x53\x73\x05\xc8\x08\x9d\x76\x5d\xb3\xff\x09\x0f\x6d\xe9\xa8\x85\x7b\x74\x93\xe0\xc7\xfb\x99\x12\x7d\xe7\x6b\x7b\xfd\xe4\x8c\xc0\xa0\xc1\x9c\x29\xa2\x34\x30\xec\x3f\x5f\xf5\x12\x6d\xc8\xa4\x79\x31\x15\xca\x7c\xdd\x95\x56\x75\xb5\x28\xb4\xeb\xfc\x6d\x72\xa1\x93\x6e\xab\x7d\x43\xfe\x97\xb0\xc2\x38\xe6\x22\xa0\x9a\x74\x36\xce\x0d\xb3\xce\xd1\xc5\x4c\x1e\x1a\x72\x19\x4f\x5c\x3e\x36\x01\xa9\x24\x7e\xcf\xb1\x72\x48\xce\x68\xe9\x3b\x67\x7d\xc3\x00\xbe\x5e\xb5\x09\x8d\xf6\xf6\xe7\xfb\xe6\x3d\x28\xd8\xd3\x26\x0a\x6d\x9c\xbe\x84\x2f\xd0\x36\x91\x41\x1e\xe2\xf1\x5e\x82\x96\xc4\x69\x25\x0c\x49\x93\x19\xdb\x41\xbd\xcf\x03\x77\x4d\x2a\xe0\xb5\xdf\x0d\xad\xcc\x8d\xd3\x13\xe5\x46\xcf\x3f\xa2\x54\x03\xe9\xea\xf4\xc1\x68\x20\x75\x75\x79\x54\x71\x29\x01\x0b\x58\xd9\xb6\x36\x92\xa2\x9b\x04\x41\x09\x46\x2a\x96\x41\x5c\x71\x0a\x5c\x8b\x12\x69\x28\xfa\x6b\x23\xe7\xe4\x6c\x33\xc9\x9a\x40\x12\x51\x0a\x94\xa8\x2a\x25\xf9\xc9\x4b\xa0\xc8\xeb\xfd\xa3\x79\x6f\x4b\xbe\x45\x84\xd6\x12\x0a\x84\x83\x6e\xda\xa1\xa8\x38\x23\x9a\x7b\xdd\x49\xda\x94\x15\x7a\x2e\x86\x69\x5b\x48\xac\x24\xb1\xab\xf1\xd4\x03\x5c\x63\x27\x74\xb1\xfb\xbc\xb4\x7a\x46\x45\xa7\x24\x3d\xb0\x63\x86\x19\x27\xac\x4b\x50\x8d\xdb\x19\xcf\xd7\xa3\xf4\x8b\x4a\x41\x23\xa9\x0b\xc1\x29\xe9\xd2\x85\x25\x44\x81\x39\xeb\xd6\x91\xb2\x73\xae\xdc\xaa\xcd\xbe\x69\x8a\x9d\x4a\xe8\xa8\x55\xb7\x04\x4f\x84\x95\xfc\xe9\x8c\x09\x97\x93\xb6\xa0\x08\x83\xe3\x45\xaf\x15\xb4\xd2\x12\x11\xa6\xcf\xee\x3b\xb9\x62\x11\x12\xb6\x20\x81\x4d\x2d\x22\x9b\xcf\xff\xb3\x70\x0d\x10\xe3\x2d\xce\x61\x8f\x50\xa2\x49\x84\xdf\xe0\xf8\xef\x5a\xe5\x5f\x91\x49\x8d\xe6\x1e\x89\xb8\x23\x2e\x9a\x43\x85\xa2\x2c\x16\x75\xb4\x87\x55\x41\xc5\xe7\xef\x6b\x5c\x71\x63\x39\xc6\xe2\x00\x5b\x20\xa3\x48\x6a\x7a\xf6\xa8\x82\x8b\xe5\x4f\x5d\xe2\x8d\xcd\x75\xbc\xe6\x27\x02\x55\x4b\xf9\x90\xe4\x36\x70\xee\x4d\x69\xb2\x77\xe0\x1d\xea\x0d\x0b\x14\xd5\xef\xdb\x3b\xd8\x57\x2c\xda\x1b\x1c\x01\xad\x3e\x8c\xf5\xca\xcd\x28\xab\x75\xb2\x8a\x83\xd7\x27\x96\x5b\x7f\x5b\x3a\xb9\x47\xa5\xbe\x1a\x0b\x69\x8d\xf0\x3e\xa9\x1c\x3b\x33\x07\xbf\xc2\x0f\x4d\x0e\x0d\xbc\x6e\xa8\x47\xfd\xf6\x42\xff\x27\x7b\xf6\xd7\xed\xaf\xfe\xa3\x89\xe8\xe5\xfd\x16\x75\x71\x1c\x4f\xb8\x7b\xf9\x0e\x74\xf6\xc6\xaa\x98\x04\x31\xaf\x2a\x7a\xd4\x6f\x55\xbc\xaa\x55\xd8\x6d\x31\x43\x25\xd3\x53\xb2\x39\x49\x9e\xfb\xb9\xc3\xda\x5e\x86\x0b\xf3\x7c\x62\x68\xe7\x35\x73\x4d\xf3\x01\x12\x38\x95\x75\x26\xed\x85\x38\xcf\xf9\x82\x7e\xff\xee\xc3\x4c\xf6\x36\x77\xc7\xee\x95\xd2\x9e\x05\x2e\x24\xf8\x75\xea\x14\xc6\x83\x74\xa7\x5f\x51\x85\xed\x7f\xa0\x9f\x7c\x53\xd5\xf0\xc9\x8e\x93\x53\xdc\x9f\x76\x0b\xaa\xfb\x1e\x6a\x6d\xc9\xc7\x81\x74\x37\x56\x8d\x40\xbb\x36\xcf\x0a\x82\x57\xec\x7d\x5f\x5a\xb9\x0d\xb0\xe1\x8b\xa7\x40\x4f\x7e\x65\xfe\x6d\xbf\x4e\x5b\xbd\xac\xfe\x1b\x00\x00\xff\xff\x45\x8a\x1d\x5b\x07\x3c\x00\x00") +var _dataConfig_schema_v33Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\xcb\x93\xdb\x2c\x12\xbf\xfb\xaf\x50\xe9\xfb\x6e\x99\x47\xaa\x92\xda\xaa\xcd\x6d\x8f\x7b\xda\x3d\xef\x94\xa3\xc2\xa8\x6d\x93\x41\x40\x00\x79\xc6\x49\xcd\xff\xbe\xa5\xa7\x01\x81\xc0\xb6\x26\x33\xbb\x5f\x4e\x33\x96\x7e\xdd\xd0\xdd\xf4\x0b\xd0\xcf\x55\x96\xe5\x7f\x2a\xbc\x87\x0a\xe5\x5f\xb2\x7c\xaf\xb5\xf8\x72\x7f\xff\x4d\x71\x76\xdb\x3d\xbd\xe3\x72\x77\x5f\x4a\xb4\xd5\xb7\x1f\x3f\xdf\x77\xcf\xfe\xc8\x6f\x1a\x3a\x52\x36\x24\x98\xb3\x2d\xd9\x15\xdd\x9b\xe2\xf0\xe9\xee\xd3\x5d\x43\xde\x41\xf4\x51\x40\x03\xe2\x9b\x6f\x80\x75\xf7\x4c\xc2\xf7\x9a\x48\x68\x88\x1f\xf2\x03\x48\x45\x38\xcb\xd7\x37\xab\xe6\x9d\x90\x5c\x80\xd4\x04\x54\xfe\x25\x6b\x26\x97\x65\x23\x64\x78\x60\xb0\x55\x5a\x12\xb6\xcb\xdb\xc7\x2f\x2d\x87\x2c\xcb\x15\xc8\x03\xc1\x06\x87\x71\xaa\x7f\xdc\x9f\xf8\xdf\x8f\xb0\x1b\x97\xab\x31\xd9\xf6\xb9\x40\x5a\x83\x64\xff\x9e\xce\xad\x7d\xfd\xf5\x01\xdd\xfe\xf8\xc7\xed\x7f\x3e\xde\xfe\xfd\xae\xb8\x5d\x7f\xf8\xd3\x7a\xdd\xe8\x57\xc2\xb6\x1b\xbe\x84\x2d\x61\x44\x13\xce\xc6\xf1\xf3\x11\xf9\xd2\xff\xf7\x32\x0e\x8c\xca\xb2\x05\x23\x6a\x8d\xbd\x45\x54\x81\x2d\x33\x03\xfd\xc4\xe5\x63\x4c\xe6\x11\xf6\x46\x32\xf7\xe3\x7b\x64\xb6\xc5\x39\x70\x5a\x57\x51\x0b\x0e\xa8\x37\x12\xa6\x1b\x7e\x19\xfb\x29\xc0\x12\x74\x7c\xc9\x76\xa8\x37\x5b\xb1\xcd\xf0\xcb\x08\xdc\x45\x8d\x98\xc0\x03\xea\x8d\x04\xee\x86\xbf\x4e\xe0\xd5\x20\xf4\x2c\xb6\x43\x18\x63\xb7\x13\xb4\xe2\x99\x4f\x55\xbe\x78\x12\xd6\xd5\xa8\xac\x80\x96\x4a\x10\x94\x1f\x9b\x67\x01\x7d\x74\x80\x0a\x98\xce\x47\x15\x64\x59\xbe\xa9\x09\x2d\x5d\x8d\x72\x06\xff\x6a\x58\x3c\x18\x0f\xb3\xec\xa7\x1b\xba\x0d\x3e\xed\x7b\xeb\x57\xd8\xe0\xe3\xfb\x80\x2c\xe3\x7b\xcc\x99\x86\x67\xdd\x0a\x35\x3f\x74\xa7\x02\x8e\x1f\x41\x6e\x09\x85\x54\x0a\x24\xbb\x55\x1c\x50\x19\x25\x4a\x17\x5c\x16\x25\xc1\xda\x4b\x4f\xd1\x06\xe8\x55\x1c\x30\xc2\x7b\x28\xb6\x92\x57\x51\x2e\xdb\xa2\x93\x44\xe5\x2f\x0e\x9f\x09\xe3\xf8\xd2\x1e\x49\x8d\x5f\xeb\x95\x87\x61\x8e\x91\x28\x50\x59\x5a\x2a\x45\x52\xa2\x63\x7e\x93\xe5\x44\x43\xa5\xfc\xda\xce\xf2\x9a\x91\xef\x35\xfc\xb3\x87\x68\x59\x83\xcb\xb7\x94\x5c\x2c\xcf\x78\x27\x79\x2d\x0a\x81\x64\xb3\xd6\xe7\x57\x42\x8e\x79\x55\x21\xb6\x94\x03\x9c\x23\x47\x82\xe6\x27\x61\x36\x33\xbd\xaa\x1f\xc3\x7c\x35\x8e\x66\x4d\x2b\x20\x4d\x5c\x9e\xa9\x4b\xc7\x9d\x3a\xee\xd6\x4d\x54\xe4\xb5\xc4\xa9\x5e\xda\x8c\x89\xe4\x0e\x52\xe3\x40\x96\xe5\x35\x29\xd3\xc1\xbb\x73\xc0\x15\x2f\xed\x79\xb3\xba\xda\x80\x9c\xb8\xa4\xed\x59\xd3\xdf\xeb\x95\xef\x8d\x63\x7d\x8d\x08\x03\x59\x30\x54\xc5\x74\x95\x63\x09\x25\x30\x4d\x10\x2d\x94\x00\x6c\xc1\x07\x4b\xcd\x58\x26\x4f\x8a\x9a\xb9\x84\x1d\x51\x5a\x1e\xbd\xc8\x93\x14\xe6\xc4\x4a\x10\xc0\x4a\x55\x74\x3d\x40\x6a\x80\xb3\x18\x8c\x0d\xc1\xa2\x61\xa2\x64\x73\x81\xbb\x63\xd3\x84\xee\x66\x6e\xb9\x43\x58\x28\x40\x12\xef\x2f\xa4\xe7\x15\x22\x2c\xc5\xa8\xc0\xb4\x3c\x0a\x4e\xba\x30\xf6\xee\xe2\x13\xb0\x43\x31\xae\x9b\xb3\xd5\x00\xec\x40\x24\x67\xd5\x10\xa4\xd3\x12\xa8\x41\xff\x2c\xb8\x82\xeb\x83\x63\x4f\xf1\x30\x08\x7e\x33\xfa\xf4\xda\xd6\x5e\xbe\xe5\xb2\x42\xcd\x64\x87\xb1\x4d\x1f\xb6\x86\x9a\xae\x3c\x53\x81\xa6\x0c\x4d\xe1\x8b\x68\x41\x09\x7b\x5c\x7e\x89\xc3\xb3\x96\xa8\xd8\x73\xa5\x2f\xa9\x51\xf2\x3d\x20\xaa\xf7\x78\x0f\xf8\x71\x86\xdc\x44\x59\xd4\x5c\xe9\x94\x45\x4e\x2a\xb4\x8b\x83\x04\x8e\x41\x2e\xae\xc5\xf2\x45\x95\x6f\xb0\xe5\xbb\x5d\x03\x0d\xad\xb8\x49\x6d\xdf\xbf\x8e\x55\xc5\xa5\x24\x07\x90\xa9\x25\x2e\x17\xa7\x96\xc4\x7d\x99\x92\xcd\xa3\xfd\x99\x05\xfd\x7a\xd7\xb5\x67\x33\x5e\xd5\xfe\x47\x69\xbe\x9e\xa6\xcc\x69\xd2\x74\x9f\x38\x12\xa6\xd5\xb9\x96\x55\x2a\x84\x9b\x72\x56\x82\x0a\xd8\xf5\x04\xed\x37\x3c\x8a\x49\xce\x3f\x61\x27\xe0\x49\x62\x0d\x45\xea\xb3\x13\x61\x76\x51\x87\x95\x64\xba\x68\x8b\x1d\x91\x26\x34\xbd\xd4\x69\x9e\xa6\x1b\x5f\x62\x2d\x0e\x51\x82\x14\xc4\x9d\x3d\xa8\x48\x8b\x1b\x11\x87\xcf\x89\x6b\xc2\x47\xfb\xb7\x59\xda\x00\x69\x90\x67\x7a\xeb\x16\x61\x65\x96\xa8\x94\x7a\x27\xb2\x8e\x17\xad\xaf\xd9\x59\x0a\xbb\xf0\xb6\x63\x45\x1b\x21\x4c\x07\x13\x5c\xea\x5f\xd2\x0b\x9d\xe2\xd4\x29\xe1\x77\x83\x4f\xdb\x23\xd7\xdc\x49\x44\xaf\xd3\x53\xcd\x44\x29\x0f\xda\xd3\x51\x11\xa6\x61\xd7\xb4\x32\xfe\x24\x50\x6f\x28\x51\x7b\x28\xcf\xa1\x91\x5c\x73\xcc\x69\x9a\x63\x78\x37\x68\xd2\x9d\x61\xa6\xbf\xba\xa8\x36\x13\x92\x1c\x08\x85\x9d\x23\xf1\x86\x73\x0a\x88\x59\x89\x42\x02\x2a\x0b\xce\xe8\x31\x01\xa9\x34\x92\xd1\x5d\x09\x05\xb8\x96\x44\x1f\x0b\x2e\xf4\xe2\x55\xa1\xda\x57\x85\x22\x3f\xc0\xf6\xbd\xd3\xaa\xef\x19\xad\x9d\x09\x39\x5b\xdc\xd9\xef\xad\x88\xbf\xcc\x56\x84\x3a\x2a\xac\x2f\xab\xad\x95\x2e\x09\x2b\xb8\x00\x16\xf5\x0d\xa5\xb9\x28\x76\x12\x61\x28\x04\x48\xc2\xbd\xaa\xb0\x02\x6c\x59\x4b\xd4\x8c\x3f\x65\xa3\xc8\x8e\x21\x7f\xdc\x31\xa0\xba\x12\xdb\x0b\x37\x01\xb4\x8e\x3b\x7b\x4d\x49\x45\xc2\x4e\xe3\x59\xb5\x09\xf5\x5a\x57\xab\xf9\x4b\xb4\x99\xf2\x2c\x29\x64\xcf\x74\x08\xf3\x0d\x42\x42\x67\xb0\x47\xf2\x8c\xd4\xd1\x3a\xe6\x36\x90\x9f\x7c\x7d\x83\x77\x5e\xd6\x61\x75\xcb\xef\xa6\x9f\xc8\xda\x8b\x3f\xab\xf4\x72\xa7\xb1\x0e\x56\x3f\x7e\xa7\xaa\x55\xb4\x89\x6b\x31\x4c\xcd\x35\x20\x23\x74\x7a\xea\x9a\xfd\x4f\x44\x68\xcb\x46\x2d\xdc\x63\x9b\x84\x38\xde\x8f\x94\x18\x3b\x5f\x3b\xea\x27\x57\x04\x06\x0d\xe6\x4c\x11\xa5\x81\x61\xff\xfe\xaa\x97\x68\x43\x26\x87\x17\x53\xa5\xcc\xf7\x5d\x69\x5d\x57\x8b\x42\xbb\x2e\xde\x26\x37\x3a\xe9\xbe\xda\x1f\xc8\xff\x12\x51\x18\xc7\x5c\x04\x4c\x93\x2e\xc6\x2b\x17\xb0\xce\x4e\xc7\x4c\xd9\x1a\x8a\x30\x4f\x5c\x3e\x36\xf9\xab\x24\xfe\x40\xb3\x72\x48\xce\xb8\x01\xe0\x6c\x0d\x0e\x0c\x7c\x47\xdb\x26\x34\x7a\x15\x60\xfe\x98\xbd\x07\x05\x8f\xc0\x89\x42\x1b\xe7\x18\xc3\x97\x97\x9b\x44\x22\x0f\xf1\xf2\x40\x82\x96\xc4\x39\x79\x18\x6a\x2c\xb3\x14\x00\xf5\x3e\xf7\xe7\x35\xa9\x80\xd7\xfe\xa8\xb5\x32\x17\x4e\x4f\x94\x1b\x57\x04\x22\x46\x35\x90\xae\x4d\x1f\x8c\xf3\xa6\xae\x8d\x8f\x1a\x2e\x25\xbf\x01\x2b\xdb\x93\x90\xa4\x64\x28\x41\x50\x82\x91\x8a\x15\x1c\x57\x6c\x1a\xd7\xa2\x44\x1a\x8a\xfe\x96\xc9\x39\x25\xde\x4c\x6d\x27\x90\x44\x94\x02\x25\xaa\x4a\xa9\x95\xf2\x12\x28\xf2\x26\x8b\x68\x99\xdc\x92\x6f\x11\xa1\xb5\x84\x02\xe1\x60\x54\x77\x28\x2a\xce\x88\xe6\xde\x70\x92\x36\x64\x85\x9e\x8b\x61\xd8\x16\x12\xeb\x60\xec\xe6\x3d\x75\xbf\xd7\x58\x09\x5d\xaa\x3f\xaf\x0a\x9f\x31\xd1\xa9\xa6\x0f\xac\x98\x61\xc4\x89\xe8\x12\x54\x13\x76\xc6\xed\xf8\x28\xfd\xa2\x5a\xd0\x48\xea\x42\x70\x4a\xba\xea\x62\x09\x55\x60\xce\xba\x79\xa4\xac\x9c\x2b\x97\x6a\xb3\x6e\x9a\xde\xa8\x12\x3a\xea\xd5\x2d\xc1\x13\x61\x25\x7f\x3a\x63\xc0\xe5\xb4\x2d\x28\xc2\xe0\x44\xd1\x6b\x15\xad\xb4\x44\x84\xe9\xb3\x8f\xa9\x5c\xb5\x08\x09\x5b\x90\xc0\xa6\x1e\x91\xcd\xb7\x0b\x59\xb8\x65\x88\xc9\x16\x97\xb0\x47\x28\xd1\xd4\xcd\x6f\xb0\x5b\x78\xad\xf1\xaf\xa8\xa4\x46\x77\x8f\x64\xdc\x11\x17\xad\xa1\x42\x59\x16\x8b\x3a\x7a\xe4\x55\x41\xc5\xe7\xaf\x77\x5c\x71\xc1\x39\x26\xe2\x00\x5b\xa0\xa2\x48\x3a\x23\xed\x51\x05\x17\xcb\x6f\xd2\xc4\xcf\x41\xd7\xf1\x2d\x02\x22\x50\xb5\x54\x0c\x49\x3e\x35\xce\xbd\x25\x4d\xf6\x0e\xa2\x43\xbd\x61\x81\x1e\xfc\x7d\x47\x07\xfb\x46\x46\x7b\xe1\x23\x60\xd5\x87\xb1\x5f\xb9\x19\x75\xb5\x4e\x36\x71\xf0\xb6\xc5\x72\xf3\x6f\x5b\x27\x77\x67\xd5\xd7\x63\x21\xad\x11\xde\x27\xb5\x63\x67\xd6\xe0\x57\xc4\xa1\xc9\x1e\x83\x37\x0c\xf5\xa8\xdf\x51\xe8\xff\x64\xcd\xfe\xba\xf5\xd5\x7f\x63\x11\xbd\xeb\xdf\xa2\x2e\xce\xe3\x09\x57\x35\xdf\x81\xcd\xde\xd8\x14\x93\x24\xe6\x35\x45\x8f\xfa\x6d\x8a\x57\xf5\x0a\xfb\x14\xcd\x30\xc9\x74\x97\x6c\x4e\x93\xe7\x7e\x1d\xb1\xb6\xa7\xe1\xc2\x3c\x5f\x24\xda\x75\xcd\xdc\x19\xfb\x00\x09\xec\xca\x3a\x83\xf6\x4a\x9c\x97\x7c\xc1\xb8\x7f\xf7\x61\xa6\x7a\x9b\xbb\x92\xf7\x4a\x65\xcf\x02\xf7\x17\xfc\x36\x75\x1a\xe3\x41\xbb\xd3\x8f\xae\xc2\xfe\x3f\xd0\x4f\x3e\xc1\x6a\xe4\x64\xc7\xc9\x2e\xee\x4f\xfb\xc4\xaa\xfb\x7c\x6a\x6d\xe9\xc7\x81\x74\x17\x5c\x8d\x44\xbb\x36\xf7\x0a\x82\x37\xf2\x7d\x1f\x66\xb9\xe7\x65\xc3\x07\x52\x81\x23\xfc\x95\xf9\xb7\xfd\x98\x6d\xf5\xb2\xfa\x6f\x00\x00\x00\xff\xff\x46\x95\x2c\x74\x36\x3c\x00\x00") func dataConfig_schema_v33JsonBytes() ([]byte, error) { return bindataRead( @@ -153,7 +153,7 @@ func dataConfig_schema_v33Json() (*asset, error) { return a, nil } -var _dataConfig_schema_v34Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x4f\x73\xdb\x3a\x0e\xbf\xfb\x53\x68\xf4\xde\xad\x76\xd2\x99\xed\xec\xcc\xf6\xb6\xc7\x3d\xed\x9e\x37\xe3\x6a\x68\x0a\xb6\xd9\x50\x24\x0b\x52\x4e\xdc\x4e\xbe\xfb\x8e\xfe\x9a\x92\x28\x91\xb2\x95\x26\xdd\xd7\x53\x62\x09\x00\x09\x10\xf8\x01\x20\xa9\x1f\xab\x28\x8a\xff\xd4\xf4\x08\x19\x89\x3f\x47\xf1\xd1\x18\xf5\xf9\xfe\xfe\xab\x96\x62\x53\x3d\xbd\x93\x78\xb8\x4f\x91\xec\xcd\xe6\xe3\xa7\xfb\xea\xd9\x1f\xf1\xba\xe0\x63\x69\xc1\x42\xa5\xd8\xb3\x43\x52\xbd\x49\x4e\x7f\xbb\xfb\x74\x57\xb0\x57\x24\xe6\xac\xa0\x20\x92\xbb\xaf\x40\x4d\xf5\x0c\xe1\x5b\xce\x10\x0a\xe6\x87\xf8\x04\xa8\x99\x14\xf1\x76\xbd\x2a\xde\x29\x94\x0a\xd0\x30\xd0\xf1\xe7\xa8\x98\x5c\x14\xb5\x24\xcd\x03\x4b\xac\x36\xc8\xc4\x21\x2e\x1f\xbf\x94\x12\xa2\x28\xd6\x80\x27\x46\x2d\x09\xed\x54\xff\xb8\xbf\xc8\xbf\x6f\xc9\xd6\x7d\xa9\xd6\x64\xcb\xe7\x8a\x18\x03\x28\xfe\x33\x9c\x5b\xf9\xfa\xcb\x03\xd9\x7c\xff\xe7\xe6\xbf\x1f\x37\xff\xb8\x4b\x36\xdb\x0f\x7f\x76\x5e\x17\xf6\x45\xd8\x57\xc3\xa7\xb0\x67\x82\x19\x26\x45\x3b\x7e\xdc\x52\xbe\xd4\xff\xbd\xb4\x03\x93\x34\x2d\x89\x09\xef\x8c\xbd\x27\x5c\x43\x57\x67\x01\xe6\x49\xe2\xa3\x4f\xe7\x96\xec\x8d\x74\xae\xc7\x77\xe8\xdc\x55\xe7\x24\x79\x9e\x79\x57\xb0\xa1\x7a\x23\x65\xaa\xe1\x97\x59\x3f\x0d\x14\xc1\xf8\x5d\xb6\xa2\x7a\x33\x8f\x2d\x86\x5f\x46\xe1\x0a\x35\x7c\x0a\x37\x54\x6f\xa4\x70\x35\xfc\x6d\x0a\xaf\x1a\xa5\xdd\x73\x8c\xbf\x3c\x6f\x8a\xbf\x2f\xa5\xcc\x49\x79\x95\x14\x6b\x7e\xa5\x12\x1d\xcc\x73\x99\xd3\x85\x39\xe3\xf6\x6c\x0d\x3a\x62\xc9\x14\x14\x97\xe7\x72\xe6\x6e\x9b\x55\x04\x19\x08\x13\xb7\x66\x8a\xa2\x78\x97\x33\x9e\xf6\xad\x2e\x05\xfc\xbb\x10\xf1\x60\x3d\x8c\xa2\x1f\x7d\x78\xb7\xe4\x94\xef\x3b\xbf\xc6\x9d\xa2\x7d\x3f\xa2\x4b\xfb\x9e\x4a\x61\xe0\xd9\x94\x4a\x4d\x0f\x5d\x99\x40\xd2\x47\xc0\x3d\xe3\x10\xca\x41\xb0\xf2\xf4\x11\x93\x71\xa6\x4d\x22\x31\x49\x19\x35\x4e\x7e\x4e\x76\xc0\x6f\x92\x40\x09\x3d\x42\xb2\x47\x99\x79\xa5\xec\x93\x4a\x13\xed\x14\xd4\x20\x78\xa0\xe6\x86\xe0\x01\xdc\x96\xed\x11\x0f\xb8\xfd\xb1\xd5\xb2\x5a\xbf\xb6\x2b\x87\xc0\x98\x12\x95\x90\x34\xed\xcc\x83\x20\x92\x73\xbc\x8e\x62\x66\x20\xd3\x6e\x85\xa2\x38\x17\xec\x5b\x0e\xff\xaa\x49\x0c\xe6\xd0\x97\x9b\xa2\x54\xcb\x0b\x3e\xa0\xcc\x55\xa2\x08\x16\x81\x34\x6d\xec\x98\xca\x2c\x23\x62\xa9\xe8\x9a\xa3\x47\x80\xe5\x07\x38\x1f\xd9\x21\x5b\x8f\x61\xbf\x6a\x47\xeb\x4c\x6b\x44\x1b\xbf\x3e\x43\xbc\xf0\x23\x86\x1f\x33\x0a\xc8\x95\x39\xd2\x50\x08\x98\x0e\x05\x27\x7d\xce\xd2\x70\xe2\xc3\x1c\xe2\x4c\xa6\xdd\x79\x8b\x3c\xdb\x01\x0e\x42\xb2\x1b\x59\xc3\xdf\xdb\x95\xeb\x4d\x6f\xf5\x0d\x61\x02\x30\x11\x24\xf3\xd9\x2a\xa6\x08\x29\x08\xc3\x08\x4f\xb4\x02\xda\x21\x6f\x56\x6a\x62\x65\xe2\x20\x48\x8e\x11\x0e\x4c\x1b\x3c\x4f\x83\xd2\x8b\x3d\xb1\x14\x14\x88\x54\x27\x55\x13\x32\x1f\x3d\xe3\x14\xda\x8e\x64\x51\x98\x48\xc5\x54\x56\xa8\xc4\x14\x79\xa1\x98\x5b\xdc\x63\x4c\x34\x10\xa4\xc7\x2b\xf9\x65\x46\x98\x08\x59\x54\x10\x06\xcf\x4a\xb2\x0a\xc6\xde\x1d\x3e\x81\x38\x25\xad\xdf\xcc\x36\x03\x88\x13\x43\x29\xb2\x06\xa4\xc3\xb2\xb3\xc5\xff\xac\xa4\x86\xdb\xc1\xb1\xe6\x78\x68\x14\x5f\xb7\x31\xbd\xed\x5a\x2f\xde\x4b\xcc\x48\x31\xd9\x66\x6c\x3b\x86\x3b\x43\x0d\x3d\xcf\x36\xa0\xad\x43\x51\xd5\x12\x9e\x70\x26\x1e\x97\x77\x71\x78\x36\x48\x92\xa3\xd4\xe6\x9a\x02\x28\x3e\x02\xe1\xe6\x48\x8f\x40\x1f\x27\xd8\x6d\xaa\x0e\xb7\xd4\x26\xc4\xc9\x59\x46\x0e\x7e\x22\x45\x7d\x24\x57\x17\x7a\xf1\xa2\xc6\xb7\xc4\xca\xc3\xa1\x20\x1d\xf3\xb8\x41\xe3\x50\xbf\xf6\x95\xdc\x29\xb2\x13\x60\x68\x15\x29\xd5\xa5\xdf\xe9\xbf\x0c\xc9\xe6\xde\x06\xb1\x43\xfa\xe5\xae\xea\x0f\x27\xa2\xaa\xfc\x8f\xf3\x78\x3b\x4c\x99\xc3\xa4\xd9\x7f\xd2\xd3\x30\xac\xce\xed\xac\x4a\x46\x68\x51\xce\x22\xe8\x91\x75\xbd\x90\xd6\xf5\x7a\x32\xc8\xf9\x17\xda\x01\xf1\x20\xb1\x8e\x21\xf5\x55\x6d\xc4\xfc\xf6\x2d\x68\xe9\xbc\x3d\xbe\x47\x9b\xb1\xe9\x85\x4e\xf3\x32\x5d\xbf\x8b\x95\x74\x84\x33\xa2\xc1\x1f\xec\x93\xfd\x58\x2b\x8d\xa9\xd3\xa7\x40\x9f\x70\xf1\xfe\x7d\x92\x77\x84\x75\x54\x66\x78\xeb\xe6\x11\x65\x97\xa8\x9c\x3b\x27\xb2\xf5\x17\xad\xaf\xd9\x59\xaa\x6e\xe1\xdd\xc5\x8a\x12\x21\xec\x00\x53\x12\xcd\x4f\xe9\x85\x2e\x38\x75\x49\xf8\xd5\xe0\xc3\xf6\xa8\xbf\xdc\x41\x4c\xaf\xd3\x53\x4d\xa0\x94\x83\xda\xd1\x51\x31\x61\xe0\x50\xb4\x32\xee\x24\x90\xef\x38\xd3\x47\x48\xe7\xf0\xa0\x34\x92\x4a\x1e\x16\x18\xce\xdd\x9f\xf0\x60\x98\xe8\xaf\xae\xaa\xcd\x14\xb2\x13\xe3\x70\xe8\x69\xbc\x93\x92\x03\x11\x9d\x44\x81\x40\xd2\x44\x0a\x7e\x0e\xa0\xd4\x86\xa0\x77\x57\x42\x03\xcd\x91\x99\x73\x22\x95\x59\xbc\x2a\xd4\xc7\x2c\xd1\xec\x3b\x74\x63\xef\xe2\xf5\xb5\xa0\x6d\x6f\x42\xbd\x3d\xf6\xe8\xf7\x56\xc4\x5f\x66\x2b\x42\x9f\x35\x35\xd7\xd5\xd6\xda\xa4\x4c\x24\x52\x81\xf0\xc6\x86\x36\x52\x25\x07\x24\x14\x12\x05\xc8\xa4\xd3\x14\x1d\x80\x4d\x73\x24\xc5\xf8\x43\x31\x9a\x1d\x04\x71\xe3\x8e\x45\x6a\x32\xb5\xbf\x72\x13\xc0\x18\x7f\xb0\xe7\x9c\x65\x6c\x3c\x68\x1c\x5e\x1b\x50\xaf\x55\xb5\x9a\xbb\x44\x9b\x28\xcf\x82\x20\x7b\xa2\x43\x98\x6e\x10\x02\x3a\x83\x23\xc1\x19\xa9\xa3\x0c\xcc\xfd\x48\x7e\x72\xf5\x0d\xce\x79\x75\x4e\xcb\x4b\x79\xeb\x7a\x22\x5b\x27\xfd\xac\xd2\xab\x3f\x8d\xed\x68\xf5\xe3\x0e\xaa\x5c\x7b\x9b\xb8\x92\x46\xe8\xa9\x06\xa4\x25\x1d\x1e\xfb\x46\xbf\x04\x42\x77\xd6\xa8\x24\x77\xac\x4d\x00\x8e\xd7\x23\x05\x62\xe7\x6b\xa3\x7e\x70\x45\x60\xf1\x50\x29\x34\xd3\x06\x04\x75\xef\xaf\x3a\x99\x76\x6c\x70\x78\x31\x34\xca\x74\xdf\x15\xd6\x75\x95\x54\xe4\x50\xe1\x6d\x70\xa3\x13\x1e\xab\xf5\x8d\x80\x9f\xa2\x8a\x90\x54\xaa\x91\xa5\x09\x57\x63\x6e\x9a\xed\x6d\x5d\x4c\xd4\xa1\x63\x90\xf1\x24\xf1\xb1\x48\x48\x29\x73\x23\xc7\xaa\xc7\x32\xe3\x4e\x41\x6f\xaf\xaf\x11\xe0\x3a\x08\xb7\x49\xbd\x97\x0b\xa6\x0f\xe5\x6b\xa2\xd1\x03\x73\xa6\xc9\xae\x77\x2e\xe1\x4a\xb4\x45\x66\xc0\x93\x3b\xdf\xfb\x0b\x06\x04\x83\xac\x77\xc0\xd0\x94\x52\x76\xc6\x07\xfd\x3e\xb7\xe1\x0d\xcb\x40\xe6\x4e\x70\x0a\xa9\x96\x08\x9a\xf9\xf5\xd6\xca\x76\xd3\x5a\x5e\x6c\x5d\x5f\xf0\xb8\x90\x45\xd9\xf7\xa0\x07\xeb\xb8\xaa\xda\x05\xf0\xba\x49\x48\x7a\x04\x91\x96\x07\x29\x41\xb9\x14\x41\x71\x46\x89\xf6\xd5\x2b\x37\xec\x39\xe7\x2a\x25\x06\x92\xfa\x96\xcc\x9c\x0a\x71\xa2\x34\x54\x04\x09\xe7\xc0\x99\xce\x42\x4a\xad\x38\x05\x4e\x9c\xb9\xc6\xeb\x37\x25\xfb\x9e\x30\x9e\x23\x24\x84\x8e\x26\x85\x1e\x47\x26\x05\x33\xd2\x09\x5e\x61\x43\x66\xe4\x39\x69\x86\x2d\x49\x3c\x51\x5b\x32\x49\x4c\xdd\xa5\xd6\xba\xf0\x8b\x3c\x73\x14\x3b\x55\x5c\x6c\xf6\x0c\xb5\xa9\x7a\x62\xa9\xea\x5f\x5d\x50\x7f\x19\xdd\x67\x08\xdd\x9a\xb6\xbc\xae\xaa\x4a\xe6\x35\x0c\x13\xee\x70\x69\x3f\x46\xbc\xb3\x19\x71\x60\x31\x04\x5d\x00\x6a\x7b\x72\xe0\xe5\x5f\xd4\x0a\x15\x24\x49\xce\xaa\x42\x68\x09\x53\x50\x29\xaa\x79\x84\x78\xe9\x8d\x61\x51\xf8\x68\xd1\xc6\x65\xca\x78\x11\xa4\x64\x78\x62\x22\x95\x4f\xf3\xd1\x77\x01\x6b\x2b\x4e\x28\xf4\x10\xfb\x56\x43\x6b\x83\x84\x09\x33\xfb\x44\xad\x6f\x16\x85\xb0\x07\x04\x31\x8c\x88\x68\xba\xb3\x89\xc6\xbb\x1b\x9f\x6e\x7e\x0d\x6b\x0a\xad\x8a\x12\xff\x0d\x36\x36\x6f\x5d\xfc\x1b\x6a\xc4\x36\xdc\x3d\xd9\xbd\xa5\xf3\x56\x87\x63\x19\x9d\xaa\xdc\x7b\x3a\x97\x41\x26\xa7\x6f\xa2\xdc\x70\x19\xdc\xa7\x62\x43\xb6\x40\xf5\x12\x74\x9c\x5b\x53\x25\x52\x2d\xbf\x9f\xe4\x3f\xb2\xdd\xfa\x77\x33\x98\x22\xd9\x52\x18\x12\x7c\xc0\x1d\x3b\xcb\xa7\xe8\x1d\xa0\x43\xbe\x13\x61\x57\x37\xdf\x19\x3a\x74\x2f\x8f\x94\x77\x53\x46\x56\xf5\xa1\xed\xc4\xd6\xad\xad\xb6\xc1\x4b\x3c\x7a\x31\x64\xb9\xf9\x97\x4d\x61\x7f\x13\xd8\xd5\x3d\x12\x63\x08\x3d\x06\x35\x9a\x33\xeb\xfd\x1b\x70\x68\xb0\x1d\xe2\x84\xa1\x9a\x6a\x01\x14\x0a\xb9\xa9\xf3\xff\x81\x54\xbf\xba\x5f\xff\x3c\x1f\xac\xbf\x59\xf1\x7e\x17\x51\x52\x5d\x9d\xeb\x03\x6e\x9e\xbe\x83\x35\x7b\xe3\xa5\x18\x24\x3a\xe7\x52\xd4\x54\xbf\x97\xe2\x55\xa3\xa2\x7b\x28\x68\x2d\xc9\x70\x37\x70\xca\x92\xc1\x37\x97\x6a\x8e\x6d\x77\x1a\x7d\x32\xc7\x17\x9e\xdd\xda\x67\xea\xca\x40\x43\x32\xb2\x27\xdd\x1b\xb4\x36\xe2\xb4\xe6\x0b\xe2\xfe\xdd\x87\x89\x0a\x6f\xea\x86\xe1\x2b\x95\x46\x0b\x5c\xc7\x70\xaf\x69\xaf\x79\x6e\xac\x3b\xfc\x40\x6d\x3c\xfe\x1b\xfe\xc1\xe7\x6a\x85\x9e\xe2\x3c\xd8\xad\xfe\xd1\x3d\x80\xab\x3e\x35\xdb\x76\xec\xd3\x23\xa9\xee\xeb\x5a\x89\x76\x6b\xef\x27\x8c\x7e\x60\xe0\xfa\x88\xad\x7f\xfc\xd7\x7c\x4c\x36\x72\x23\x61\x65\xff\x2d\x3f\x0e\x5c\xbd\xac\xfe\x17\x00\x00\xff\xff\xf4\xc7\x3d\x6c\x86\x3d\x00\x00") +var _dataConfig_schema_v34Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x41\x73\xeb\xb8\x0d\xbe\xfb\x57\x68\xb4\x7b\x5b\x3b\xd9\x99\xbe\xe9\x4c\xdf\xad\xc7\x9e\xda\x73\x33\x7e\x1a\x9a\x82\x6d\x6e\x28\x92\x0b\x52\x7e\xf1\xbe\xc9\x7f\xef\x48\x94\x64\x4a\xa2\x44\xda\x56\x5e\xb2\xdd\x77\x4a\x2c\x01\x20\x01\x02\x1f\x00\x92\xfa\xb6\x4a\x92\xf4\x67\x4d\x8f\x50\x90\xf4\x73\x92\x1e\x8d\x51\x9f\x1f\x1f\x7f\xd3\x52\x6c\xec\xd3\x07\x89\x87\xc7\x1c\xc9\xde\x6c\x7e\xfd\xf4\x68\x9f\xfd\x94\xae\x2b\x3e\x96\x57\x2c\x54\x8a\x3d\x3b\x64\xf6\x4d\x76\xfa\xdb\xc3\xa7\x87\x8a\xdd\x92\x98\xb3\x82\x8a\x48\xee\x7e\x03\x6a\xec\x33\x84\xdf\x4b\x86\x50\x31\x3f\xa5\x27\x40\xcd\xa4\x48\xb7\xeb\x55\xf5\x4e\xa1\x54\x80\x86\x81\x4e\x3f\x27\xd5\xe4\x92\xa4\x23\x69\x1f\x38\x62\xb5\x41\x26\x0e\x69\xfd\xf8\xb5\x96\x90\x24\xa9\x06\x3c\x31\xea\x48\xe8\xa6\xfa\xd3\xe3\x45\xfe\x63\x47\xb6\x1e\x4a\x75\x26\x5b\x3f\x57\xc4\x18\x40\xf1\x9f\xf1\xdc\xea\xd7\x5f\x9e\xc8\xe6\x8f\x7f\x6e\xfe\xfb\xeb\xe6\x1f\x0f\xd9\x66\xfb\xcb\xcf\xbd\xd7\x95\x7d\x11\xf6\x76\xf8\x1c\xf6\x4c\x30\xc3\xa4\xe8\xc6\x4f\x3b\xca\xd7\xe6\xbf\xd7\x6e\x60\x92\xe7\x35\x31\xe1\xbd\xb1\xf7\x84\x6b\xe8\xeb\x2c\xc0\x7c\x95\xf8\x1c\xd2\xb9\x23\x7b\x27\x9d\x9b\xf1\x3d\x3a\xf7\xd5\x39\x49\x5e\x16\xc1\x15\x6c\xa9\xde\x49\x19\x3b\xfc\x32\xeb\xa7\x81\x22\x98\xb0\xcb\x5a\xaa\x77\xf3\xd8\x6a\xf8\x65\x14\xb6\xa8\x11\x52\xb8\xa5\x7a\x27\x85\xed\xf0\xf7\x29\xbc\x6a\x95\xf6\xcf\x31\xfd\xf2\xb2\xa9\xfe\xbe\xd6\x32\x67\xe5\x59\x29\xce\xfc\x6a\x25\x7a\x98\xe7\x33\xa7\x0f\x73\xa6\xed\xd9\x19\x74\xc2\x92\x39\x28\x2e\xcf\xf5\xcc\xfd\x36\xb3\x04\x05\x08\x93\x76\x66\x4a\x92\x74\x57\x32\x9e\x0f\xad\x2e\x05\xfc\xbb\x12\xf1\xe4\x3c\x4c\x92\x6f\x43\x78\x77\xe4\xd4\xef\x7b\xbf\xa6\x9d\xa2\x7b\x3f\xa1\x4b\xf7\x9e\x4a\x61\xe0\xc5\xd4\x4a\xcd\x0f\x6d\x4d\x20\xe9\x33\xe0\x9e\x71\x88\xe5\x20\x68\x3d\x7d\xc2\x64\x9c\x69\x93\x49\xcc\x72\x46\x8d\x97\x9f\x93\x1d\xf0\xbb\x24\x50\x42\x8f\x90\xed\x51\x16\x41\x29\xfb\xcc\x6a\xa2\xbd\x82\x5a\x04\x8f\xd4\xdc\x10\x3c\x80\xdf\xb2\x03\xe2\x11\x77\x38\xb6\x3a\x56\xe7\xd7\x76\xe5\x11\x98\x52\xa2\x32\x92\xe7\xbd\x79\x10\x44\x72\x4e\xd7\x49\xca\x0c\x14\xda\xaf\x50\x92\x96\x82\xfd\x5e\xc2\xbf\x1a\x12\x83\x25\x0c\xe5\xe6\x28\xd5\xf2\x82\x0f\x28\x4b\x95\x29\x82\x55\x20\xcd\x1b\x3b\xa5\xb2\x28\x88\x58\x2a\xba\xae\xd1\x23\xc2\xf2\x23\x9c\x4f\xdc\x90\x6d\xc6\x70\x5f\x75\xa3\xf5\xa6\x35\xa1\x4d\x58\x9f\x31\x5e\x84\x11\x23\x8c\x19\x15\xe4\xca\x12\x69\x2c\x04\xcc\x87\x82\x97\xbe\x64\x79\x3c\xf1\xe1\x1a\xe2\x42\xe6\xfd\x79\x8b\xb2\xd8\x01\x8e\x42\xb2\x1f\x59\xe3\xdf\xdb\x95\xef\xcd\x60\xf5\x0d\x61\x02\x30\x13\xa4\x08\xd9\x2a\xa5\x08\x39\x08\xc3\x08\xcf\xb4\x02\xda\x23\x6f\x57\x6a\x66\x65\xd2\x28\x48\x4e\x11\x0e\x4c\x1b\x3c\xcf\x83\xd2\xab\x3b\xb1\x1c\x14\x88\x5c\x67\xb6\x09\xb9\x1e\x3d\xd3\x1c\xba\x8e\x64\x51\x98\xc8\xc5\x5c\x56\xb0\x62\xaa\xbc\x50\xcd\x2d\x1d\x30\x66\x1a\x08\xd2\xe3\x8d\xfc\xb2\x20\x4c\xc4\x2c\x2a\x08\x83\x67\x25\x99\x85\xb1\x0f\x87\x4f\x20\x4e\x59\xe7\x37\x57\x9b\x01\xc4\x89\xa1\x14\x45\x0b\xd2\x71\xd9\xd9\xe1\x7f\x51\x52\xc3\xfd\xe0\xd8\x70\x3c\xb5\x8a\xaf\xbb\x98\xde\xf6\xad\x97\xee\x25\x16\xa4\x9a\x6c\x3b\xb6\x1b\xc3\xbd\xa1\xc6\x9e\xe7\x1a\xd0\xd5\xa1\xaa\x6a\x09\xcf\x38\x13\xcf\xcb\xbb\x38\xbc\x18\x24\xd9\x51\x6a\x73\x4b\x01\x94\x1e\x81\x70\x73\xa4\x47\xa0\xcf\x33\xec\x2e\x55\x8f\x5b\x6a\x13\xe3\xe4\xac\x20\x87\x30\x91\xa2\x21\x92\x9b\x0b\xbd\x74\x51\xe3\x3b\x62\xe5\xe1\x50\x91\x4e\x79\xdc\xa8\x71\x68\x5e\x87\x4a\xee\x1c\xd9\x09\x30\xb6\x8a\x94\xea\xd2\xef\x0c\x5f\xc6\x64\xf3\x60\x83\xd8\x23\xfd\xf2\x60\xfb\xc3\x99\xa8\xaa\xff\xe3\x3c\xdd\x8e\x53\xe6\x38\x69\x0e\x9f\x0c\x34\x8c\xab\x73\x7b\xab\x52\x10\x5a\x95\xb3\x08\x7a\x62\x5d\x2f\xa4\x4d\xbd\x9e\x8d\x72\xfe\x85\x76\x44\x3c\x4a\xac\x53\x48\x7d\x53\x1b\x71\x7d\xfb\x16\xb5\x74\xc1\x1e\x3f\xa0\xcd\xd4\xf4\x62\xa7\x79\x99\x6e\xd8\xc5\x6a\x3a\xc2\x19\xd1\x10\x0e\xf6\xd9\x7e\xac\x93\xc6\xd4\xe9\x53\xa4\x4f\xf8\x78\xff\x3e\xcb\x3b\xc1\x3a\x29\x33\xbe\x75\x0b\x88\x72\x4b\x54\xce\xbd\x13\xd9\x86\x8b\xd6\xb7\xec\x2c\x55\xbf\xf0\xee\x63\x45\x8d\x10\x6e\x80\x29\x89\xe6\xbb\xf4\x42\x17\x9c\xba\x24\x7c\x3b\xf8\xb8\x3d\x1a\x2e\x77\x14\xd3\xdb\xf4\x54\x33\x28\xe5\xa1\xf6\x74\x54\x4c\x18\x38\x54\xad\x8c\x3f\x09\x94\x3b\xce\xf4\x11\xf2\x6b\x78\x50\x1a\x49\x25\x8f\x0b\x0c\xef\xee\x4f\x7c\x30\xcc\xf4\x57\x37\xd5\x66\x0a\xd9\x89\x71\x38\x0c\x34\xde\x49\xc9\x81\x88\x5e\xa2\x40\x20\x79\x26\x05\x3f\x47\x50\x6a\x43\x30\xb8\x2b\xa1\x81\x96\xc8\xcc\x39\x93\xca\x2c\x5e\x15\xea\x63\x91\x69\xf6\x07\xf4\x63\xef\xe2\xf5\x8d\xa0\xed\x60\x42\x83\x3d\xf6\xe4\xc7\x56\xc4\x5f\x66\x2b\x42\x9f\x35\x35\xb7\xd5\xd6\xda\xe4\x4c\x64\x52\x81\x08\xc6\x86\x36\x52\x65\x07\x24\x14\x32\x05\xc8\xa4\xd7\x14\x3d\x80\xcd\x4b\x24\xd5\xf8\x63\x31\x9a\x1d\x04\xf1\xe3\x8e\x43\x6a\x0a\xb5\xbf\x71\x13\xc0\x98\x70\xb0\x97\x9c\x15\x6c\x3a\x68\x3c\x5e\x1b\x51\xaf\xd9\x5a\xcd\x5f\xa2\xcd\x94\x67\x51\x90\x3d\xd3\x21\xcc\x37\x08\x11\x9d\xc1\x91\xe0\x15\xa9\xa3\x0e\xcc\xfd\x44\x7e\xf2\xf5\x0d\xde\x79\xf5\x4e\xcb\x6b\x79\xeb\x66\x22\x5b\x2f\xfd\x55\xa5\xd7\x70\x1a\xdb\xc9\xea\xc7\x1f\x54\xa5\x0e\x36\x71\x35\x8d\xd0\x73\x0d\x48\x47\x3a\x3e\xf6\x4d\xfe\x14\x08\xdd\x5b\xa3\x9a\xdc\xb3\x36\x11\x38\xde\x8c\x14\x89\x9d\x6f\x8d\xfa\xd1\x15\x81\xc3\x43\xa5\xd0\x4c\x1b\x10\xd4\xbf\xbf\xea\x65\xda\xb1\xd1\xe1\xc5\xd8\x28\xf3\x7d\x57\x5c\xd7\x55\x53\x91\x83\xc5\xdb\xe8\x46\x27\x3e\x56\x9b\x1b\x01\xdf\x45\x15\x21\xa9\x54\x13\x4b\x13\xaf\xc6\x1b\x17\xb0\x83\x9d\x8e\x99\xb2\x75\x0a\x61\xbe\x4a\x7c\xae\xf2\x57\xce\xfc\x40\xb3\x1a\xb0\x5c\x71\x05\x61\xb0\x35\xd8\x0a\xf0\x9d\x9b\xbb\xa4\xc1\xbb\x08\xf3\x67\xf8\x0d\xd1\xe4\xf9\x3a\xd3\x64\x37\x38\xc6\xf0\xe5\xe5\x2a\x91\xe0\xc9\x5f\x1e\x84\xeb\x0b\x04\x83\x6c\x70\x1e\xd1\x56\x5e\x6e\x81\x00\xfa\x63\xee\xda\x1b\x56\x80\x2c\xbd\x58\x16\x53\x5c\x11\x34\xd7\x97\x67\x2b\xd7\x4d\x1b\x79\xa9\x73\xdb\x21\xe0\x42\x0e\xe5\xd0\x83\x9e\x9c\xd3\x2d\xbb\x69\x10\x74\x93\x98\x6c\x0a\x22\xaf\xcf\x5d\xa2\x52\x2f\x82\xe2\x8c\x12\x1d\x2a\x6f\xee\xd8\xa2\x2e\x55\x4e\x0c\x64\xcd\xa5\x9a\x6b\x0a\xca\x99\x4a\x52\x11\x24\x9c\x03\x67\xba\x88\xa9\xcc\xd2\x1c\x38\xf1\xa6\xa6\xa0\xdf\xd4\xec\x7b\xc2\x78\x89\x90\x11\x3a\x99\x43\x06\x1c\x85\x14\xcc\x48\x2f\x78\xc5\x0d\x59\x90\x97\xac\x1d\xb6\x26\x09\x44\x6d\xcd\x24\x31\xf7\x57\x66\xeb\xca\x2f\xca\xc2\x53\x1b\xd9\xb8\xd8\xec\x19\x6a\x63\x5b\x68\xa9\x9a\x5f\x7d\x50\x7f\x9d\xdc\x96\x88\xdd\xc9\x76\xbc\xce\x16\x31\xd7\xf5\x17\x33\xee\x70\xe9\x56\x26\xbc\xb3\x1d\x71\x64\x31\x04\x5d\x01\x6a\x77\xd0\x10\xe4\x5f\xd4\x0a\x16\x92\x24\x67\xb6\x6e\x5a\xc2\x14\x54\x0a\x3b\x8f\x18\x2f\xbd\x33\x2c\x2a\x1f\xad\xba\xbe\x42\x99\x20\x82\xd4\x0c\x5f\x99\xc8\xe5\xd7\xeb\xd1\x77\x01\x6b\x2b\x4e\x28\x0c\x10\xfb\x5e\x43\x6b\x83\x84\x09\x73\xf5\x01\xdc\xd0\x2c\x0a\x61\x0f\x08\x62\x1c\x11\xc9\x7c\x23\x94\x4c\x37\x43\x21\xdd\xc2\x1a\x36\x14\x5a\x55\x1d\xc1\x3b\xec\x83\xde\xbb\xf8\x77\xd4\x88\x5d\xb8\x07\xb2\x7b\x47\x17\xac\x0e\xa7\x32\x3a\x55\x65\xf0\x30\xaf\x80\x42\xce\x5f\x5c\xb9\xe3\xee\x78\x48\xc5\x96\x6c\x81\xea\x25\xea\xf4\xb7\xa1\xca\xa4\x5a\x7e\xfb\x29\x7c\xc2\xbb\x0d\x6f\x7e\x30\x45\x8a\xa5\x30\x24\xfa\x3c\x3c\xf5\x96\x4f\xc9\x07\x40\x87\x72\x27\xe2\x6e\x7a\x7e\x30\x74\x70\x2b\xe6\xe6\x2a\xcb\xc4\xaa\x3e\x75\x9d\xd8\xba\xb3\xd5\x36\x7a\x89\x27\xef\x91\x2c\x37\xff\xba\x29\x1c\xee\x19\xfb\xba\x47\x62\x0c\xa1\xc7\xa8\x46\xf3\xca\x7a\xff\x0e\x1c\x1a\xed\x9e\x78\x61\xa8\xa1\x5a\x00\x85\x62\x2e\xf6\xfc\x7f\x20\xd5\x9f\xdd\xaf\xbf\x9f\x0f\x36\x9f\xb8\x04\x3f\xa3\xa8\xa9\x6e\xce\xf5\x11\x17\x55\x3f\xc0\x9a\xbd\xf3\x52\x8c\x12\x9d\x77\x29\x1a\xaa\x1f\x4b\xf1\xa6\x51\xd1\x3f\x43\x74\x96\x64\xbc\x1b\x38\x67\xc9\xe8\x8b\x4e\x0d\xc7\xb6\x3f\x8d\x21\x99\xe7\x83\xd0\x7e\xed\x33\x77\xc3\xa0\x25\x99\xd8\x93\x1e\x0c\xda\x18\x71\x5e\xf3\x05\x71\xff\xe1\x97\x99\x0a\x6f\xee\x42\xe2\x1b\x95\x46\x0b\xdc\xde\xf0\xaf\xe9\xa0\x79\x6e\xad\x3b\xfe\x9e\x6d\x3a\xfe\x5b\xfe\xd1\xd7\x6d\x95\x9e\xe2\x3c\xda\xad\xfe\xd6\x3f\xaf\xb3\x5f\xa6\x6d\x7b\xf6\x19\x90\xd8\xeb\xbd\x4e\xa2\xdd\xba\xfb\x09\x93\xdf\x23\xf8\xbe\x79\x1b\x9e\x16\xb6\xdf\x9e\x4d\x5c\x60\x58\xb9\x7f\xeb\x6f\x09\x57\xaf\xab\xff\x05\x00\x00\xff\xff\x49\xe6\x45\x51\xb5\x3d\x00\x00") func dataConfig_schema_v34JsonBytes() ([]byte, error) { return bindataRead( @@ -173,7 +173,7 @@ func dataConfig_schema_v34Json() (*asset, error) { return a, nil } -var _dataConfig_schema_v35Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1b\xc9\x72\xec\xb6\xf1\x3e\x5f\xc1\x82\x7d\xb3\x16\x57\xc5\x49\x55\xde\x2d\xc7\x9c\x92\x73\x54\xf3\x58\x18\xb0\x87\x03\x0b\x04\x60\x00\x1c\x69\xfc\x4a\xff\x9e\xe2\x2a\x90\xc4\x46\x0d\xf5\x24\x27\x3e\x49\x43\x76\x37\x7a\x43\x6f\x00\xbf\xed\xb2\x0c\xfd\xa8\xc9\x09\x2a\x8c\xbe\x64\xe8\x64\x8c\xfc\x72\x7f\xff\xab\x16\xfc\xb6\x7b\x7a\x27\x54\x79\x5f\x28\x7c\x34\xb7\x3f\xff\x72\xdf\x3d\xfb\x01\xdd\x34\x78\xb4\x68\x50\x88\xe0\x47\x5a\xe6\xdd\x9b\xfc\xfc\x97\xbb\xbf\xde\x35\xe8\x1d\x88\xb9\x48\x68\x80\xc4\xe1\x57\x20\xa6\x7b\xa6\xe0\xb7\x9a\x2a\x68\x90\x1f\xd0\x19\x94\xa6\x82\xa3\xfd\xcd\xae\x79\x27\x95\x90\xa0\x0c\x05\x8d\xbe\x64\x0d\x73\x59\x36\x82\x0c\x0f\x2c\xb2\xda\x28\xca\x4b\xd4\x3e\x7e\x69\x29\x64\x19\xd2\xa0\xce\x94\x58\x14\x46\x56\x7f\xb8\x7f\xa5\x7f\x3f\x82\xdd\xcc\xa9\x5a\xcc\xb6\xcf\x25\x36\x06\x14\xff\xf7\x92\xb7\xf6\xf5\xd7\x07\x7c\xfb\xfb\x3f\x6e\xff\xf3\xf3\xed\xdf\xef\xf2\xdb\xfd\x4f\x3f\x4e\x5e\x37\xfa\x55\x70\xec\x96\x2f\xe0\x48\x39\x35\x54\xf0\x71\x7d\x34\x42\xbe\xf4\xff\xbd\x8c\x0b\xe3\xa2\x68\x81\x31\x9b\xac\x7d\xc4\x4c\xc3\x54\x66\x0e\xe6\x49\xa8\xc7\x98\xcc\x23\xd8\x07\xc9\xdc\xaf\xef\x90\x79\x2a\xce\x59\xb0\xba\x8a\x5a\x70\x80\xfa\x20\x61\xba\xe5\xb7\xb1\x9f\x06\xa2\xc0\xc4\x5d\xb6\x83\xfa\x30\x8f\x6d\x96\xdf\x46\xe0\x2e\x6a\xc4\x04\x1e\xa0\x3e\x48\xe0\x6e\xf9\xeb\x04\xde\x0d\x42\xbb\x79\x44\x5f\x9f\x6f\x9b\xbf\x2f\x2d\xcd\x20\xbd\x8e\x8a\xc5\x5f\x2b\xc4\x24\xe6\xb9\xd4\xe9\x8a\x39\x7e\x7d\x8e\x0a\xf5\x68\xb2\x00\xc9\xc4\xa5\xe5\xdc\xad\xb3\x0e\xa0\x02\x6e\xd0\xa8\xa6\x2c\x43\x87\x9a\xb2\x62\xae\x75\xc1\xe1\x5f\x0d\x89\x07\xeb\x61\x96\x7d\x9b\x87\x77\x8b\x4e\xfb\x7e\xf2\xcb\xef\x14\xe3\x7b\x8f\x2c\xe3\x7b\x22\xb8\x81\x67\xd3\x0a\x15\x5e\xba\x53\x81\x20\x8f\xa0\x8e\x94\x41\x2a\x06\x56\x9d\xa7\x7b\x54\xc6\xa8\x36\xb9\x50\x79\x41\x89\x71\xe2\x33\x7c\x00\x76\x15\x05\x82\xc9\x09\xf2\xa3\x12\x55\x94\xca\x31\xef\x24\xd1\x4e\x42\x43\x04\x4f\x94\xdc\x60\x55\x82\x5b\xb3\x33\xe0\x05\x76\x7c\x6f\x8d\xa8\xd6\xaf\xfd\xce\x41\x10\x11\x2c\x73\x5c\x14\x13\x3e\xb0\x52\xf8\x82\x6e\x32\x44\x0d\x54\xda\x2d\x50\x86\x6a\x4e\x7f\xab\xe1\x9f\x3d\x88\x51\x35\xcc\xe9\x16\x4a\xc8\xed\x09\x97\x4a\xd4\x32\x97\x58\x35\x1b\x29\xac\x6c\x44\x44\x55\x61\xbe\xd5\xee\x5a\x23\x47\x82\xe6\x17\x71\x3e\xb3\xb7\x6c\xbf\x86\xfd\x6a\x5c\x6d\xc2\x96\x47\x9a\xb8\x3c\xcb\x78\x11\x8f\x18\xf1\x98\xd1\x84\x5c\x51\x2b\x92\x1a\x02\xc2\x5b\xc1\x09\x5f\xd3\x22\x1d\xb8\x5c\x03\x5c\x89\x62\xca\x37\xaf\xab\x03\xa8\xc5\x96\x9c\xee\xac\xe5\xef\xfd\xce\xf5\x66\x66\x7d\x83\x29\x07\x95\x73\x5c\xc5\x74\x85\x88\x82\x02\xb8\xa1\x98\xe5\x5a\x02\x99\x80\x0f\x96\x0a\x58\x06\x25\x85\x64\xa4\xa0\xa4\xda\xa8\x4b\x38\x28\xbd\xd8\x8c\x15\x20\x81\x17\x3a\xef\x9a\x90\xf5\xd1\x13\x15\x30\x76\x24\x9b\x86\x89\x82\x87\xb2\x42\x47\xa6\xc9\x0b\x0d\x6f\x68\x86\x98\x6b\xc0\x8a\x9c\xde\x88\x2f\x2a\x4c\x79\x8a\x51\x81\x1b\x75\x91\x82\x76\x61\xec\xd3\xc5\x27\xe0\xe7\x7c\xf4\x9b\xd5\x6a\x00\x7e\xa6\x4a\xf0\x6a\x08\xd2\x69\xd9\xd9\xc2\x7f\x96\x42\xc3\xf5\xc1\xb1\xc7\x78\x18\x04\xbf\x19\xf7\xf4\x7e\xaa\x3d\x74\x14\xaa\xc2\x0d\xb3\xc3\xda\xf6\x1e\x9e\x2c\xb5\xf4\x3c\x5b\x81\xb6\x0c\x4d\x55\x8b\x59\xce\x28\x7f\xdc\xde\xc5\xe1\xd9\x28\x9c\x9f\x84\x36\x6f\x29\x80\xd0\x09\x30\x33\x27\x72\x02\xf2\x18\x40\xb7\xa1\x26\xd8\x42\x9b\x14\x27\xa7\x15\x2e\xe3\x40\x92\x44\x41\xb4\x60\xd8\xf4\xc3\x8e\x10\xe0\x9b\x2b\x42\xb4\xa9\x95\x2c\xb2\xa2\x2c\x1b\x50\x9f\x6b\x2e\x3a\x8c\xfe\x75\xac\x36\x2f\x14\x3d\x83\x4a\x2d\x37\x85\x7c\x6d\x8c\xe6\x2f\x53\xd2\x7e\xb4\x93\x9c\x80\x7e\xbd\xeb\x1a\xc9\xc0\xf6\x6b\xff\x63\x0c\xed\x97\xb9\x75\x99\x5d\xe7\x4f\x66\x12\xa6\x15\xc4\x13\xab\x54\x98\x34\x75\xaf\x02\xed\xb1\xeb\x2b\x68\x5f\xd8\xe7\x8b\xe2\xe0\x15\x76\x01\xbc\xc8\xc0\xbe\x90\xfe\xa6\x7e\x63\x7d\x9f\x97\x64\xba\xe8\x30\x20\x22\x8d\x8f\xbd\x54\x36\x5f\xd9\x8d\xbb\x58\x0b\x87\x19\xc5\x1a\xe2\x9b\x3d\xd8\xb8\x8d\xd4\xa8\x3c\xff\x92\xe8\x13\x2e\xdc\xbf\x05\x71\x3d\xa8\x5e\x9a\xe9\x3d\x5e\x84\x94\x5d\xcb\x32\xe6\x64\x64\x1f\xaf\x6e\xdf\xb3\x05\x95\xd3\x0a\x7d\x1a\x2b\xda\x08\x61\x6f\x30\x29\x94\xf9\x2e\x4d\xd3\x6b\x9c\x7a\xad\x0c\xba\xc5\x97\x7d\xd4\xdc\xdc\x49\x48\xef\xd3\x7c\x05\xa2\x94\x03\xda\xd1\x7a\x51\x6e\xa0\x6c\x7a\x1e\x77\x12\xa8\x0f\x8c\xea\x13\x14\x6b\x70\x94\x30\x82\x08\x96\xb6\x31\x9c\x63\xa2\xf4\xcd\x10\x68\xc4\xde\x54\xc4\x49\x45\xcf\x94\x41\x39\x93\xf8\x20\x04\x03\xcc\x27\x89\x42\x01\x2e\x72\xc1\xd9\x25\x01\x52\x1b\xac\xa2\xe3\x0b\x0d\xa4\x56\xd4\x5c\x72\x21\xcd\xe6\xe5\xa3\x3e\x55\xb9\xa6\xbf\xc3\x74\xef\xbd\x7a\x7d\x4f\x68\x3f\x63\x68\x36\x8c\xcf\xfe\x9c\x59\xfc\xdf\xcc\x2c\xf4\x45\x13\xf3\xb6\xda\x5a\x9b\x82\xf2\x5c\x48\xe0\xd1\xbd\xa1\x8d\x90\x79\xa9\x30\x81\x5c\x82\xa2\xc2\xa9\x8a\x49\x80\x2d\x6a\xd5\xb5\x06\x0b\x32\x9a\x96\x1c\xbb\xe3\x8e\x05\x6a\x2a\x79\x7c\xe3\xb4\xc0\x98\xf8\x66\xaf\x19\xad\xa8\x7f\xd3\x38\xbc\x36\xa1\x5e\xeb\x6a\x35\x77\x89\x16\x28\xcf\x92\x42\x76\xa0\x43\x08\x37\x08\x09\x9d\xc1\x09\xab\x15\xa9\xa3\xdd\x98\x47\x4f\x7e\x72\xf5\x0d\x4e\xbe\x26\xc7\xea\x2d\xbd\x9b\x9e\x91\xbd\x13\x7e\x55\xe9\x35\x67\x63\xef\xad\x7e\xdc\x9b\xaa\xd6\xd1\x26\xae\x85\xe1\x3a\xd4\x80\x8c\xa0\xcb\xf3\xe1\xec\x0f\x11\xa1\x27\x36\x6a\xc1\x1d\xb6\x49\x88\xe3\xfd\x4a\x89\xb1\xf3\xbd\xa3\x7e\x72\x45\x60\xe1\x10\xc1\x35\xd5\x06\x38\x71\x0f\x62\x9d\x48\x07\xba\x38\xe5\x58\x2a\x25\xdc\x77\xa5\x75\x5d\x2d\x14\x2e\xfd\xa3\x18\x77\x6f\x92\xbc\x57\xfb\xab\x03\xdf\x45\x14\x2e\x88\x90\x1e\xd3\xa4\x8b\xb1\x36\xcd\xce\x46\x17\x81\x3a\xd4\x17\x32\x9e\x84\x7a\x6c\x12\x52\x41\xdd\x91\x63\x37\x43\x59\x71\xf9\x60\x36\x14\x1c\x08\xb8\x4e\xcc\x6d\xd0\xe8\x2d\x84\xf0\xe9\x7d\x0f\xe4\x3d\x59\xa7\x1a\x1f\x66\x07\x18\xae\x44\xdb\x64\x06\x75\x76\xe7\xfb\x78\xc1\xa0\xc0\x28\x3a\x3b\x89\x18\x4a\x29\x3b\xe3\x83\xfe\x9c\xf3\x7a\x43\x2b\x10\xb5\x33\x38\xa5\x54\x4b\x58\x99\xf5\xf5\xd6\xce\x76\xd3\x9e\x1e\xb2\xee\x39\x44\x5c\xc8\x82\x9c\x7b\xd0\x83\x75\xae\xd5\x4d\x01\xa2\x6e\x92\x92\x1e\x81\x17\xed\x89\x4b\x52\x2e\x55\x20\x19\x25\x58\xc7\xea\x95\x2b\x66\xce\xb5\x2c\xb0\x81\xbc\xbf\x4e\xb3\xa6\x42\x0c\x94\x86\x12\x2b\xcc\x18\x30\xaa\xab\x94\x52\x0b\x15\xc0\xb0\x33\xd7\x44\xfd\xa6\x45\x3f\x62\xca\x6a\x05\x39\x26\x09\xf3\xf9\xde\x52\x9c\x1a\xe1\x0c\x5e\x69\x4b\x56\xf8\x39\x1f\x96\x6d\x41\x22\xbb\xb6\x45\x12\xaa\x70\x97\x5a\x37\x8d\x5f\xd4\x95\xa3\xd8\xe9\xf6\xc5\xed\x91\x2a\x6d\xba\x9e\x58\xc8\xfe\xd7\x34\xa8\xbf\x78\xe7\x0c\xa9\xa3\x69\xcb\xeb\xba\xaa\x64\x5d\xc3\x10\x70\x07\x67\xfb\x11\xa3\x18\xa3\xda\xbe\x27\xb2\x4e\x9d\x94\xa2\x0a\x2a\x11\x3b\x5a\x76\xe8\x2f\x5d\x87\x0e\xd4\x46\x97\x4d\x46\xf0\x1d\x7d\x7c\x16\x05\x38\xa0\x4b\xe0\xa0\x28\xc9\x27\xde\xe0\x89\x2e\x4b\xd8\x77\x9a\xdf\x5e\xef\xd9\x5d\x9a\x11\x8c\x76\xc5\xed\x16\xee\x4d\x04\xef\xf8\x48\x89\x3c\x57\x86\xba\x26\xee\x34\xad\x79\x25\x4d\x34\x2b\xb4\x08\x4f\x94\x17\xe2\x69\x7d\x46\xdd\x40\xdb\x92\x61\x02\xb3\x2c\x7c\xad\xa2\xb5\x51\x98\x72\xb3\xfa\x94\x74\xae\x16\xa9\xe0\x08\x0a\xf8\x32\xca\x65\xe1\x6e\x35\xf3\x77\xac\x31\xd9\xe2\x12\xf6\x10\x5a\x36\x6d\xdb\x07\x0c\xab\xaf\x35\xfe\x15\x75\xbf\x33\xdc\x84\x4a\xb7\x25\xc2\xa2\x07\x98\x5a\xcf\x61\x35\xbf\xb5\x02\x57\x99\x0a\xaa\x89\x02\x03\xe3\xca\xe3\x8d\xa8\xa9\x8b\x05\x3d\x21\xec\x05\xe8\xb1\xef\xa6\xa3\x81\x1a\x9d\x31\xab\x13\xa6\xaf\x6f\x3a\xaf\xf6\xb5\x7f\x09\xc8\xb3\x8f\x06\xac\xab\xa9\x21\x9b\x0e\x60\x1b\xd4\xe2\x49\x97\x13\x7a\xa8\x5c\xc8\xed\xa7\xa3\xf1\x0b\x08\xfb\xf8\x6c\x8e\x4a\x5c\x6d\x15\x3d\x93\xaf\x6b\x20\x67\x33\x90\x7d\x82\xb8\x58\x1f\x78\xda\x8d\xe5\x4f\x16\x17\xed\xfe\xaf\xbf\x92\xe5\xb1\xea\xc3\x38\x57\xb8\x19\x75\xb5\x4f\x36\xb1\xf7\x3e\xd4\x76\xfc\xb7\x23\x8e\xf9\x91\x86\x6b\x16\x82\x8d\xc1\xe4\x94\x34\x36\x59\xd9\xbd\x5e\x91\x65\x16\xc3\x3d\x67\x18\xea\xa1\x36\x88\x42\x29\x17\xd4\xfe\x37\x22\xd5\x1f\xdd\xaf\xbf\x9f\x0f\xf6\x9f\x6a\x45\x3f\x07\x6a\xa1\xa2\x73\xcd\x6b\x3c\x2f\xe1\x52\xf6\x27\xb0\xeb\x07\x9b\x6b\x91\x0c\x9d\xe6\xea\xa1\xfe\x34\xd7\x47\x9b\x6b\x76\x54\x6e\x99\x6d\x39\x23\x0f\x69\x32\xf9\x3e\x5f\x8f\xb1\x9f\xb2\x31\x07\x73\x7c\x20\xed\xeb\x4e\xbc\x4c\xf9\x4e\x6a\x66\x8b\xf6\x4a\x0c\x4b\xbe\x61\xfe\xb8\xfb\x29\x50\x29\x86\xee\xdd\xbe\x53\x89\xb5\xc1\x25\x25\xb7\x4d\x67\xe3\x87\x41\xbb\xcb\xef\x3b\xfd\x31\x62\xc0\x5f\x7c\xed\xd9\xc8\xc9\x2f\x8b\x33\x9c\x6f\xd3\x63\xe9\xee\x4b\xcd\xfd\x44\x3f\x33\x90\xee\xba\xbb\x95\xb0\xf7\x49\x4d\xad\xeb\x1b\xd0\xf9\xa1\xf8\xf0\x2d\xa6\xe7\x9e\xce\xce\xfe\xdb\x7e\x5b\xbb\x7b\xd9\xfd\x37\x00\x00\xff\xff\x8f\xfe\xaa\xe6\xc5\x40\x00\x00") +var _dataConfig_schema_v35Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1b\xcb\x72\xe3\xb8\xf1\xae\xaf\x60\x61\xf7\xb6\x7e\x6c\x55\x36\xa9\xca\xdc\x72\xcc\x29\x39\xc7\xa5\x61\x41\x60\x4b\xc2\x1a\x04\xb0\x0d\x50\x63\xed\x94\xff\x3d\xc5\x87\x28\x90\x04\x08\x50\x92\xc7\x9e\xda\x39\xd9\x22\xbb\x1b\xfd\x42\xbf\x00\x7e\x5d\x65\x19\xf9\xd9\xb0\x3d\x94\x94\x7c\xca\xc8\xde\x5a\xfd\xe9\xf1\xf1\x77\xa3\xe4\x7d\xfb\xf4\x41\xe1\xee\xb1\x40\xba\xb5\xf7\xbf\xfe\xf6\xd8\x3e\xfb\x89\xdc\xd5\x78\xbc\xa8\x51\x98\x92\x5b\xbe\xcb\xdb\x37\xf9\xe1\x6f\x0f\x7f\x7f\xa8\xd1\x5b\x10\x7b\xd4\x50\x03\xa9\xcd\xef\xc0\x6c\xfb\x0c\xe1\x8f\x8a\x23\xd4\xc8\x4f\xe4\x00\x68\xb8\x92\x64\x7d\xb7\xaa\xdf\x69\x54\x1a\xd0\x72\x30\xe4\x53\x56\x33\x97\x65\x3d\xc8\xe9\x81\x43\xd6\x58\xe4\x72\x47\x9a\xc7\xaf\x0d\x85\x2c\x23\x06\xf0\xc0\x99\x43\xa1\x67\xf5\xa7\xc7\x33\xfd\xc7\x1e\xec\x6e\x4c\xd5\x61\xb6\x79\xae\xa9\xb5\x80\xf2\xbf\x53\xde\x9a\xd7\x9f\x9f\xe8\xfd\x9f\xff\xba\xff\xdf\xaf\xf7\xff\x7c\xc8\xef\xd7\xbf\xfc\x3c\x78\x5d\xeb\x17\x61\xdb\x2e\x5f\xc0\x96\x4b\x6e\xb9\x92\xfd\xfa\xa4\x87\x7c\xed\xfe\x7b\xed\x17\xa6\x45\xd1\x00\x53\x31\x58\x7b\x4b\x85\x81\xa1\xcc\x12\xec\x17\x85\xcf\x31\x99\x7b\xb0\x77\x92\xb9\x5b\xdf\x23\xf3\x50\x9c\x83\x12\x55\x19\xb5\xe0\x09\xea\x9d\x84\x69\x97\xbf\x8d\xfd\x0c\x30\x04\x1b\x77\xd9\x16\xea\xdd\x3c\xb6\x5e\xfe\x36\x02\xb7\x51\x23\x26\xf0\x09\xea\x9d\x04\x6e\x97\xbf\x4e\xe0\xd5\x49\x68\x3f\x8f\xe4\xf3\xcb\x7d\xfd\xf7\xb5\xa1\x39\x4b\xaf\xa5\xe2\xf0\xd7\x08\x31\x88\x79\x3e\x75\xfa\x62\x4e\x58\x9f\xbd\x42\x03\x9a\x2c\x40\x0b\x75\x6c\x38\xf7\xeb\xac\x05\x28\x41\x5a\xd2\xab\x29\xcb\xc8\xa6\xe2\xa2\x18\x6b\x5d\x49\xf8\x4f\x4d\xe2\xc9\x79\x98\x65\x5f\xc7\xe1\xdd\xa1\xd3\xbc\x1f\xfc\x0a\x3b\x45\xff\x3e\x20\x4b\xff\x9e\x29\x69\xe1\xc5\x36\x42\xcd\x2f\xdd\xaa\x40\xb1\x67\xc0\x2d\x17\x90\x8a\x41\xb1\xf5\xf4\x80\xca\x04\x37\x36\x57\x98\x17\x9c\x59\x2f\xbe\xa0\x1b\x10\x57\x51\x60\x94\xed\x21\xdf\xa2\x2a\xa3\x54\xb6\x79\x2b\x89\xf1\x12\x3a\x45\xf0\x44\xc9\x2d\xc5\x1d\x24\x6b\xd6\xec\xcb\xdc\xf0\x3f\x07\x7a\x7d\x22\x5c\x5a\xd8\x01\x92\xbb\x1e\x77\xfd\x3a\xc2\x9d\x10\x8b\x6f\xcc\x1e\xd5\xf9\xb5\x5e\x79\x08\x12\x46\x75\x4e\x8b\x62\x20\x04\x45\xa4\xc7\x9a\x23\x6e\xa1\x34\x7e\xf9\x32\x52\x49\xfe\x47\x05\xff\xee\x40\x2c\x56\x30\xa6\x5b\xa0\xd2\xb7\x27\xbc\x43\x55\xe9\x5c\x53\xac\x77\xe1\xbc\xee\x09\x53\x65\x49\xe5\xad\xb6\xe6\x12\x39\x12\x34\x3f\x49\x12\x99\xbb\xdf\xbb\x35\xdc\x57\xfd\x6a\x03\xb6\x02\xd2\xc4\xe5\x99\x06\x9b\x78\xb8\x89\x07\x9c\xda\xd3\x55\x85\x2c\x35\x7e\x2c\xdd\x47\x59\x46\x2a\x5e\xa4\x03\xef\x96\x00\x97\xaa\x18\xf2\x2d\xab\x72\x03\x48\xc6\x5b\x72\xb8\xb3\xa6\xbf\xd7\x2b\xdf\x9b\x91\xf5\x2d\xe5\x12\x30\x97\xb4\x8c\xe9\x8a\x30\x84\x02\xa4\xe5\x54\xe4\x46\x03\x1b\x80\x9f\x2c\x35\x63\x19\x92\x14\xcf\x09\xc2\x8e\x1b\x8b\x47\x2f\xe4\x59\x0a\x97\xb1\x02\x34\xc8\xc2\xe4\x6d\x07\xb3\x3c\xf4\x92\x02\xfa\x76\xe6\xa6\x61\xa2\x90\x73\x29\xa5\x25\x53\x27\x95\x9a\x37\x32\x42\xcc\x0d\x50\x64\xfb\x0b\xf1\x55\x49\xb9\x4c\x31\x2a\x48\x8b\x47\xad\x78\x1b\xc6\x3e\x5c\x7c\x02\x79\xc8\x7b\xbf\x59\xac\x06\x90\x07\x8e\x4a\x96\xa7\x20\x9d\x96\xda\x1d\xfc\x17\xad\x0c\x5c\x1f\x1c\xfb\x44\xdb\x09\x7e\xd7\xef\xe9\xf5\x50\x7b\x64\xab\xb0\xa4\x35\xb3\xa7\xb5\xdd\x3d\x3c\x58\x6a\xea\x79\xae\x02\x5d\x19\xea\x92\x98\x8a\x5c\x70\xf9\x7c\x7b\x17\x87\x17\x8b\x34\xdf\x2b\x63\x2f\xa9\x9e\xc8\x1e\xa8\xb0\x7b\xb6\x07\xf6\x3c\x83\xee\x42\x0d\xb0\x95\xb1\x29\x4e\xce\x4b\xba\x8b\x03\x69\x16\x05\x31\x4a\x50\xdb\x4d\x4a\xe6\x00\x2f\x2e\x27\xc9\x4d\xad\xe4\x90\x55\xbb\x5d\x0d\x1a\x72\xcd\x49\x7b\xd2\xbd\x8e\x15\xf6\x05\xf2\x03\x60\x6a\xf5\xa9\xf4\xb9\xab\x1a\xbf\x4c\x49\xfb\xd1\x36\x74\x00\xfa\xf9\xa1\xed\x42\x67\xb6\x5f\xf3\x9f\x10\xd3\x72\x37\xf3\x64\xd7\xf1\x93\x91\x84\x69\x05\xf1\xc0\x2a\x25\x65\x75\xdd\x8b\x60\x02\x76\x3d\x83\x76\x5d\x41\x3e\x29\x0e\xce\xb0\x13\xe0\x49\x06\x0e\x85\xf4\x8b\x9a\x95\xe5\x4d\x62\x92\xe9\xa2\x93\x84\x88\x34\x21\xf6\x52\xd9\x3c\xb3\x1b\x77\xb1\x06\x8e\x0a\x4e\x0d\xc4\x37\xfb\x6c\xd7\xd7\x53\xe3\xfa\xf0\x5b\xa2\x4f\xf8\x70\xff\x31\x8b\x1b\x40\x0d\xd2\x4c\xef\xf1\x22\xa4\xdc\x5a\x56\x08\x2f\x23\xeb\x78\x75\xfb\x96\x2d\xa8\x1e\x56\xe8\xc3\x58\xd1\x44\x08\x77\x83\x69\x85\xf6\x9b\x34\x4d\xe7\x38\x75\xae\x0c\xda\xc5\xa7\x7d\xd4\xd8\xdc\x49\x48\x6f\xd3\x7c\xcd\x44\x29\x0f\xb4\xa7\xf5\x3a\x4d\x24\xfc\x08\xba\xda\x08\x6e\xf6\x50\x2c\xc1\x41\x65\x15\x53\x22\x6d\x63\x78\x67\x4c\xe9\x9b\x61\xa6\x11\xbb\xa8\x88\xd3\xc8\x0f\x5c\xc0\x6e\x24\xf1\x46\x29\x01\x54\x0e\x12\x05\x02\x2d\x72\x25\xc5\x31\x01\xd2\x58\x8a\xd1\xf1\x85\x01\x56\x21\xb7\xc7\x5c\x69\x7b\xf3\xf2\xd1\x3f\x8f\x3a\x7b\x7d\x3f\x8e\x1a\x32\x34\x9a\xe4\x67\x3f\x66\x16\x7f\x99\x99\x85\x39\x1a\x66\x2f\xab\xad\x8d\x2d\xb8\xcc\x95\x06\x19\xdd\x1b\xc6\x2a\x9d\xef\x90\x32\xc8\x35\x20\x57\x5e\x55\x0c\x02\x6c\x51\x61\xdb\x1a\x4c\xc8\x18\xbe\x93\xd4\x1f\x77\x1c\x50\x5b\xea\xed\x85\xd3\x02\x6b\xe3\x9b\xbd\x12\xbc\xe4\xe1\x4d\xe3\xf1\xda\x84\x7a\xad\xad\xd5\xfc\x25\xda\x4c\x79\x96\x14\xb2\x67\x3a\x84\xf9\x06\x21\xa1\x33\xd8\x53\x5c\x90\x3a\x9a\x8d\xb9\x0d\xe4\x27\x5f\xdf\xe0\xe5\x6b\x70\x26\xdf\xd0\xbb\xeb\x18\x59\x7b\xe1\x17\x95\x5e\x63\x36\xd6\xc1\xea\xc7\xbf\xa9\x2a\x13\x6d\xe2\x1a\x18\x69\xe6\x1a\x90\x1e\x74\x7a\xb8\x9c\x7d\x17\x11\x7a\x60\xa3\x06\xdc\x63\x9b\x84\x38\xde\xad\x94\x18\x3b\xdf\x3a\xea\x27\x57\x04\x0e\x0e\x53\xd2\x70\x63\x41\x32\xff\x20\xd6\x8b\xb4\xe1\x93\x53\x8e\xa9\x52\xe6\xfb\xae\xb4\xae\xab\x81\xa2\xbb\xf0\x28\xc6\xdf\x9b\x24\xef\xd5\xee\xde\xc1\x37\x11\x45\x2a\xa6\x74\xc0\x34\xe9\x62\xbc\x71\x01\x3b\x9a\x74\xcc\x94\xad\xa1\x08\xf3\x45\xe1\x73\x9d\xbf\x0a\xee\x0f\x34\xab\x11\xca\x82\x8b\x0e\xa3\x19\xe2\x89\x80\xef\x74\xde\x05\x8d\xde\x78\x98\xbf\x29\xd0\x01\x05\x4f\xf1\xb9\xa1\x9b\xd1\x79\x87\x2f\x2f\xd7\x89\x04\x0f\xfe\xf2\x20\x5e\x5f\x20\x58\xe4\xa3\x83\x8b\x53\xe5\xe5\x16\x08\x60\x3e\xe6\x78\xdf\xf2\x12\x54\xe5\x8d\x65\x29\xc5\x15\x45\xbb\xbc\x3c\x5b\xb9\x6e\xda\xd1\x23\xce\x9d\x8a\x88\x0b\x39\x90\x63\x0f\x7a\x72\x8e\xc1\xda\xa1\x41\xd4\x4d\x52\xb2\x29\xc8\xa2\x39\xa0\x49\x4a\xbd\x08\x5a\x70\x46\x4d\xac\xbc\xb9\x62\x44\x5d\xe9\x82\x5a\xc8\xbb\xab\x3b\x4b\x0a\xca\x99\x4a\x52\x53\xa4\x42\x80\xe0\xa6\x4c\xa9\xcc\x48\x01\x82\x7a\x53\x53\xd4\x6f\x1a\xf4\x2d\xe5\xa2\x42\xc8\x29\x4b\x18\xe7\x77\x96\x92\xdc\x2a\x6f\xf0\x4a\x5b\xb2\xa4\x2f\xf9\x69\xd9\x06\x24\xb2\x6b\x1b\x24\x85\x85\xbf\x32\xbb\xab\xfd\xa2\x2a\x3d\xb5\x51\xbb\x2f\xee\xb7\x1c\x8d\x6d\x5b\x68\xa5\xbb\x5f\xc3\xa0\xfe\x1a\x1c\x4b\xa4\x4e\xb2\x1d\xaf\x6b\x8b\x98\x65\xfd\xc5\x8c\x3b\x78\xbb\x95\x18\xc5\x18\xd5\xe6\x3d\xd3\x55\xea\x60\x95\x94\x50\xaa\xd8\x49\xb4\x47\x7f\xe9\x3a\xf4\xa0\xd6\xba\xac\x33\x42\xe8\xa4\xe4\xa3\x28\xc0\x03\xbd\x03\x09\xc8\x59\x3e\xf0\x86\x40\x74\x99\xc2\xbe\xd1\xb8\xf7\x7a\xcf\x6e\xd3\x8c\x12\xbc\xad\x85\x6f\xe1\xde\x4c\xc9\x96\x8f\x94\xc8\x73\x65\xa8\xab\xe3\x4e\xdd\xc9\x97\xda\x46\xb3\x42\x83\xf0\x85\xcb\x42\x7d\x59\x9e\x51\x6f\xa0\x6d\x2d\x28\x83\x51\x16\xbe\x56\xd1\xc6\x22\xe5\xd2\x2e\x3e\x54\x1d\xab\x45\x23\x6c\x01\x41\x4e\xa3\x5c\x36\xdf\xdc\x66\xe1\x06\x37\x26\x5b\x5c\xc2\x0e\xc2\xe8\xba\xcb\x7b\x87\xd9\xf6\xb5\xc6\xbf\xa2\xee\xf7\x86\x9b\xb9\xd2\x6d\x8a\x30\xe9\x01\x86\xd6\xf3\x58\x2d\x6c\xad\x99\x9b\x4f\x05\x37\x0c\xc1\x42\xbf\x72\x7f\x81\x6a\xe8\x62\xb3\x9e\x30\xef\x05\xe4\xb9\x6b\xbe\xa3\x81\x9a\x1c\xa8\xa8\x12\x86\xb5\x17\x1d\x6f\x87\xda\xbf\x04\xe4\xd1\x07\x0a\xce\x35\xd8\x39\x9b\x9e\xc0\x6e\x50\x8b\xa7\xdc\x24\x49\xba\xef\xd0\x41\xe5\x4a\xdf\x7e\xe0\x1a\xbf\xd3\xb0\x8e\x8f\xfb\xb8\xa6\xe5\xad\x22\x6c\xf2\x0d\x10\xe2\x6d\x18\xb2\x0f\x10\x3b\xab\x8d\x0c\xcc\xd3\x3e\x76\xec\x74\x7b\xc4\xee\x96\x57\xc0\xaa\x4f\xfd\xec\xe1\xae\xd7\xd5\x3a\xd9\xc4\xc1\x8d\x71\x3b\xfe\x9b\x31\xc8\xf8\x94\xc4\x37\x2f\xa1\xd6\x52\xb6\x4f\x1a\xad\x2c\xec\x70\xaf\xc8\x44\x93\x79\xa1\x37\x54\x75\x50\x3f\x22\xd5\x82\x48\xf5\xbd\xfb\xf5\xb7\xf3\xc1\xee\xd3\xb1\xe8\xe7\x49\x0d\x54\x74\xf6\x79\x8d\xe7\x25\xdc\xf3\xfe\x00\x76\x7d\x67\x73\x4d\x92\xa1\xd7\x5c\x1d\xd4\x0f\x73\xbd\xb7\xb9\x46\xa7\xef\x8e\xd9\xa6\x73\xf4\x39\x4d\x26\x5f\x11\xec\x30\xd6\x43\x36\xc6\x60\x9e\x0f\xb6\x43\x1d\x4c\x90\xa9\xd0\x69\xce\x68\xd1\x4e\x89\xf3\x92\xdf\x30\x7f\x3c\xfc\x32\x53\x29\xce\x5d\xe5\x7d\xa3\x12\xeb\x06\xf7\x9e\xfc\x36\x1d\x8d\x28\x4e\xda\x9d\x7e\x6f\x1a\x8e\x11\x27\xfc\xc9\xd7\xa7\xb5\x9c\xf2\x38\x39\xe7\xf9\x3a\x3c\xe9\x6e\xbf\x1c\x5d\x0f\xf4\x33\x02\x69\x6f\xd0\x3b\x09\x7b\x9d\xd4\xf8\xfa\xbe\x49\x1d\x9f\xb3\x9f\xbe\x0d\x0d\x5c\xfd\x59\xb9\x7f\x9b\x6f\x7d\x57\xaf\xab\xff\x07\x00\x00\xff\xff\xfe\x67\x55\x11\x55\x41\x00\x00") func dataConfig_schema_v35JsonBytes() ([]byte, error) { return bindataRead( diff --git a/components/cli/cli/compose/schema/data/config_schema_v3.2.json b/components/cli/cli/compose/schema/data/config_schema_v3.2.json index 8d850d5d2e..6e0e0e747d 100644 --- a/components/cli/cli/compose/schema/data/config_schema_v3.2.json +++ b/components/cli/cli/compose/schema/data/config_schema_v3.2.json @@ -262,7 +262,8 @@ "nocopy": {"type": "boolean"} } } - } + }, + "additionalProperties": false } ], "uniqueItems": true diff --git a/components/cli/cli/compose/schema/data/config_schema_v3.3.json b/components/cli/cli/compose/schema/data/config_schema_v3.3.json index f1eb9a6610..0b735cfe28 100644 --- a/components/cli/cli/compose/schema/data/config_schema_v3.3.json +++ b/components/cli/cli/compose/schema/data/config_schema_v3.3.json @@ -296,7 +296,8 @@ "nocopy": {"type": "boolean"} } } - } + }, + "additionalProperties": false } ], "uniqueItems": true diff --git a/components/cli/cli/compose/schema/data/config_schema_v3.4.json b/components/cli/cli/compose/schema/data/config_schema_v3.4.json index f2e315ba8e..93fe821a13 100644 --- a/components/cli/cli/compose/schema/data/config_schema_v3.4.json +++ b/components/cli/cli/compose/schema/data/config_schema_v3.4.json @@ -299,7 +299,8 @@ "nocopy": {"type": "boolean"} } } - } + }, + "additionalProperties": false } ], "uniqueItems": true diff --git a/components/cli/cli/compose/schema/data/config_schema_v3.5.json b/components/cli/cli/compose/schema/data/config_schema_v3.5.json index d3352c7d52..4244e102a4 100644 --- a/components/cli/cli/compose/schema/data/config_schema_v3.5.json +++ b/components/cli/cli/compose/schema/data/config_schema_v3.5.json @@ -87,7 +87,8 @@ "labels": {"$ref": "#/definitions/list_or_dict"}, "cache_from": {"$ref": "#/definitions/list_of_strings"}, "network": {"type": "string"}, - "target": {"type": "string"} + "target": {"type": "string"}, + "shm_size": {"type": ["integer", "string"]} }, "additionalProperties": false } @@ -300,7 +301,8 @@ "nocopy": {"type": "boolean"} } } - } + }, + "additionalProperties": false } ], "uniqueItems": true @@ -428,6 +430,7 @@ "id": "#/definitions/network", "type": ["object", "null"], "properties": { + "name": {"type": "string"}, "driver": {"type": "string"}, "driver_opts": { "type": "object", diff --git a/components/cli/cli/compose/types/types.go b/components/cli/cli/compose/types/types.go index c68187efe1..852c400060 100644 --- a/components/cli/cli/compose/types/types.go +++ b/components/cli/cli/compose/types/types.go @@ -319,6 +319,7 @@ type UlimitsConfig struct { // NetworkConfig for a network type NetworkConfig struct { + Name string Driver string DriverOpts map[string]string `mapstructure:"driver_opts"` Ipam IPAMConfig diff --git a/components/cli/cli/version.go b/components/cli/cli/version.go index bff7ab49ef..91c9ae1878 100644 --- a/components/cli/cli/version.go +++ b/components/cli/cli/version.go @@ -3,7 +3,8 @@ package cli // Default build-time variable. // These values are overriding via ldflags var ( - Version = "unknown-version" - GitCommit = "unknown-commit" - BuildTime = "unknown-buildtime" + PlatformName = "" + Version = "unknown-version" + GitCommit = "unknown-commit" + BuildTime = "unknown-buildtime" ) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 69d1ba65a2..b206af725d 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -840,7 +840,7 @@ __docker_complete_log_options() { local gelf_options="$common_options1 $common_options2 gelf-address gelf-compression-level gelf-compression-type gelf-tcp-max-reconnect gelf-tcp-reconnect-delay tag" local journald_options="$common_options1 $common_options2 tag" local json_file_options="$common_options1 $common_options2 max-file max-size" - local logentries_options="$common_options1 $common_options2 logentries-token tag" + local logentries_options="$common_options1 $common_options2 line-only logentries-token tag" local splunk_options="$common_options1 $common_options2 splunk-caname splunk-capath splunk-format splunk-gzip splunk-gzip-level splunk-index splunk-insecureskipverify splunk-source splunk-sourcetype splunk-token splunk-url splunk-verify-connection tag" local syslog_options="$common_options1 $common_options2 syslog-address syslog-facility syslog-format syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify tag" @@ -918,6 +918,10 @@ __docker_complete_log_driver_options() { COMPREPLY=( $( compgen -W "gzip none zlib" -- "${cur##*=}" ) ) return ;; + line-only) + COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) ) + return + ;; mode) COMPREPLY=( $( compgen -W "blocking non-blocking" -- "${cur##*=}" ) ) return @@ -1439,11 +1443,14 @@ _docker_container_exec() { __docker_complete_user_group return ;; + --workdir|-w) + return + ;; esac case "$cur" in -*) - COMPREPLY=( $( compgen -W "--detach -d --detach-keys --env -e --help --interactive -i --privileged -t --tty -u --user" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--detach -d --detach-keys --env -e --help --interactive -i --privileged -t --tty -u --user --workdir -w" -- "$cur" ) ) ;; *) __docker_complete_containers_running diff --git a/components/cli/contrib/completion/fish/docker.fish b/components/cli/contrib/completion/fish/docker.fish index d825922776..178aa9c3ab 100644 --- a/components/cli/contrib/completion/fish/docker.fish +++ b/components/cli/contrib/completion/fish/docker.fish @@ -174,6 +174,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s d -l detach -d complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s i -l interactive -d 'Keep STDIN open even if not attached' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s w -l workdir -d 'Working directory inside the container' complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -a '(__fish_print_docker_containers running)' -d "Container" # export diff --git a/components/cli/contrib/completion/zsh/_docker b/components/cli/contrib/completion/zsh/_docker index 309db74ff6..b245c05872 100644 --- a/components/cli/contrib/completion/zsh/_docker +++ b/components/cli/contrib/completion/zsh/_docker @@ -745,6 +745,7 @@ __docker_container_subcommand() { "($help)--privileged[Give extended Linux capabilities to the command]" \ "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \ "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \ + "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" "($help -):containers:__docker_complete_running_containers" \ "($help -)*::command:->anycommand" && ret=0 case $state in @@ -1393,7 +1394,7 @@ __docker_nodes() { # Names if [[ $type = (names|all) ]]; then for line in $lines; do - s="${line[${begin[NAME]},${end[NAME]}]%% ##}" + s="${line[${begin[HOSTNAME]},${end[HOSTNAME]}]%% ##}" nodes=($nodes $s) done fi @@ -2169,9 +2170,9 @@ __docker_stacks() { end[${header[$i,$((j-1))]}]=-1 lines=(${lines[2,-1]}) - # Service ID + # Service NAME for line in $lines; do - s="${line[${begin[ID]},${end[ID]}]%% ##}" + s="${line[${begin[NAME]},${end[NAME]}]%% ##}" stacks=($stacks $s) done diff --git a/components/cli/docker.Makefile b/components/cli/docker.Makefile index f3f9afed4e..04ce309636 100644 --- a/components/cli/docker.Makefile +++ b/components/cli/docker.Makefile @@ -10,7 +10,7 @@ CROSS_IMAGE_NAME = docker-cli-cross$(IMAGE_TAG) VALIDATE_IMAGE_NAME = docker-cli-shell-validate$(IMAGE_TAG) MOUNTS = -v "$(CURDIR)":/go/src/github.com/docker/cli VERSION = $(shell cat VERSION) -ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT +ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM # build docker image (dockerfiles/Dockerfile.build) .PHONY: build_docker_image diff --git a/components/cli/docs/reference/commandline/exec.md b/components/cli/docs/reference/commandline/exec.md index 63635b2f40..35072dad1f 100644 --- a/components/cli/docs/reference/commandline/exec.md +++ b/components/cli/docs/reference/commandline/exec.md @@ -29,6 +29,7 @@ Options: --privileged Give extended privileges to the command -t, --tty Allocate a pseudo-TTY -u, --user Username or UID (format: [:]) + -w, --workdir Working directory inside the container ``` ## Description @@ -86,6 +87,20 @@ This will create a new Bash session in the container `ubuntu_bash` with environm variable `$VAR` set to "1". Note that this environment variable will only be valid on the current Bash session. +By default `docker exec` command runs in the same working directory set when container was created. + +```bash +$ docker exec -it ubuntu_bash pwd +/ +``` + +You can select working directory for the command to execute into + +```bash +$ docker exec -it -w /root ubuntu_bash pwd +/root +``` + ### Try to run `docker exec` on a paused container diff --git a/components/cli/scripts/build/.variables b/components/cli/scripts/build/.variables index eb87c38268..208f44c316 100755 --- a/components/cli/scripts/build/.variables +++ b/components/cli/scripts/build/.variables @@ -1,15 +1,22 @@ #!/usr/bin/env bash set -eu +PLATFORM=${PLATFORM:-} VERSION=${VERSION:-"unknown-version"} GITCOMMIT=${GITCOMMIT:-$(git rev-parse --short HEAD 2> /dev/null || true)} BUILDTIME=${BUILDTIME:-$(date --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')} +PLATFORM_LDFLAGS= +if test -n "${PLATFORM}"; then + PLATFORM_LDFLAGS="-X \"github.com/docker/cli/cli.PlatformName=${PLATFORM}\"" +fi + export LDFLAGS="\ -w \ - -X github.com/docker/cli/cli.GitCommit=${GITCOMMIT} \ - -X github.com/docker/cli/cli.BuildTime=${BUILDTIME} \ - -X github.com/docker/cli/cli.Version=${VERSION} \ + ${PLATFORM_LDFLAGS} \ + -X \"github.com/docker/cli/cli.GitCommit=${GITCOMMIT}\" \ + -X \"github.com/docker/cli/cli.BuildTime=${BUILDTIME}\" \ + -X \"github.com/docker/cli/cli.Version=${VERSION}\" \ ${LDFLAGS:-} \ " diff --git a/components/cli/templates/templates.go b/components/cli/templates/templates.go index 80cab5ed34..6cc2ec3608 100644 --- a/components/cli/templates/templates.go +++ b/components/cli/templates/templates.go @@ -55,10 +55,16 @@ func Parse(format string) (*template.Template, error) { return NewParse("", format) } +// New creates a new empty template with the provided tag and built-in +// template functions. +func New(tag string) *template.Template { + return template.New(tag).Funcs(basicFunctions) +} + // NewParse creates a new tagged template with the basic functions // and parses the given format. func NewParse(tag, format string) (*template.Template, error) { - return template.New(tag).Funcs(basicFunctions).Parse(format) + return New(tag).Parse(format) } // padWithSpace adds whitespace to the input if the input is non-empty diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf index 97f8374527..16c496d944 100755 --- a/components/cli/vendor.conf +++ b/components/cli/vendor.conf @@ -5,7 +5,7 @@ github.com/coreos/etcd v3.2.1 github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c -github.com/docker/docker f4d4f5863156b82ef146b6ff1e845f8dcf019f12 +github.com/docker/docker a1be987ea9e03e5ebdb1b415a7acdd8d6f0aaa08 github.com/docker/docker-credential-helpers 3c90bd29a46b943b2a9842987b58fb91a7c1819b # the docker/go package contains a customized version of canonical/json @@ -30,7 +30,7 @@ github.com/moby/buildkit aaff9d591ef128560018433fe61beb802e149de8 github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c https://github.com/ijc25/Gotty github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 github.com/opencontainers/image-spec v1.0.0 -github.com/opencontainers/runc 0351df1c5a66838d0c392b4ac4cf9450de844e2d +github.com/opencontainers/runc b2567b37d7b75eb4cf325b77297b140ea686ce8f github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9 github.com/pmezard/go-difflib v1.0.0 github.com/russross/blackfriday 1d6b8e9301e720b08a8938b8c25c018285885438 diff --git a/components/cli/vendor/github.com/docker/docker/api/types/configs.go b/components/cli/vendor/github.com/docker/docker/api/types/configs.go index 20c19f2132..54d3e39fb9 100644 --- a/components/cli/vendor/github.com/docker/docker/api/types/configs.go +++ b/components/cli/vendor/github.com/docker/docker/api/types/configs.go @@ -50,6 +50,7 @@ type ExecConfig struct { Detach bool // Execute in detach mode DetachKeys string // Escape keys for detach Env []string // Environment variables + WorkingDir string // Working directory Cmd []string // Execution commands and args } diff --git a/components/cli/vendor/github.com/docker/docker/api/types/swarm/runtime/plugin.proto b/components/cli/vendor/github.com/docker/docker/api/types/swarm/runtime/plugin.proto index 06eb7ba650..6d63b7783f 100644 --- a/components/cli/vendor/github.com/docker/docker/api/types/swarm/runtime/plugin.proto +++ b/components/cli/vendor/github.com/docker/docker/api/types/swarm/runtime/plugin.proto @@ -1,5 +1,7 @@ syntax = "proto3"; +option go_package = "github.com/docker/docker/api/types/swarm/runtime;runtime"; + // PluginSpec defines the base payload which clients can specify for creating // a service with the plugin runtime. message PluginSpec { diff --git a/components/cli/vendor/github.com/docker/docker/api/types/types.go b/components/cli/vendor/github.com/docker/docker/api/types/types.go index f7ac772971..7814e6b934 100644 --- a/components/cli/vendor/github.com/docker/docker/api/types/types.go +++ b/components/cli/vendor/github.com/docker/docker/api/types/types.go @@ -107,9 +107,21 @@ type Ping struct { Experimental bool } +// ComponentVersion describes the version information for a specific component. +type ComponentVersion struct { + Name string + Version string + Details map[string]string `json:",omitempty"` +} + // Version contains response of Engine API: // GET "/version" type Version struct { + Platform struct{ Name string } `json:",omitempty"` + Components []ComponentVersion `json:",omitempty"` + + // The following fields are deprecated, they relate to the Engine component and are kept for backwards compatibility + Version string APIVersion string `json:"ApiVersion"` MinAPIVersion string `json:"MinAPIVersion,omitempty"` diff --git a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools.go b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools.go index 68a072db22..6108ae3f43 100644 --- a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools.go +++ b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools.go @@ -34,39 +34,26 @@ const ( subgidFileName string = "/etc/subgid" ) -// MkdirAllAs creates a directory (include any along the path) and then modifies -// ownership to the requested uid/gid. If the directory already exists, this -// function will still change ownership to the requested uid/gid pair. -// Deprecated: Use MkdirAllAndChown -func MkdirAllAs(path string, mode os.FileMode, ownerUID, ownerGID int) error { - return mkdirAs(path, mode, ownerUID, ownerGID, true, true) -} - -// MkdirAs creates a directory and then modifies ownership to the requested uid/gid. -// If the directory already exists, this function still changes ownership -// Deprecated: Use MkdirAndChown with a IDPair -func MkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int) error { - return mkdirAs(path, mode, ownerUID, ownerGID, false, true) -} - // MkdirAllAndChown creates a directory (include any along the path) and then modifies // ownership to the requested uid/gid. If the directory already exists, this // function will still change ownership to the requested uid/gid pair. -func MkdirAllAndChown(path string, mode os.FileMode, ids IDPair) error { - return mkdirAs(path, mode, ids.UID, ids.GID, true, true) +func MkdirAllAndChown(path string, mode os.FileMode, owner IDPair) error { + return mkdirAs(path, mode, owner.UID, owner.GID, true, true) } // MkdirAndChown creates a directory and then modifies ownership to the requested uid/gid. -// If the directory already exists, this function still changes ownership -func MkdirAndChown(path string, mode os.FileMode, ids IDPair) error { - return mkdirAs(path, mode, ids.UID, ids.GID, false, true) +// If the directory already exists, this function still changes ownership. +// Note that unlike os.Mkdir(), this function does not return IsExist error +// in case path already exists. +func MkdirAndChown(path string, mode os.FileMode, owner IDPair) error { + return mkdirAs(path, mode, owner.UID, owner.GID, false, true) } // MkdirAllAndChownNew creates a directory (include any along the path) and then modifies // ownership ONLY of newly created directories to the requested uid/gid. If the // directories along the path exist, no change of ownership will be performed -func MkdirAllAndChownNew(path string, mode os.FileMode, ids IDPair) error { - return mkdirAs(path, mode, ids.UID, ids.GID, true, false) +func MkdirAllAndChownNew(path string, mode os.FileMode, owner IDPair) error { + return mkdirAs(path, mode, owner.UID, owner.GID, true, false) } // GetRootUIDGID retrieves the remapped root uid/gid pair from the set of maps. diff --git a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go index ff7968f854..aedf8ad343 100644 --- a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go +++ b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go @@ -10,6 +10,7 @@ import ( "path/filepath" "strings" "sync" + "syscall" "github.com/docker/docker/pkg/system" "github.com/opencontainers/runc/libcontainer/user" @@ -29,6 +30,9 @@ func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chown stat, err := system.Stat(path) if err == nil { + if !stat.IsDir() { + return &os.PathError{Op: "mkdir", Path: path, Err: syscall.ENOTDIR} + } if !chownExisting { return nil } @@ -54,7 +58,7 @@ func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chown paths = append(paths, dirPath) } } - if err := system.MkdirAll(path, mode, ""); err != nil && !os.IsExist(err) { + if err := system.MkdirAll(path, mode, ""); err != nil { return err } } else { diff --git a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go index 45d2878e38..94ca33afb1 100644 --- a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go +++ b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go @@ -11,7 +11,7 @@ import ( // Platforms such as Windows do not support the UID/GID concept. So make this // just a wrapper around system.MkdirAll. func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error { - if err := system.MkdirAll(path, mode, ""); err != nil && !os.IsExist(err) { + if err := system.MkdirAll(path, mode, ""); err != nil { return err } return nil diff --git a/components/cli/vendor/github.com/docker/docker/pkg/system/stat_unix.go b/components/cli/vendor/github.com/docker/docker/pkg/system/stat_unix.go index 91c7d121cc..9dcec6afbd 100644 --- a/components/cli/vendor/github.com/docker/docker/pkg/system/stat_unix.go +++ b/components/cli/vendor/github.com/docker/docker/pkg/system/stat_unix.go @@ -47,6 +47,11 @@ func (s StatT) Mtim() syscall.Timespec { return s.mtim } +// IsDir reports whether s describes a directory. +func (s StatT) IsDir() bool { + return s.mode&syscall.S_IFDIR != 0 +} + // Stat takes a path to a file and returns // a system.StatT type pertaining to that file. // diff --git a/components/cli/vendor/github.com/docker/docker/vendor.conf b/components/cli/vendor/github.com/docker/docker/vendor.conf index dc94fb4cf5..8c0b15a75f 100644 --- a/components/cli/vendor/github.com/docker/docker/vendor.conf +++ b/components/cli/vendor/github.com/docker/docker/vendor.conf @@ -1,6 +1,6 @@ # the following lines are in sorted order, FYI github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109 -github.com/Microsoft/hcsshim v0.6.5 +github.com/Microsoft/hcsshim v0.6.7 github.com/Microsoft/go-winio v0.4.5 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a @@ -30,7 +30,7 @@ github.com/moby/buildkit aaff9d591ef128560018433fe61beb802e149de8 github.com/tonistiigi/fsutil dea3a0da73aee887fc02142d995be764106ac5e2 #get libnetwork packages -github.com/docker/libnetwork 72fd7e5495eba86e28012e39b5ed63ef9ca9a97b +github.com/docker/libnetwork 9bca9a4a220b158cc94402e0f8c2c7714eb6f503 github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec @@ -42,7 +42,7 @@ github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870 github.com/docker/libkv 1d8431073ae03cdaedb198a89722f3aab6d418ef github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25 -github.com/vishvananda/netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969 +github.com/vishvananda/netlink b2de5d10e38ecce8607e6b438b6d174f389a004e github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060 github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374 github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d @@ -65,7 +65,7 @@ github.com/pborman/uuid v1.0 google.golang.org/grpc v1.3.0 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly -github.com/opencontainers/runc 0351df1c5a66838d0c392b4ac4cf9450de844e2d +github.com/opencontainers/runc b2567b37d7b75eb4cf325b77297b140ea686ce8f github.com/opencontainers/runtime-spec v1.0.0 github.com/opencontainers/image-spec v1.0.0 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0 @@ -79,13 +79,13 @@ github.com/golang/protobuf 7a211bcf3bce0e3f1d74f9894916e6f116ae83b4 # gelf logging driver deps github.com/Graylog2/go-gelf v2 -github.com/fluent/fluent-logger-golang v1.2.1 +github.com/fluent/fluent-logger-golang v1.3.0 # fluent-logger-golang deps github.com/philhofer/fwd 98c11a7a6ec829d672b03833c3d69a7fae1ca972 -github.com/tinylib/msgp 75ee40d2601edf122ef667e2a07d600d4c44490c +github.com/tinylib/msgp 3b556c64540842d4f82967be066a7f7fffc3adad # fsnotify -github.com/fsnotify/fsnotify v1.4.2 +github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1 # awslogs deps github.com/aws/aws-sdk-go v1.4.22 @@ -103,14 +103,15 @@ github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 # containerd -github.com/containerd/containerd 992280e8e265f491f7a624ab82f3e238be086e49 +github.com/containerd/containerd v1.0.0 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6 github.com/containerd/continuity 35d55c5e8dd23b32037d56cf97174aff3efdfa83 -github.com/containerd/cgroups f7dd103d3e4e696aa67152f6b4ddd1779a3455a9 +github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e github.com/containerd/go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788 -github.com/dmcgowan/go-tar 2e2c51242e8993c50445dab7c03c8e7febddd0cf +github.com/dmcgowan/go-tar go1.10 +github.com/stevvooe/ttrpc 76e68349ad9ab4d03d764c713826d31216715e4f # cluster github.com/docker/swarmkit de950a7ed842c7b7e47e9451cde9bf8f96031894 diff --git a/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go b/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_32.go similarity index 93% rename from components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go rename to components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_32.go index 3f7235ed15..c5ca5d8623 100644 --- a/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go +++ b/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_32.go @@ -1,4 +1,5 @@ -// +build linux,386 +// +build linux +// +build 386 arm package system diff --git a/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go index d7891a2ffa..11c3faafbf 100644 --- a/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go +++ b/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go @@ -1,4 +1,5 @@ -// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x +// +build linux +// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x package system diff --git a/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go b/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go deleted file mode 100644 index 31ff3deb13..0000000000 --- a/components/cli/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go +++ /dev/null @@ -1,25 +0,0 @@ -// +build linux,arm - -package system - -import ( - "golang.org/x/sys/unix" -) - -// Setuid sets the uid of the calling thread to the specified uid. -func Setuid(uid int) (err error) { - _, _, e1 := unix.RawSyscall(unix.SYS_SETUID32, uintptr(uid), 0, 0) - if e1 != 0 { - err = e1 - } - return -} - -// Setgid sets the gid of the calling thread to the specified gid. -func Setgid(gid int) (err error) { - _, _, e1 := unix.RawSyscall(unix.SYS_SETGID32, uintptr(gid), 0, 0) - if e1 != 0 { - err = e1 - } - return -} diff --git a/components/cli/vendor/github.com/opencontainers/runc/vendor.conf b/components/cli/vendor/github.com/opencontainers/runc/vendor.conf index 1266ee485f..0ab4685fd7 100644 --- a/components/cli/vendor/github.com/opencontainers/runc/vendor.conf +++ b/components/cli/vendor/github.com/opencontainers/runc/vendor.conf @@ -5,7 +5,7 @@ github.com/opencontainers/runtime-spec v1.0.0 # Core libcontainer functionality. github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08 github.com/opencontainers/selinux v1.0.0-rc1 -github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0 +github.com/seccomp/libseccomp-golang 84e90a91acea0f4e51e62bc1a75de18b1fc0790f github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16 github.com/vishvananda/netlink 1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270 @@ -15,7 +15,7 @@ github.com/coreos/pkg v3 github.com/godbus/dbus v3 github.com/golang/protobuf 18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8 # Command-line interface. -github.com/docker/docker 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d +github.com/cyphar/filepath-securejoin v0.2.1 github.com/docker/go-units v0.2.0 github.com/urfave/cli d53eb991652b1d438abdd34ce4bfa3ef1539108e golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce https://github.com/golang/sys