Revert "add WithFilePrefix"

This reverts commit 436a866f5d.

This is not a good place for such auxiliary functionality; will be moved
elsewhere.

rootfs/options.go

@@ -1,20 +0,0 @@
-package rootfs
-
-type options struct {
-	filePrefix string
-}
-
-type Option interface {
-	apply(*options)
-}
-
-type filePrefixOption string
-
-func (p filePrefixOption) apply(opts *options) {
-	opts.filePrefix = string(p)
-}
-
-// WithFilePrefixOption adds a prefix to all files in the output archive.
-func WithFilePrefix(p string) Option {
-	return filePrefixOption(p)
-}

rootfs/rootfs.go

@@ -35,14 +35,7 @@ type (
 // Flatten flattens a docker image to a tarball. The underlying io.Writer
 // should be an open file handle, which the caller is responsible for closing
 // themselves
-func Flatten(rd io.ReadSeeker, w io.Writer, opts ...Option) (_err error) {
-	options := options{
-		filePrefix: "",
-	}
-	for _, o := range opts {
-		o.apply(&options)
-	}
-
+func Flatten(rd io.ReadSeeker, w io.Writer) (_err error) {
 	tr := tar.NewReader(rd)
 	var closer func() error
 	var err error
@@ -183,8 +176,7 @@ func Flatten(rd io.ReadSeeker, w io.Writer, opts ...Option) (_err error) {
 			if hdr.Typeflag != tar.TypeDir && file2layer[hdr.Name] != i {
 				continue
 			}
-			prefix := options.filePrefix
-			if err := writeFile(tr, tw, hdr, prefix); err != nil {
+			if err := writeFile(tr, tw, hdr); err != nil {
 				return err
 			}
 		}
@@ -195,10 +187,10 @@ func Flatten(rd io.ReadSeeker, w io.Writer, opts ...Option) (_err error) {
 	return nil
 }
 
-func writeFile(tr *tar.Reader, tw *tar.Writer, hdr *tar.Header, prefix string) error {
+func writeFile(tr *tar.Reader, tw *tar.Writer, hdr *tar.Header) error {
 	hdrOut := &tar.Header{
 		Typeflag: hdr.Typeflag,
-		Name:     prefix + hdr.Name,
+		Name:     hdr.Name,
 		Linkname: hdr.Linkname,
 		Size:     hdr.Size,
 		Mode:     int64(hdr.Mode & 0777),

rootfs/rootfs_test.go

@@ -34,7 +34,6 @@ func TestRootFS(t *testing.T) {
 
 	tests := []struct {
 		name    string
-		opts    []Option
 		image   tarball
 		want    []extractable
 		wantErr string
@@ -55,7 +54,7 @@ func TestRootFS(t *testing.T) {
 			wantErr: "layer0/layer.tar defined in manifest, missing in tarball",
 		},
 		{
-			name: "ok: basic file overwrite, layer order mixed",
+			name: "basic file overwrite, layer order mixed",
 			image: tarball{
 				file{Name: "layer1/layer.tar", Contents: layer1.Buffer()},
 				file{Name: "layer0/layer.tar", Contents: layer0.Buffer()},
@@ -173,7 +172,7 @@ func TestRootFS(t *testing.T) {
 			},
 		},
 		{
-			name: "compressed layer",
+			name: "archived layer",
 			image: tarball{
 				file{Name: "layer1/layer.tar", Contents: layer1.Gzip()},
 				file{Name: "layer0/layer.tar", Contents: layer0.Gzip()},
@@ -184,19 +183,6 @@ func TestRootFS(t *testing.T) {
 				file{Name: "/file", UID: 1, Contents: bytes.NewBufferString("from 1")},
 			},
 		},
-		{
-			name: "ok: add a file prefix",
-			opts: []Option{WithFilePrefix("/opt")},
-			image: tarball{
-				file{Name: "layer1/layer.tar", Contents: layer1.Buffer()},
-				file{Name: "layer0/layer.tar", Contents: layer0.Buffer()},
-				manifest{"layer0/layer.tar", "layer1/layer.tar"},
-			},
-			want: []extractable{
-				dir{Name: "/opt/", UID: 0},
-				file{Name: "/opt/file", UID: 1, Contents: bytes.NewBufferString("from 1")},
-			},
-		},
 	}
 
 	for _, tt := range tests {
@@ -204,7 +190,7 @@ func TestRootFS(t *testing.T) {
 			in := bytes.NewReader(tt.image.Buffer().Bytes())
 			out := bytes.Buffer{}
 
-			err := Flatten(in, &out, tt.opts...)
+			err := Flatten(in, &out)
 			if tt.wantErr != "" {
 				if err == nil {
 					t.Fatal("expected error, got nil")