forked from Ivasoft/traefik
Migrate to dep 0.5 (#4684)
This commit is contained in:
committed by
Ludovic Fernandez
parent
57ae9a80d5
commit
358f125a58
9
vendor/github.com/containous/staert/toml.go
generated
vendored
9
vendor/github.com/containous/staert/toml.go
generated
vendored
@@ -47,10 +47,7 @@ func (ts *TomlSource) Parse(cmd *flaeg.Command) (*flaeg.Command, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
flgArgs, hasUnderField, err := generateArgs(metadata, boolFlags)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
flgArgs, hasUnderField := generateArgs(metadata, boolFlags)
|
||||
|
||||
err = flaeg.Load(cmd.Config, cmd.DefaultPointersConfig, flgArgs)
|
||||
if err != nil && err != flaeg.ErrParserNotFound {
|
||||
@@ -89,7 +86,7 @@ func findFile(filename string, dirNFile []string) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func generateArgs(metadata toml.MetaData, flags []string) ([]string, bool, error) {
|
||||
func generateArgs(metadata toml.MetaData, flags []string) ([]string, bool) {
|
||||
var flgArgs []string
|
||||
keys := metadata.Keys()
|
||||
hasUnderField := false
|
||||
@@ -117,5 +114,5 @@ func generateArgs(metadata toml.MetaData, flags []string) ([]string, bool, error
|
||||
}
|
||||
}
|
||||
|
||||
return flgArgs, hasUnderField, nil
|
||||
return flgArgs, hasUnderField
|
||||
}
|
||||
|
||||
5
vendor/github.com/containous/traefik-extra-service-fabric/servicefabric_config.go
generated
vendored
5
vendor/github.com/containous/traefik-extra-service-fabric/servicefabric_config.go
generated
vendored
@@ -48,6 +48,7 @@ func (p *Provider) buildConfiguration(services []ServiceItemExtended) (*types.Co
|
||||
"getWhiteList": getWhiteList,
|
||||
"getHeaders": getHeaders,
|
||||
"getRedirect": getRedirect,
|
||||
"getErrorPages": getErrorPages,
|
||||
|
||||
// SF Service Grouping
|
||||
"getGroupedServices": getFuncServicesGroupedByLabel(traefikSFGroupName),
|
||||
@@ -172,3 +173,7 @@ func getCircuitBreaker(service ServiceItemExtended) *types.CircuitBreaker {
|
||||
func getLoadBalancer(service ServiceItemExtended) *types.LoadBalancer {
|
||||
return label.GetLoadBalancer(service.Labels)
|
||||
}
|
||||
|
||||
func getErrorPages(service ServiceItemExtended) map[string]*types.ErrorPage {
|
||||
return label.GetErrorPages(service.Labels)
|
||||
}
|
||||
|
||||
13
vendor/github.com/containous/traefik-extra-service-fabric/servicefabric_tmpl.go
generated
vendored
13
vendor/github.com/containous/traefik-extra-service-fabric/servicefabric_tmpl.go
generated
vendored
@@ -162,6 +162,19 @@ const tmpl = `
|
||||
permanent = {{ $redirect.Permanent }}
|
||||
{{end}}
|
||||
|
||||
{{ $errorPages := getErrorPages $service }}
|
||||
{{if $errorPages }}
|
||||
[frontends."frontend-{{ $frontendName }}".errors]
|
||||
{{range $pageName, $page := $errorPages }}
|
||||
[frontends."frontend-{{ $frontendName }}".errors."{{ $pageName }}"]
|
||||
status = [{{range $page.Status }}
|
||||
"{{.}}",
|
||||
{{end}}]
|
||||
backend = "{{ $page.Backend }}"
|
||||
query = "{{ $page.Query }}"
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
{{ $headers := getHeaders $service }}
|
||||
{{if $headers }}
|
||||
[frontends."frontend-{{ $frontendName }}".headers]
|
||||
|
||||
Reference in New Issue
Block a user