Add test for span arg validation

This adds a test that a user cannot specify a min-layer-size or
span-size that is negative or larger than what can fit into a signed
64-bit integer.

Signed-off-by: Kern Walster <[email protected]>

Author: Kern--

integration/create_test.go

@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"math"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -33,6 +34,69 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+func TestCreateConvertParameterValidation(t *testing.T) {
+	tests := []struct {
+		name          string
+		minLayerSize  string
+		spanSize      string
+		expectedError string
+	}{
+		{
+			name:          "minLayerSize < 0 fails validation",
+			minLayerSize:  "-1",
+			spanSize:      "0",
+			expectedError: "min layer size must be >= 0",
+		},
+		{
+			name:          "spanSize < 0 fails validation",
+			minLayerSize:  "0",
+			spanSize:      "-1",
+			expectedError: "span size must be >= 0",
+		},
+		{
+			name:          "minLayerSize > int64.MaxValue fails validation",
+			minLayerSize:  fmt.Sprintf("%d", uint64(math.MaxInt64)+1),
+			spanSize:      "",
+			expectedError: "for flag -min-layer-size: value out of range",
+		},
+		{
+			name:          "spanSize > int64.MaxValue fails validation",
+			minLayerSize:  "0",
+			spanSize:      fmt.Sprintf("%d", uint64(math.MaxInt64)+1),
+			expectedError: "for flag -span-size: value out of range",
+		},
+	}
+
+	sh, done := newSnapshotterBaseShell(t)
+	defer done()
+	rebootContainerd(t, sh, "", "")
+	image := dockerhub(alpineImage)
+	sh.X("nerdctl", "pull", image.ref)
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			t.Run("create", func(t *testing.T) {
+				b, err := sh.CombinedOLog("soci", "create", "--min-layer-size", test.minLayerSize, "--span-size", test.spanSize, image.ref)
+				if !strings.Contains(string(b), test.expectedError) {
+					t.Fatalf("expected error to contain %q, got %q", test.expectedError, string(b))
+				}
+				if err == nil {
+					t.Fatal("expected error but got nil")
+				}
+			})
+
+			t.Run("convert", func(t *testing.T) {
+				b, err := sh.CombinedOLog("soci", "convert", "--min-layer-size", test.minLayerSize, "--span-size", test.spanSize, image.ref, image.ref)
+				if !strings.Contains(string(b), test.expectedError) {
+					t.Fatalf("convert: expected error to contain %q, got %q", test.expectedError, string(b))
+				}
+				if err == nil {
+					t.Fatal("convert: expected error but got nil")
+				}
+			})
+		})
+	}
+}
+
 func TestSociCreateEmptyIndex(t *testing.T) {
 	sh, done := newSnapshotterBaseShell(t)
 	defer done()

soci/soci_index.go

@@ -331,6 +331,9 @@ type BuilderOption func(c *builderConfig) error
 // WithSpanSize specifies span size.
 func WithSpanSize(spanSize int64) BuilderOption {
 	return func(c *builderConfig) error {
+		if spanSize < 0 {
+			return fmt.Errorf("span size must be >= 0")
+		}
 		c.spanSize = spanSize
 		return nil
 	}
@@ -339,6 +342,9 @@ func WithSpanSize(spanSize int64) BuilderOption {
 // WithMinLayerSize specifies min layer size to build a ztoc for a layer.
 func WithMinLayerSize(minLayerSize int64) BuilderOption {
 	return func(c *builderConfig) error {
+		if minLayerSize < 0 {
+			return fmt.Errorf("min layer size must be >= 0")
+		}
 		c.minLayerSize = minLayerSize
 		return nil
 	}