Merge pull request #452 from rumpl/feat-cnab-inspect

Feat cnab inspect

Author: simonferquel

Jenkinsfile.baguette

@@ -148,7 +148,7 @@ pipeline {
                             dir('e2e'){
                                 unstash "e2e"
                             }
-                            sh './docker-app-e2e-linux --e2e-path=e2e'
+                            sh './docker-app-e2e-linux -test.v --e2e-path=e2e'
                         }
                     }
                     post {
@@ -180,7 +180,7 @@ pipeline {
                             dir('e2e'){
                                 unstash "e2e"
                             }
-                            sh './docker-app-e2e-darwin --e2e-path=e2e'
+                            sh './docker-app-e2e-darwin -test.v --e2e-path=e2e'
                         }
                     }
                     post {
@@ -212,7 +212,7 @@ pipeline {
                             dir('e2e'){
                                 unstash "e2e"
                             }
-                            bat 'docker-app-e2e-windows.exe --e2e-path=e2e'
+                            bat 'docker-app-e2e-windows.exe -test.v --e2e-path=e2e'
                         }
                     }
                     post {

cmd/cnab-run/inspect.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"os"
+
+	appinspect "github.com/docker/app/internal/inspect"
+	"github.com/docker/app/internal/packager"
+)
+
+func inspect() error {
+	app, err := packager.Extract("")
+	// todo: merge additional compose file
+	if err != nil {
+		return err
+	}
+	defer app.Cleanup()
+
+	imageMap, err := getBundleImageMap()
+	if err != nil {
+		return err
+	}
+
+	parameters := packager.ExtractCNABParametersValues(packager.ExtractCNABParameterMapping(app.Parameters()), os.Environ())
+	return appinspect.Inspect(os.Stdout, app, parameters, imageMap)
+}

cmd/cnab-run/main.go

@@ -13,6 +13,7 @@ const (
 	cnabActionUninstall = cnabAction("uninstall")
 	cnabActionUpgrade   = cnabAction("upgrade")
 	cnabActionStatus    = cnabAction("status")
+	cnabActionInspect   = cnabAction("inspect")
 )
 
 type cnabOperation struct {
@@ -68,6 +69,11 @@ func main() {
 			fmt.Fprintf(os.Stderr, "Status failed: %s", err)
 			os.Exit(1)
 		}
+	case cnabActionInspect:
+		if err := inspect(); err != nil {
+			fmt.Fprintf(os.Stderr, "Inspect failed: %s", err)
+			os.Exit(1)
+		}
 	default:
 		fmt.Fprintf(os.Stderr, "Action %q is not supported", op.action)
 		os.Exit(1)

cmd/docker-app/inspect.go

@@ -1,38 +1,55 @@
 package main
 
 import (
-	"github.com/docker/app/internal/inspect"
-	"github.com/docker/app/internal/packager"
-	"github.com/docker/app/types"
+	"github.com/deislabs/duffle/pkg/action"
+	"github.com/deislabs/duffle/pkg/claim"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	cliopts "github.com/docker/cli/opts"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
-var (
-	inspectParametersFile []string
-	inspectEnv            []string
-)
-
 func inspectCmd(dockerCli command.Cli) *cobra.Command {
+	var opts parametersOptions
 	cmd := &cobra.Command{
 		Use:   "inspect [<app-name>] [-s key=value...] [-f parameters-file...]",
 		Short: "Shows metadata, parameters and a summary of the compose file for a given application",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			app, err := packager.Extract(firstOrEmpty(args),
-				types.WithParametersFiles(inspectParametersFile...),
+			muteDockerCli(dockerCli)
+			appname := firstOrEmpty(args)
+
+			c, err := claim.New("inspect")
+			if err != nil {
+				return err
+			}
+			driverImpl, err := prepareDriver(dockerCli)
+			if err != nil {
+				return err
+			}
+			bundle, err := resolveBundle(dockerCli, "", appname)
+			if err != nil {
+				return err
+			}
+			c.Bundle = bundle
+
+			parameters, err := mergeBundleParameters(c.Bundle,
+				withFileParameters(opts.parametersFiles),
+				withCommandLineParameters(opts.overrides),
 			)
 			if err != nil {
 				return err
 			}
-			defer app.Cleanup()
-			argParameters := cliopts.ConvertKVStringsToMap(inspectEnv)
-			return inspect.Inspect(dockerCli.Out(), app, argParameters, nil)
+			c.Parameters = parameters
+
+			a := &action.RunCustom{
+				Action: "inspect",
+				Driver: driverImpl,
+			}
+			err = a.Run(c, map[string]string{"docker.context": ""}, dockerCli.Out())
+			return errors.Wrap(err, "Inspect failed")
 		},
 	}
-	cmd.Flags().StringArrayVarP(&inspectParametersFile, "parameters-files", "f", []string{}, "Override with parameters from files")
-	cmd.Flags().StringArrayVarP(&inspectEnv, "set", "s", []string{}, "Override parameters values")
+	opts.addFlags(cmd.Flags())
 	return cmd
 }

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

cmd/docker-app/parameters_test.go

@@ -12,8 +12,7 @@ import (
 func TestWithLoadFiles(t *testing.T) {
 	tmpDir := fs.NewDir(t,
 		t.Name(),
-		fs.WithFile("params.yaml", `
-param1:
+		fs.WithFile("params.yaml", `param1:
   param2: value1
 param3: 3
 overridden: bar`))

e2e/commands_test.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -20,20 +19,6 @@ import (
 	"gotest.tools/skip"
 )
 
-const (
-	singleFileApp = `version: 0.1.0
-name: helloworld
-description: "hello world app"
-namespace: "foo"
----
-version: '3.5'
-services:
-  hello-world:
-    image: hello-world
----
-# This section contains the default values for your application parameters.`
-)
-
 func TestRenderTemplates(t *testing.T) {
 	skip.If(t, !hasExperimental, "experimental mode needed for this test")
 	appsPath := filepath.Join("testdata", "templates")
@@ -226,56 +211,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)
-	registry := r.GetAddress(t)
-	// push to a registry
-	icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
-	icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", "-t", "latest", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
-	icmd.RunCommand(dockerApp, "inspect", registry+"/myuser/my.dockerapp:0.1.0").Assert(t, icmd.Success)
-	icmd.RunCommand(dockerApp, "inspect", registry+"/myuser/my.dockerapp").Assert(t, icmd.Success)
-	icmd.RunCommand(dockerApp, "inspect", registry+"/myuser/my").Assert(t, icmd.Success)
-	icmd.RunCommand(dockerApp, "inspect", registry+"/myuser/my:0.1.0").Assert(t, icmd.Success)
-	// push a single-file app to a registry
-	dir := fs.NewDir(t, "save-prepare-build", fs.WithFile("my.dockerapp", singleFileApp))
-	defer dir.Remove()
-	icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", dir.Join("my.dockerapp")).Assert(t, icmd.Success)
-
-	// push with custom repo name
-	icmd.RunCommand(dockerApp, "push", "-t", "marshmallows", "--namespace", registry+"/rainbows", "--repo", "unicorns", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
-	icmd.RunCommand(dockerApp, "inspect", registry+"/rainbows/unicorns:marshmallows").Assert(t, icmd.Success)
-}
-
-func TestAttachmentsWithRegistry(t *testing.T) {
-	r := startRegistry(t)
-	defer r.Stop(t)
-	registry := r.GetAddress(t)
-
-	dir := fs.NewDir(t, "testattachments",
-		fs.WithDir("attachments.dockerapp", fs.FromDir("testdata/attachments.dockerapp")),
-	)
-	defer dir.Remove()
-
-	icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/acmecorp", dir.Join("attachments.dockerapp")).Assert(t, icmd.Success)
-
-	// inspect will run the core pull code too
-	result := icmd.RunCommand(dockerApp, "inspect", registry+"/acmecorp/attachments.dockerapp:0.1.0")
-
-	result.Assert(t, icmd.Success)
-	resultOutput := result.Combined()
-
-	assert.Assert(t, strings.Contains(resultOutput, "config.cfg"))
-	assert.Assert(t, strings.Contains(resultOutput, "nesteddir/config2.cfg"))
-	assert.Assert(t, strings.Contains(resultOutput, "nesteddir/nested2/nested3/config3.cfg"))
-}
-
 func TestBundle(t *testing.T) {
 	tmpDir := fs.NewDir(t, t.Name())
 	defer tmpDir.Remove()
@@ -312,9 +247,11 @@ func TestBundle(t *testing.T) {
 
 	// Copy all the files from the invocation image and check them
 	cmd.Command = []string{dockerCli, "create", "--name", "invocation", "acmecorp/simple:1.1.0-beta1-invoc"}
-	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+	id := strings.TrimSpace(icmd.RunCmd(cmd).Assert(t, icmd.Success).Stdout())
 	cmd.Command = []string{dockerCli, "cp", "invocation:/cnab/app/simple.dockerapp", tmpDir.Join("simple.dockerapp")}
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+	cmd.Command = []string{dockerCli, "rm", "--force", id}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
 	appDir := filepath.Join("testdata", "simple", "simple.dockerapp")
 	manifest := fs.Expected(
@@ -333,19 +270,11 @@ func TestDockerAppLifecycle(t *testing.T) {
 	defer tmpDir.Remove()
 
 	cmd := icmd.Cmd{
-		Env: []string{
+		Env: append(os.Environ(),
 			fmt.Sprintf("DUFFLE_HOME=%s", tmpDir.Path()),
 			fmt.Sprintf("DOCKER_CONFIG=%s", tmpDir.Path()),
 			"DOCKER_TARGET_CONTEXT=swarm-target-context",
-		},
-	}
-
-	// We need to explicitly set the SYSTEMROOT on windows
-	// otherwise we get the error:
-	// "panic: failed to read random bytes: CryptAcquireContext: Provider DLL failed to initialize correctly."
-	// See: https://github.com/golang/go/issues/25210
-	if runtime.GOOS == "windows" {
-		cmd.Env = append(cmd.Env, `SYSTEMROOT=C:\WINDOWS`)
+		),
 	}
 
 	// Running a swarm using docker in docker to install the application

e2e/helper_test.go

@@ -8,11 +8,12 @@ import (
 	"gotest.tools/assert"
 )
 
-func startRegistry(t *testing.T) *Container {
-	c := &Container{image: "registry:2", privatePort: 5000}
-	c.Start(t)
-	return c
-}
+// TODO: uncomment once we pull on `resolveBundle`
+// func startRegistry(t *testing.T) *Container {
+// 	c := &Container{image: "registry:2", privatePort: 5000}
+// 	c.Start(t)
+// 	return c
+// }
 
 // readFile returns the content of the file at the designated path normalizing
 // line endings by removing any \r.

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)