fix: address final review findings for master/agent phase 1 (#6)
- inventory: resolve the image reference via ContainerInspect when a moved tag makes ContainerList report the image ID - store: allow reusing a revoked agent's name (partial unique index) and mark the revoked agent's compose/container services removed - web: publish a services event on revoke; no-store on the one-time token page - webauth: reject empty OIDC state; accept the CSRF form token from the body only - agent conn: bound the WebSocket handshake to 30s - hub: log agent_replaced when a connection replaces an older one
This commit is contained in:
@@ -28,6 +28,7 @@ const (
|
||||
// *client.Client satisfies it.
|
||||
type DockerClient interface {
|
||||
ContainerList(ctx context.Context, opts container.ListOptions) ([]container.Summary, error)
|
||||
ContainerInspect(ctx context.Context, containerID string) (container.InspectResponse, error)
|
||||
ImageList(ctx context.Context, opts image.ListOptions) ([]image.Summary, error)
|
||||
ServiceList(ctx context.Context, opts swarm.ServiceListOptions) ([]swarm.Service, error)
|
||||
Info(ctx context.Context) (system.Info, error)
|
||||
@@ -83,7 +84,11 @@ func (c *Collector) Snapshot(ctx context.Context) ([]protocol.Service, error) {
|
||||
if _, isTask := ct.Labels[labelSwarmTask]; isTask {
|
||||
continue
|
||||
}
|
||||
svc := c.fromContainer(ct, repoDigests[ct.ImageID])
|
||||
ref, err := c.imageRef(ctx, ct)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
svc := c.fromContainer(ct, ref, repoDigests[ct.ImageID])
|
||||
if prev, ok := byKey[svc.Key()]; ok {
|
||||
svc = mergeReplicas(prev, svc)
|
||||
}
|
||||
@@ -112,10 +117,28 @@ func (c *Collector) Snapshot(ctx context.Context) ([]protocol.Service, error) {
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *Collector) fromContainer(ct container.Summary, repoDigests []string) protocol.Service {
|
||||
// imageRef returns the image reference the container was created from.
|
||||
// When the tag has since moved to another image, ContainerList reports the
|
||||
// image ID ("sha256:...") instead, so the reference is read from the
|
||||
// container's config.
|
||||
func (c *Collector) imageRef(ctx context.Context, ct container.Summary) (string, error) {
|
||||
if !strings.HasPrefix(ct.Image, "sha256:") {
|
||||
return ct.Image, nil
|
||||
}
|
||||
insp, err := c.cli.ContainerInspect(ctx, ct.ID)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("docker container inspect %s: %w", ct.ID, err)
|
||||
}
|
||||
if insp.Config == nil {
|
||||
return ct.Image, nil
|
||||
}
|
||||
return insp.Config.Image, nil
|
||||
}
|
||||
|
||||
func (c *Collector) fromContainer(ct container.Summary, ref string, repoDigests []string) protocol.Service {
|
||||
svc := protocol.Service{
|
||||
Image: ct.Image,
|
||||
Digest: digestFor(ct.Image, repoDigests),
|
||||
Image: ref,
|
||||
Digest: digestFor(ref, repoDigests),
|
||||
Status: containerStatus(ct.State),
|
||||
Self: c.selfID != "" && strings.HasPrefix(ct.ID, c.selfID),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user