Skip to content

Commit 5f375a0

Browse files
committed
style: use implicit declaration
1 parent e9fcfa6 commit 5f375a0

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

client.go

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import (
3636
* root graphDriverName to create a new one.
3737
*/
3838
func NewPrometheus(root, graphDriverName string, maxParallelDownloads uint) (*Prometheus, error) {
39-
var err error
40-
4139
root = filepath.Clean(root)
4240
if _, err := os.Stat(root); os.IsNotExist(err) {
4341
err = os.MkdirAll(root, 0755)
@@ -270,50 +268,47 @@ func (p *Prometheus) PullManifestOnly(imageName string) (manifest.Manifest, dige
270268
systemCtx := &types.SystemContext{}
271269
ctx := context.Background()
272270

273-
var outputManifest manifest.Manifest
274-
275271
srcRef, err := alltransports.ParseImageName(fmt.Sprintf("docker://%s", imageName))
276272
if err != nil {
277-
return outputManifest, "", fmt.Errorf("failed to parse image name: %w", err)
273+
return nil, "", fmt.Errorf("failed to parse image name: %w", err)
278274
}
279275

280276
source, err := srcRef.NewImageSource(ctx, systemCtx)
281277
if err != nil {
282-
return outputManifest, "", fmt.Errorf("failed to create image source: %w", err)
278+
return nil, "", fmt.Errorf("failed to create image source: %w", err)
283279
}
284280
defer source.Close()
285281

286282
manRaw, manMime, err := source.GetManifest(ctx, nil)
287283
if err != nil {
288-
return outputManifest, "", fmt.Errorf("failed to fetch manifest: %w", err)
284+
return nil, "", fmt.Errorf("failed to fetch manifest: %w", err)
289285
}
290286

291287
if manifest.MIMETypeIsMultiImage(manMime) {
292288
list, err := manifest.ListFromBlob(manRaw, manMime)
293289
if err != nil {
294-
return outputManifest, "", fmt.Errorf("failed to parse manifest list: %w", err)
290+
return nil, "", fmt.Errorf("failed to parse manifest list: %w", err)
295291
}
296292

297293
instanceDigest, err := list.ChooseInstance(systemCtx)
298294
if err != nil {
299-
return outputManifest, "", fmt.Errorf("failed to select platform instance: %w", err)
295+
return nil, "", fmt.Errorf("failed to select platform instance: %w", err)
300296
}
301297

302298
manRaw, manMime, err = source.GetManifest(ctx, &instanceDigest)
303299
if err != nil {
304-
return outputManifest, "", fmt.Errorf("failed to fetch platform manifest: %w", err)
300+
return nil, "", fmt.Errorf("failed to fetch platform manifest: %w", err)
305301
}
306302
}
307303

308-
outputManifest, err = manifest.FromBlob(manRaw, manMime)
304+
outputManifest, err := manifest.FromBlob(manRaw, manMime)
309305
if err != nil {
310-
return outputManifest, "", fmt.Errorf("failed to parse platform specific manifest: %w", err)
306+
return nil, "", fmt.Errorf("failed to parse platform specific manifest: %w", err)
311307
}
312308

313-
var manifestDigest digest.Digest
314-
manifestDigest, err = manifest.Digest(manRaw)
309+
manifestDigest, err := manifest.Digest(manRaw)
315310
if err != nil {
316-
return outputManifest, "", fmt.Errorf("failed to fetch digest of manifest: %w", err)
311+
return nil, "", fmt.Errorf("failed to fetch digest of manifest: %w", err)
317312
}
318313

319314
return outputManifest, manifestDigest, nil

0 commit comments

Comments
 (0)