Merge pull request moby#48467 from thaJeztah/image_tarexpost_cleanup

image/tarexport: fix some minor linting issues
thaJeztah · Sep 11, 2024 · bcf105d · bcf105d
2 parents 3bfee27 + 7263cd2
commit bcf105d
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/image/tarexport/save.go b/image/tarexport/save.go
@@ -45,14 +45,14 @@ type saveSession struct {
 }
 
 func (l *tarexporter) Save(ctx context.Context, names []string, outStream io.Writer) error {
-	images, err := l.parseNames(ctx, names)
+	imgDescriptors, err := l.parseNames(ctx, names)
 	if err != nil {
 		return err
 	}
 
 	// Release all the image top layer references
-	defer l.releaseLayerReferences(images)
-	return (&saveSession{tarexporter: l, images: images}).save(ctx, outStream)
+	defer l.releaseLayerReferences(imgDescriptors)
+	return (&saveSession{tarexporter: l, images: imgDescriptors}).save(ctx, outStream)
 }
 
 // parseNames will parse the image names to a map which contains image.ID to *imageDescriptor.
@@ -169,11 +169,11 @@ func (l *tarexporter) takeLayerReference(id image.ID, imgDescr *imageDescriptor)
 	if topLayerID == "" {
 		return nil
 	}
-	layer, err := l.lss.Get(topLayerID)
+	topLayer, err := l.lss.Get(topLayerID)
 	if err != nil {
 		return err
 	}
-	imgDescr.layerRef = layer
+	imgDescr.layerRef = topLayer
 	return nil
 }
 
@@ -237,7 +237,7 @@ func (s *saveSession) save(ctx context.Context, outStream io.Writer) error {
 			})
 		}
 
-		m := ocispec.Manifest{
+		data, err := json.Marshal(ocispec.Manifest{
 			Versioned: specs.Versioned{
 				SchemaVersion: 2,
 			},
@@ -248,9 +248,7 @@ func (s *saveSession) save(ctx context.Context, outStream io.Writer) error {
 				Size:      int64(len(imageDescr.image.RawJSON())),
 			},
 			Layers: foreign,
-		}
-
-		data, err := json.Marshal(m)
+		})
 		if err != nil {
 			return errors.Wrap(err, "error marshaling manifest")
 		}
@@ -269,13 +267,11 @@ func (s *saveSession) save(ctx context.Context, outStream io.Writer) error {
 		if err := system.Chtimes(mFile, time.Unix(0, 0), time.Unix(0, 0)); err != nil {
 			return errors.Wrap(err, "error setting blob directory timestamps")
 		}
-		size := int64(len(data))
 
 		untaggedMfstDesc := ocispec.Descriptor{
 			MediaType: ocispec.MediaTypeImageManifest,
 			Digest:    dgst,
-			Size:      size,
-			Platform:  m.Config.Platform,
+			Size:      int64(len(data)),
 		}
 		for _, ref := range imageDescr.refs {
 			familiarName := reference.FamiliarName(ref)