fix(buildah,host-cleanup): do requested changes

Signed-off-by: Alexandr Zaytsev <alexandr.zaytsev@flant.com>

Author: nervgh

pkg/host_cleaning/cleanup_report.go

@@ -7,22 +7,22 @@ import (
 
 type cleanupReport prune.Report
 
-func newCleanupReport(size int) cleanupReport {
+func newCleanupReport() cleanupReport {
 	return cleanupReport{
-		ItemsDeleted:   make([]string, 0, size),
+		ItemsDeleted:   []string{},
 		SpaceReclaimed: 0,
 	}
 }
 
 func mapPruneReportToCleanupReport(report prune.Report) cleanupReport {
-	cr := newCleanupReport(0)
+	cr := newCleanupReport()
 	cr.SpaceReclaimed = report.SpaceReclaimed
 	cr.ItemsDeleted = append(cr.ItemsDeleted, report.ItemsDeleted...)
 	return cr
 }
 
 func mapImageListToCleanupReport(list image.ImagesList) cleanupReport {
-	report := newCleanupReport(0)
+	report := newCleanupReport()
 	report.ItemsDeleted = make([]string, 0, len(list))
 	for _, img := range list {
 		report.ItemsDeleted = append(report.ItemsDeleted, img.ID)

pkg/host_cleaning/local_backend_cleaner.go

@@ -475,7 +475,7 @@ func (cleaner *LocalBackendCleaner) pruneImages(ctx context.Context, options Run
 	if options.DryRun {
 		list, err := cleaner.backend.Images(ctx, buildImagesOptions(filters.ToPairs()...))
 		if err != nil {
-			return newCleanupReport(0), err
+			return newCleanupReport(), err
 		}
 		return mapImageListToCleanupReport(list), nil
 	}
@@ -485,9 +485,9 @@ func (cleaner *LocalBackendCleaner) pruneImages(ctx context.Context, options Run
 	case errors.Is(err, container_backend.ErrImageUsedByContainer),
 		errors.Is(err, container_backend.ErrPruneIsAlreadyRunning):
 		logboek.Context(ctx).Info().LogF("NOTE: Ignore image pruning: %s\n", err.Error())
-		return newCleanupReport(0), nil
+		return newCleanupReport(), nil
 	case err != nil:
-		return newCleanupReport(0), err
+		return newCleanupReport(), err
 	}
 
 	return mapPruneReportToCleanupReport(report), err
@@ -498,17 +498,17 @@ func (cleaner *LocalBackendCleaner) pruneVolumes(ctx context.Context, options Ru
 	if options.DryRun {
 		// NOTE: Buildah does not give us a way to precalculate pruned size.
 		// NOTE: Docker does not give us a way to precalculate pruned size.
-		return newCleanupReport(0), errOptionDryRunNotSupported
+		return newCleanupReport(), errOptionDryRunNotSupported
 	}
 
 	report, err := cleaner.backend.PruneVolumes(ctx, prune.Options{})
 
 	switch {
 	case errors.Is(err, container_backend.ErrPruneIsAlreadyRunning):
 		logboek.Context(ctx).Info().LogF("NOTE: Ignore volume pruning: %s\n", err.Error())
-		return newCleanupReport(0), nil
+		return newCleanupReport(), nil
 	case err != nil:
-		return newCleanupReport(0), err
+		return newCleanupReport(), err
 	}
 
 	return mapPruneReportToCleanupReport(report), err
@@ -517,10 +517,11 @@ func (cleaner *LocalBackendCleaner) pruneVolumes(ctx context.Context, options Ru
 func (cleaner *LocalBackendCleaner) cleanupWerfContainers(ctx context.Context, options RunGCOptions, vu volumeutils.VolumeUsage) (cleanupReport, error) {
 	containers, err := werfContainersByContainersOptions(ctx, cleaner.backend, buildContainersOptions())
 	if err != nil {
-		return newCleanupReport(0), fmt.Errorf("cannot get build containers: %w", err)
+		return newCleanupReport(), fmt.Errorf("cannot get build containers: %w", err)
 	}
 
-	report := newCleanupReport(len(containers))
+	report := newCleanupReport()
+	report.ItemsDeleted = make([]string, 0, len(containers))
 
 	for _, container := range containers {
 		containerName := werfContainerName(container)
@@ -531,7 +532,7 @@ func (cleaner *LocalBackendCleaner) cleanupWerfContainers(ctx context.Context, o
 		}
 
 		if ok, err := cleaner.isLocked(container_backend.ContainerLockName(containerName)); err != nil {
-			return newCleanupReport(0), fmt.Errorf("checking lock %q: %w", container_backend.ContainerLockName(containerName), err)
+			return newCleanupReport(), fmt.Errorf("checking lock %q: %w", container_backend.ContainerLockName(containerName), err)
 		} else if ok {
 			continue
 		}
@@ -569,10 +570,10 @@ func (cleaner *LocalBackendCleaner) cleanupWerfContainers(ctx context.Context, o
 func (cleaner *LocalBackendCleaner) cleanupWerfImages(ctx context.Context, options RunGCOptions, vu volumeutils.VolumeUsage, targetVolumeUsagePercentage float64) (cleanupReport, error) {
 	images, err := cleaner.werfImages(ctx)
 	if err != nil {
-		return newCleanupReport(0), err
+		return newCleanupReport(), err
 	}
 
-	report := newCleanupReport(0)
+	report := newCleanupReport()
 
 	tVu := targetVolumeUsagePercentage
 

pkg/host_cleaning/local_backend_cleaner_test.go

@@ -127,7 +127,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 
 			report, err := cleaner.pruneImages(ctx, RunGCOptions{})
 			Expect(err).To(Equal(err0))
-			Expect(report).To(Equal(newCleanupReport(0)))
+			Expect(report).To(Equal(newCleanupReport()))
 		})
 		It("should return err=nil and empty report if opts.DryRun=false calling backend.PruneImages() which returns pruneErr=ErrImageUsedByContainer", func(ctx context.Context) {
 			ctx = logging.WithLogger(ctx)
@@ -136,7 +136,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 
 			report, err := cleaner.pruneImages(ctx, RunGCOptions{})
 			Expect(err).To(Succeed())
-			Expect(report).To(Equal(newCleanupReport(0)))
+			Expect(report).To(Equal(newCleanupReport()))
 		})
 		It("should return err=nil and empty report if opts.DryRun=false calling backend.PruneImages() which returns pruneErr=ErrPruneIsAlreadyRunning", func(ctx context.Context) {
 			ctx = logging.WithLogger(ctx)
@@ -145,7 +145,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 
 			report, err := cleaner.pruneImages(ctx, RunGCOptions{})
 			Expect(err).To(Succeed())
-			Expect(report).To(Equal(newCleanupReport(0)))
+			Expect(report).To(Equal(newCleanupReport()))
 		})
 		It("should return err=nil and full report if opts.DryRun=false calling backend.PruneImages() which returns pruneErr=nil", func(ctx SpecContext) {
 			pruneReport := prune.Report{
@@ -165,7 +165,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 				DryRun: true,
 			})
 			Expect(errors.Is(err, errOptionDryRunNotSupported)).To(BeTrue())
-			Expect(report).To(Equal(newCleanupReport(0)))
+			Expect(report).To(Equal(newCleanupReport()))
 		})
 		It("should return err=nil and empty report if opts.DryRun=false calling backend.PruneVolumes() which returns returns pruneErr=ErrPruneIsAlreadyRunning", func(ctx context.Context) {
 			ctx = logging.WithLogger(ctx)
@@ -174,15 +174,15 @@ var _ = Describe("LocalBackendCleaner", func() {
 
 			report, err := cleaner.pruneVolumes(ctx, RunGCOptions{})
 			Expect(err).To(Succeed())
-			Expect(report).To(Equal(newCleanupReport(0)))
+			Expect(report).To(Equal(newCleanupReport()))
 		})
 		It("should return err=some_err and empty report if opts.DryRun=false calling backend.PruneVolumes() which returns returns pruneErr=err", func(ctx SpecContext) {
 			err0 := errors.New("some_err")
 			backend.EXPECT().PruneVolumes(ctx, prune.Options{}).Return(prune.Report{}, err0)
 
 			report, err := cleaner.pruneVolumes(ctx, RunGCOptions{})
 			Expect(err).To(Equal(err0))
-			Expect(report).To(Equal(newCleanupReport(0)))
+			Expect(report).To(Equal(newCleanupReport()))
 		})
 		It("should return err=nil and full report if opts.DryRun=false calling backend.PruneVolumes() which returns pruneErr=nil", func(ctx SpecContext) {
 			pruneReport := prune.Report{
@@ -234,7 +234,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 			},
 			true,
 			container_backend.ErrCannotRemovePausedContainer,
-			newCleanupReport(0),
+			newCleanupReport(),
 		),
 		Entry(
 			"should not return err if backend.Rm() returns 'container is running' error",
@@ -245,7 +245,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 			},
 			true,
 			container_backend.ErrCannotRemoveRunningContainer,
-			newCleanupReport(0),
+			newCleanupReport(),
 		),
 		Entry(
 			"should not call backend.Rm() if lock was not acquired",
@@ -256,7 +256,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 			},
 			false,
 			nil,
-			newCleanupReport(0),
+			newCleanupReport(),
 		),
 		Entry(
 			"should return full report in dry run mode if lock was acquired",
@@ -285,7 +285,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 			},
 			false,
 			nil,
-			newCleanupReport(0),
+			newCleanupReport(),
 		),
 	)
 
@@ -399,7 +399,7 @@ var _ = Describe("LocalBackendCleaner", func() {
 				TotalBytes: 1000,
 			},
 			[]string{},
-			newCleanupReport(0),
+			newCleanupReport(),
 		),
 	)