Some more obsolete code

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

README.md

@@ -40,13 +40,13 @@ With `docker app` [installed](#installation) let's create an Application Package
 based on this Compose file:
 
 ```console
-$ docker app init --single-file hello
+$ docker app init hello
 $ ls
 docker-compose.yml
 hello.dockerapp
 ```
 
-We created a new file `hello.dockerapp` that contains three YAML documents:
+We created a new folder `hello.dockerapp` that contains three YAML documents:
 - metadata
 - the Compose file
 - parameters for your application
@@ -60,22 +60,19 @@ description: A simple text server
 maintainers:
 - name: yourusername
   email:
+```
 
----
+```yaml
 version: '3.2'
 services:
   hello:
     image: hashicorp/http-echo
     command: ["-text", "hello world"]
     ports:
       - 5678:5678
-
----
-{}
 ```
 
-Let's edit the parameters section and add the following default values for our
-application:
+And an empty `parameters.yml. Let's edit and add the following default values for our applicatoin
 
 ```yaml
 port: 5678

integrations/intellij/README.md

@@ -24,7 +24,7 @@ The plugin exposes the following commands in a top-level `Docker` menu:
 
 This command displays a dialog that can be used to initialize a new Docker Application.
 
-It gives you the option to chose the name, description and maintainers of the application, as well as whether to use single-file mode or not.
+It gives you the option to chose the name, description and maintainers of the application.
 
 ## Select application
 

internal/packager/extract.go

@@ -72,7 +72,7 @@ func Extract(name string, ops ...func(*types.App) error) (*types.App, error) {
 		)
 		return loader.LoadFromDirectory(appname, appOpts...)
 	}
-	// not a dir: single-file or a tarball package, extract that in a temp dir
+	// not a dir: a tarball package, extract that in a temp dir
 	app, err := loader.LoadFromTar(appname, ops...)
 	if err != nil {
 		return nil, err

internal/packager/split.go

@@ -1,7 +1,6 @@
 package loader
 
 import (
-	"bytes"
 	"io"
 	"io/ioutil"
 	"os"
@@ -13,75 +12,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-var (
-	crlf       = []byte{'\r', '\n'}
-	lf         = []byte{'\n'}
-	delimiters = [][]byte{
-		[]byte("\r\n---\r\n"),
-		[]byte("\n---\r\n"),
-		[]byte("\r\n---\n"),
-		[]byte("\n---\n"),
-	}
-)
-
-// useCRLF detects which line break should be used
-func useCRLF(data []byte) bool {
-	nbCrlf := bytes.Count(data, crlf)
-	nbLf := bytes.Count(data, lf)
-	switch {
-	case nbCrlf == nbLf:
-		// document contains only CRLF
-		return true
-	case nbCrlf == 0:
-		// document does not contain any CRLF
-		return false
-	default:
-		// document contains mixed line breaks, so use the OS default
-		return bytes.Equal(defaultLineBreak, crlf)
-	}
-}
-
-// splitSingleFile split a multidocument using all possible document delimiters
-func splitSingleFile(data []byte) [][]byte {
-	parts := [][]byte{data}
-	for _, delimiter := range delimiters {
-		var intermediate [][]byte
-		for _, part := range parts {
-			intermediate = append(intermediate, bytes.Split(part, delimiter)...)
-		}
-		parts = intermediate
-	}
-	return parts
-}
-
-// LoadFromSingleFile loads a docker app from a single-file format (as a reader)
-func LoadFromSingleFile(path string, r io.Reader, ops ...func(*types.App) error) (*types.App, error) {
-	data, err := ioutil.ReadAll(r)
-	if err != nil {
-		return nil, errors.Wrap(err, "error reading single-file")
-	}
-
-	parts := splitSingleFile(data)
-	if len(parts) != 3 {
-		return nil, errors.Errorf("malformed single-file application: expected 3 documents, got %d", len(parts))
-	}
-
-	// 0. is metadata
-	metadata := bytes.NewBuffer(parts[0])
-	// 1. is compose
-	compose := bytes.NewBuffer(parts[1])
-	// 2. is parameters
-	params := bytes.NewBuffer(parts[2])
-
-	appOps := append([]func(*types.App) error{
-		types.WithComposes(compose),
-		types.WithParameters(params),
-		types.Metadata(metadata),
-		types.WithCRLF(useCRLF(data)),
-	}, ops...)
-	return types.NewApp(path, appOps...)
-}
-
 // LoadFromDirectory loads a docker app from a directory
 func LoadFromDirectory(path string, ops ...func(*types.App) error) (*types.App, error) {
 	if _, err := os.Stat(filepath.Join(path, internal.ParametersFileName)); os.IsNotExist(err) {

loader/loader.go

@@ -1,16 +1,12 @@
 package loader
 
 import (
-	"fmt"
 	"io/ioutil"
-	"strings"
 	"testing"
 
 	"github.com/docker/app/internal"
 	"github.com/docker/app/types"
 	"github.com/docker/docker/pkg/archive"
-	"github.com/pkg/errors"
-
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 	"gotest.tools/fs"
@@ -29,47 +25,6 @@ services:
 `
 )
 
-func TestLoadFromSingleFile(t *testing.T) {
-	testCases := []struct {
-		name string
-		file string
-	}{
-		{
-			name: "line-feed",
-			file: fmt.Sprintf("%s\n---\n%s\n---\n%s", metadata, compose, params),
-		},
-		{
-			name: "carriage-return-line-feed",
-			file: fmt.Sprintf("%s\r\n---\r\n%s\r\n---\r\n%s", metadata, compose, params),
-		},
-		{
-			name: "mixed-carriage-return-line-feed",
-			file: fmt.Sprintf("%s\r\n---\r\n%s\r\n---\n%s", metadata, compose, params),
-		},
-	}
-	for _, test := range testCases {
-		t.Run(test.name, func(t *testing.T) {
-			app, err := LoadFromSingleFile("my-app", strings.NewReader(test.file))
-			assert.NilError(t, err)
-			assert.Assert(t, app != nil)
-			assert.Assert(t, is.Equal(app.Path, "my-app"))
-			assertAppContent(t, app)
-		})
-	}
-}
-
-func TestLoadFromSingleFileInvalidReader(t *testing.T) {
-	_, err := LoadFromSingleFile("my-app", &faultyReader{})
-	assert.ErrorContains(t, err, "faulty reader")
-}
-
-func TestLoadFromSingleFileMalformed(t *testing.T) {
-	_, err := LoadFromSingleFile("my-app", strings.NewReader(`foo: foo
----
-bar: bar`))
-	assert.ErrorContains(t, err, "malformed single-file application")
-}
-
 func TestLoadFromDirectory(t *testing.T) {
 	dir := fs.NewDir(t, "my-app",
 		fs.WithFile(internal.MetadataFileName, metadata),
@@ -140,9 +95,3 @@ func assertAppContent(t *testing.T, app *types.App) {
 	assertContentIs(t, app.Composes()[0], compose)
 	assertContentIs(t, app.MetadataRaw(), metadata)
 }
-
-type faultyReader struct{}
-
-func (r *faultyReader) Read(_ []byte) (int, error) {
-	return 0, errors.New("faulty reader")
-}

loader/loader_test.go

@@ -26,14 +26,6 @@ const (
 	AppSourceArchive
 )
 
-// YamlSingleFileSeparator returns the separator used in single-file app, depending detected CRLF
-func YamlSingleFileSeparator(hasCRLF bool) []byte {
-	if hasCRLF {
-		return []byte("\r\n---\r\n")
-	}
-	return []byte("\n---\n")
-}
-
 // ShouldRunInsideDirectory returns whether the package is run from a directory on disk
 func (a AppSourceKind) ShouldRunInsideDirectory() bool {
 	return a == AppSourceSplit || a == AppSourceImage || a == AppSourceArchive