Remove loading app from an URL

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>

Author: rumpl

cmd/docker-app/merge.go

@@ -42,7 +42,7 @@ func extraFiles(appname string) ([]string, error) {
 
 //handleInPlace returns the operation target path and if it's in-place
 func handleInPlace(app *types.App) (string, bool) {
-	if app.Source == types.AppSourceURL || app.Source == types.AppSourceImage {
+	if app.Source == types.AppSourceImage {
 		return internal.DirNameFromAppName(app.Name), false
 	}
 	return app.Path + ".tmp", true

e2e/commands_test.go

@@ -226,12 +226,6 @@ func TestSplitMerge(t *testing.T) {
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 }
 
-func TestURL(t *testing.T) {
-	url := "https://raw.githubusercontent.com/docker/app/v0.4.1/examples/hello-world/hello-world.dockerapp"
-	result := icmd.RunCommand(dockerApp, "inspect", url).Assert(t, icmd.Success)
-	golden.Assert(t, result.Combined(), "helloworld-inspect.golden")
-}
-
 func TestWithRegistry(t *testing.T) {
 	r := startRegistry(t)
 	defer r.Stop(t)

internal/packager/extract.go

@@ -3,7 +3,6 @@ package packager
 import (
 	"fmt"
 	"io/ioutil"
-	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -110,12 +109,6 @@ func Extract(name string, ops ...func(*types.App) error) (*types.App, error) {
 	appname := internal.DirNameFromAppName(name)
 	s, err := os.Stat(appname)
 	if err != nil {
-		// URL or docker image
-		u, err := url.Parse(name)
-		if err == nil && (u.Scheme == "http" || u.Scheme == "https") {
-			ops = append(ops, types.WithSource(types.AppSourceURL))
-			return loader.LoadFromURL(name, ops...)
-		}
 		// look for a docker image
 		ops = append(ops, types.WithSource(types.AppSourceImage))
 		app, err := extractImage(name, ops...)

loader/loader.go

@@ -3,7 +3,6 @@ package loader
 import (
 	"io"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -14,21 +13,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-// LoadFromURL loads a docker app from an URL that should return a single-file app.
-func LoadFromURL(url string, ops ...func(*types.App) error) (*types.App, error) {
-	resp, err := http.Get(url)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to download "+url)
-	}
-	if resp.Body != nil {
-		defer resp.Body.Close()
-	}
-	if resp.StatusCode != 200 {
-		return nil, errors.Errorf("failed to download %s: %s", url, resp.Status)
-	}
-	return LoadFromSingleFile(url, resp.Body, ops...)
-}
-
 // 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)

types/types.go

@@ -26,8 +26,6 @@ const (
 	AppSourceMerged
 	// AppSourceImage represents an Application pulled from an image
 	AppSourceImage
-	// AppSourceURL represents an Application fetched from an URL
-	AppSourceURL
 	// AppSourceArchive represents an Application in an archive format
 	AppSourceArchive
 )