From 10c748cd39377319fbb485ff589b2c74b26ad73b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 16 Apr 2020 13:20:38 +0200 Subject: [PATCH] imageWithDigestString: return image unmodified if there are no changes Instead of returning an empty string, return the image unmodified Signed-off-by: Sebastiaan van Stijn --- client/service_create.go | 12 ++++-------- client/service_update.go | 8 ++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/client/service_create.go b/client/service_create.go index 05c1bbd215..5dd6a430cb 100644 --- a/client/service_create.go +++ b/client/service_create.go @@ -44,9 +44,7 @@ func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, if img, imgPlatforms, err := imageDigestAndPlatforms(ctx, cli, service.TaskTemplate.ContainerSpec.Image, options.EncodedRegistryAuth); err != nil { resolveWarning = digestWarning(service.TaskTemplate.ContainerSpec.Image) } else { - if img != "" { - service.TaskTemplate.ContainerSpec.Image = img - } + service.TaskTemplate.ContainerSpec.Image = img if len(imgPlatforms) > 0 { if service.TaskTemplate.Placement == nil { service.TaskTemplate.Placement = &swarm.Placement{} @@ -63,9 +61,7 @@ func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, if img, imgPlatforms, err := imageDigestAndPlatforms(ctx, cli, service.TaskTemplate.PluginSpec.Remote, options.EncodedRegistryAuth); err != nil { resolveWarning = digestWarning(service.TaskTemplate.PluginSpec.Remote) } else { - if img != "" { - service.TaskTemplate.PluginSpec.Remote = img - } + service.TaskTemplate.PluginSpec.Remote = img if len(imgPlatforms) > 0 { if service.TaskTemplate.Placement == nil { service.TaskTemplate.Placement = &swarm.Placement{} @@ -123,7 +119,7 @@ func imageDigestAndPlatforms(ctx context.Context, cli DistributionAPIClient, ima // imageWithDigestString takes an image string and a digest, and updates // the image string if it didn't originally contain a digest. It returns -// an empty string if there are no updates. +// image unmodified in other situations. func imageWithDigestString(image string, dgst digest.Digest) string { namedRef, err := reference.ParseNormalizedNamed(image) if err == nil { @@ -135,7 +131,7 @@ func imageWithDigestString(image string, dgst digest.Digest) string { } } } - return "" + return image } // imageWithTagString takes an image string, and returns a tagged image diff --git a/client/service_update.go b/client/service_update.go index 4a4d98052b..4a930eed14 100644 --- a/client/service_update.go +++ b/client/service_update.go @@ -52,9 +52,7 @@ func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version if img, imgPlatforms, err := imageDigestAndPlatforms(ctx, cli, service.TaskTemplate.ContainerSpec.Image, options.EncodedRegistryAuth); err != nil { resolveWarning = digestWarning(service.TaskTemplate.ContainerSpec.Image) } else { - if img != "" { - service.TaskTemplate.ContainerSpec.Image = img - } + service.TaskTemplate.ContainerSpec.Image = img if len(imgPlatforms) > 0 { if service.TaskTemplate.Placement == nil { service.TaskTemplate.Placement = &swarm.Placement{} @@ -71,9 +69,7 @@ func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version if img, imgPlatforms, err := imageDigestAndPlatforms(ctx, cli, service.TaskTemplate.PluginSpec.Remote, options.EncodedRegistryAuth); err != nil { resolveWarning = digestWarning(service.TaskTemplate.PluginSpec.Remote) } else { - if img != "" { - service.TaskTemplate.PluginSpec.Remote = img - } + service.TaskTemplate.PluginSpec.Remote = img if len(imgPlatforms) > 0 { if service.TaskTemplate.Placement == nil { service.TaskTemplate.Placement = &swarm.Placement{}