fix: ensure that all load bundle methods will check the size (#227)

Upstream-repository: api
Upstream-commit: bbe9c3235aff58180a439b7f1b4b05aade99cc65

Author: camilamacedo86

staging/api/pkg/manifests/bundleloader.go

@@ -36,13 +36,7 @@ func (b *bundleLoader) LoadBundle() error {
 		errs = append(errs, err)
 	}
 
-	// Compress the bundle to check its size
-	if data, err := os.ReadFile(b.dir); err == nil {
-		if content, err := encoding.GzipBase64Encode(data); err != nil {
-			total := int64(len(content))
-			b.bundle.CompressedSize = &total
-		}
-	}
+	errs = append(errs, b.calculateCompressedBundleSize())
 
 	if !b.foundCSV {
 		errs = append(errs, fmt.Errorf("unable to find a csv in bundle directory %s", b.dir))
@@ -53,6 +47,35 @@ func (b *bundleLoader) LoadBundle() error {
 	return utilerrors.NewAggregate(errs)
 }
 
+// Compress the bundle to check its size
+func (b *bundleLoader) calculateCompressedBundleSize() error {
+	err := filepath.Walk(b.dir,
+		func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+
+			if !info.IsDir() {
+				if data, err := os.ReadFile(path); err == nil {
+					content, err := encoding.GzipBase64Encode(data)
+					if err != nil {
+						return err
+					}
+					total := int64(len(content))
+					if b.bundle.CompressedSize != nil {
+						total += *b.bundle.CompressedSize
+					}
+					b.bundle.CompressedSize = &total
+				}
+			}
+			return nil
+		})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // collectWalkErrs calls the given walk func and appends any non-nil, non skip dir error returned to the given errors slice.
 func collectWalkErrs(walk filepath.WalkFunc, errs *[]error) filepath.WalkFunc {
 	return func(path string, f os.FileInfo, err error) (walkErr error) {

staging/api/pkg/validation/internal/bundle_test.go

@@ -237,3 +237,43 @@ func TestBundleSize(t *testing.T) {
 		})
 	}
 }
+
+func Test_EnsureGetBundleSizeValue(t *testing.T) {
+	type args struct {
+		annotations    map[string]string
+		bundleDir      string
+		imageIndexPath string
+	}
+	tests := []struct {
+		name        string
+		args        args
+		wantWarning bool
+		warnStrings []string
+	}{
+		{
+			name: "should calculate the bundle size and not raise warnings when a valid bundle is informed",
+			args: args{
+				bundleDir: "./testdata/valid_bundle",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			// Validate the bundle object
+			bundle, err := manifests.GetBundleFromDir(tt.args.bundleDir)
+			require.NoError(t, err)
+
+			results := validateBundle(bundle)
+			require.Equal(t, tt.wantWarning, len(results.Warnings) > 0)
+			if tt.wantWarning {
+				require.Equal(t, len(tt.warnStrings), len(results.Warnings))
+				for _, w := range results.Warnings {
+					wString := w.Error()
+					require.Contains(t, tt.warnStrings, wString)
+				}
+			}
+		})
+	}
+}