Skip to content

Commit bb0e9ad

Browse files
thaJeztahvvoland
authored andcommitted
remove redundant error-handling for registry.ParseRepositoryInfo
Since [moby@c2c3d59], [registry.ParseRepositoryInfo] now always returns a nil error, so we can remove the error handling. [registry.ParseRepositoryInfo]: https://github.com/moby/moby/blob/5f0d6731eb015c8e46b2ae9bb1803d005f2513be/registry/config.go#L414-L443 [moby@c2c3d59]: moby/moby@c2c3d59 Signed-off-by: Sebastiaan van Stijn <[email protected]> Signed-off-by: Paweł Gronowski <[email protected]>
1 parent e0979b3 commit bb0e9ad

File tree

7 files changed

+8
-37
lines changed

7 files changed

+8
-37
lines changed

cli/command/image/push.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ Image index won't be pushed, meaning that other manifests, including attestation
7474
}
7575

7676
// RunPush performs a push against the engine based on the specified options
77-
//
78-
//nolint:gocyclo
7977
func RunPush(ctx context.Context, dockerCli command.Cli, opts pushOptions) error {
8078
var platform *ocispec.Platform
8179
out := tui.NewOutput(dockerCli.Out())
@@ -107,10 +105,7 @@ To push the complete multi-platform image, remove the --platform flag.
107105
}
108106

109107
// Resolve the Repository name from fqn to RepositoryInfo
110-
repoInfo, err := registry.ParseRepositoryInfo(ref)
111-
if err != nil {
112-
return err
113-
}
108+
repoInfo, _ := registry.ParseRepositoryInfo(ref)
114109

115110
// Resolve the Auth config relevant for this server
116111
authConfig := command.ResolveAuthConfig(dockerCli.ConfigFile(), repoInfo.Index)

cli/command/plugin/install.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ func buildPullConfig(ctx context.Context, dockerCli command.Cli, opts pluginOpti
6464
return types.PluginInstallOptions{}, err
6565
}
6666

67-
repoInfo, err := registry.ParseRepositoryInfo(ref)
68-
if err != nil {
69-
return types.PluginInstallOptions{}, err
70-
}
67+
repoInfo, _ := registry.ParseRepositoryInfo(ref)
7168

7269
remote := ref.String()
7370

cli/command/plugin/push.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ func runPush(ctx context.Context, dockerCli command.Cli, opts pushOptions) error
4949

5050
named = reference.TagNameOnly(named)
5151

52-
repoInfo, err := registry.ParseRepositoryInfo(named)
53-
if err != nil {
54-
return err
55-
}
52+
repoInfo, _ := registry.ParseRepositoryInfo(named)
5653
authConfig := command.ResolveAuthConfig(dockerCli.ConfigFile(), repoInfo.Index)
5754
encodedAuth, err := registrytypes.EncodeAuthConfig(authConfig)
5855
if err != nil {

cli/command/service/trust.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@ func resolveServiceImageDigestContentTrust(dockerCli command.Cli, service *swarm
5151
}
5252

5353
func trustedResolveDigest(cli command.Cli, ref reference.NamedTagged) (reference.Canonical, error) {
54-
repoInfo, err := registry.ParseRepositoryInfo(ref)
55-
if err != nil {
56-
return nil, err
57-
}
58-
54+
repoInfo, _ := registry.ParseRepositoryInfo(ref)
5955
authConfig := command.ResolveAuthConfig(cli.ConfigFile(), repoInfo.Index)
6056

6157
notaryRepo, err := trust.GetNotaryRepository(cli.In(), cli.Out(), command.UserAgent(), repoInfo, &authConfig, "pull")

cli/registry/client/endpoint.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ func (r repositoryEndpoint) BaseURL() string {
3030
}
3131

3232
func newDefaultRepositoryEndpoint(ref reference.Named, insecure bool) (repositoryEndpoint, error) {
33-
repoInfo, err := registry.ParseRepositoryInfo(ref)
34-
if err != nil {
35-
return repositoryEndpoint{}, err
36-
}
33+
repoInfo, _ := registry.ParseRepositoryInfo(ref)
3734
endpoint, err := getDefaultEndpointFromRepoInfo(repoInfo)
3835
if err != nil {
3936
return repositoryEndpoint{}, err

cli/registry/client/fetcher.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,7 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
220220
return err
221221
}
222222

223-
repoInfo, err := registry.ParseRepositoryInfo(namedRef)
224-
if err != nil {
225-
return err
226-
}
223+
repoInfo, _ := registry.ParseRepositoryInfo(namedRef)
227224

228225
confirmedTLSRegistries := make(map[string]bool)
229226
for _, endpoint := range endpoints {
@@ -273,11 +270,6 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
273270

274271
// allEndpoints returns a list of endpoints ordered by priority (v2, http).
275272
func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoint, error) {
276-
repoInfo, err := registry.ParseRepositoryInfo(namedRef)
277-
if err != nil {
278-
return nil, err
279-
}
280-
281273
var serviceOpts registry.ServiceOptions
282274
if insecure {
283275
logrus.Debugf("allowing insecure registry for: %s", reference.Domain(namedRef))
@@ -287,6 +279,7 @@ func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoi
287279
if err != nil {
288280
return []registry.APIEndpoint{}, err
289281
}
282+
repoInfo, _ := registry.ParseRepositoryInfo(namedRef)
290283
endpoints, err := registryService.LookupPullEndpoints(reference.Domain(repoInfo.Name))
291284
logrus.Debugf("endpoints for %s: %v", namedRef, endpoints)
292285
return endpoints, err

cli/trust/trust.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,7 @@ func GetImageReferencesAndAuth(ctx context.Context,
322322
}
323323

324324
// Resolve the Repository name from fqn to RepositoryInfo
325-
repoInfo, err := registry.ParseRepositoryInfo(ref)
326-
if err != nil {
327-
return ImageRefAndAuth{}, err
328-
}
329-
325+
repoInfo, _ := registry.ParseRepositoryInfo(ref)
330326
authConfig := authResolver(ctx, repoInfo.Index)
331327
return ImageRefAndAuth{
332328
original: imgName,

0 commit comments

Comments
 (0)