Merge pull request #167 from tri-adam/create-at-path-fix

Author: tri-adam

pkg/sif/create.go

@@ -303,10 +303,12 @@ func CreateContainerAtPath(path string, opts ...CreateOpt) (*FileImage, error) {
 	if err != nil {
 		fp.Close()
 		os.Remove(fp.Name())
+
+		return nil, err
 	}
 
 	f.closeOnUnload = true
-	return f, err
+	return f, nil
 }
 
 func zeroData(fimg *FileImage, descr *rawDescriptor) error {

pkg/sif/create_test.go

@@ -40,9 +40,22 @@ func TestNextAligned(t *testing.T) {
 
 func TestCreateContainer(t *testing.T) {
 	tests := []struct {
-		name string
-		opts []CreateOpt
+		name    string
+		opts    []CreateOpt
+		wantErr error
 	}{
+		{
+			name: "ErrInsufficientCapacity",
+			opts: []CreateOpt{
+				OptCreateWithID(testID),
+				OptCreateWithTime(testTime),
+				OptCreateWithDescriptorCapacity(0),
+				OptCreateWithDescriptors(
+					getDescriptorInput(t, DataGeneric, []byte{0xfa, 0xce}),
+				),
+			},
+			wantErr: errInsufficientCapacity,
+		},
 		{
 			name: "Empty",
 			opts: []CreateOpt{
@@ -136,25 +149,41 @@ func TestCreateContainer(t *testing.T) {
 			var b Buffer
 
 			f, err := CreateContainer(&b, tt.opts...)
-			if err != nil {
-				t.Fatal(err)
-			}
 
-			if err := f.UnloadContainer(); err != nil {
-				t.Fatal(err)
+			if got, want := err, tt.wantErr; !errors.Is(got, want) {
+				t.Fatalf("got error %v, want %v", got, want)
 			}
 
-			g := goldie.New(t, goldie.WithTestNameForDir(true))
-			g.Assert(t, tt.name, b.Bytes())
+			if err == nil {
+				if err := f.UnloadContainer(); err != nil {
+					t.Error(err)
+				}
+
+				g := goldie.New(t, goldie.WithTestNameForDir(true))
+				g.Assert(t, tt.name, b.Bytes())
+			}
 		})
 	}
 }
 
 func TestCreateContainerAtPath(t *testing.T) {
 	tests := []struct {
-		name string
-		opts []CreateOpt
+		name    string
+		opts    []CreateOpt
+		wantErr error
 	}{
+		{
+			name: "ErrInsufficientCapacity",
+			opts: []CreateOpt{
+				OptCreateWithID(testID),
+				OptCreateWithTime(testTime),
+				OptCreateWithDescriptorCapacity(0),
+				OptCreateWithDescriptors(
+					getDescriptorInput(t, DataGeneric, []byte{0xfa, 0xce}),
+				),
+			},
+			wantErr: errInsufficientCapacity,
+		},
 		{
 			name: "Empty",
 			opts: []CreateOpt{
@@ -237,21 +266,24 @@ func TestCreateContainerAtPath(t *testing.T) {
 			tf.Close()
 
 			f, err := CreateContainerAtPath(tf.Name(), tt.opts...)
-			if err != nil {
-				t.Fatal(err)
-			}
 
-			if err := f.UnloadContainer(); err != nil {
-				t.Fatal(err)
+			if got, want := err, tt.wantErr; !errors.Is(got, want) {
+				t.Fatalf("got error %v, want %v", got, want)
 			}
 
-			b, err := os.ReadFile(tf.Name())
-			if err != nil {
-				t.Fatal(err)
-			}
+			if err == nil {
+				if err := f.UnloadContainer(); err != nil {
+					t.Error(err)
+				}
 
-			g := goldie.New(t, goldie.WithTestNameForDir(true))
-			g.Assert(t, tt.name, b)
+				b, err := os.ReadFile(tf.Name())
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				g := goldie.New(t, goldie.WithTestNameForDir(true))
+				g.Assert(t, tt.name, b)
+			}
 		})
 	}
 }