3d267a0dc8
This adds a new parameter insertDefaults to /services/{id}. When this is
set, an empty field (such as UpdateConfig) will be populated with
default values in the API response. Make "service inspect" use this, so
that empty fields do not result in missing information when inspecting a
service.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1d274e9acfe96b98be3ec956636ff4e5c70e98af
Component: engine
71 lines
1.7 KiB
Go
71 lines
1.7 KiB
Go
package idresolver
|
|
|
|
import (
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/client"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// IDResolver provides ID to Name resolution.
|
|
type IDResolver struct {
|
|
client client.APIClient
|
|
noResolve bool
|
|
cache map[string]string
|
|
}
|
|
|
|
// New creates a new IDResolver.
|
|
func New(client client.APIClient, noResolve bool) *IDResolver {
|
|
return &IDResolver{
|
|
client: client,
|
|
noResolve: noResolve,
|
|
cache: make(map[string]string),
|
|
}
|
|
}
|
|
|
|
func (r *IDResolver) get(ctx context.Context, t interface{}, id string) (string, error) {
|
|
switch t.(type) {
|
|
case swarm.Node:
|
|
node, _, err := r.client.NodeInspectWithRaw(ctx, id)
|
|
if err != nil {
|
|
return id, nil
|
|
}
|
|
if node.Spec.Annotations.Name != "" {
|
|
return node.Spec.Annotations.Name, nil
|
|
}
|
|
if node.Description.Hostname != "" {
|
|
return node.Description.Hostname, nil
|
|
}
|
|
return id, nil
|
|
case swarm.Service:
|
|
service, _, err := r.client.ServiceInspectWithRaw(ctx, id, types.ServiceInspectOptions{})
|
|
if err != nil {
|
|
return id, nil
|
|
}
|
|
return service.Spec.Annotations.Name, nil
|
|
default:
|
|
return "", errors.Errorf("unsupported type")
|
|
}
|
|
|
|
}
|
|
|
|
// Resolve will attempt to resolve an ID to a Name by querying the manager.
|
|
// Results are stored into a cache.
|
|
// If the `-n` flag is used in the command-line, resolution is disabled.
|
|
func (r *IDResolver) Resolve(ctx context.Context, t interface{}, id string) (string, error) {
|
|
if r.noResolve {
|
|
return id, nil
|
|
}
|
|
if name, ok := r.cache[id]; ok {
|
|
return name, nil
|
|
}
|
|
name, err := r.get(ctx, t, id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
r.cache[id] = name
|
|
return name, nil
|
|
}
|