Merge pull request #741 from rumpl/random-seed

Add a seed for better randomness

Author: rumpl

cmd/cnab-run/main.go

@@ -3,7 +3,9 @@ package main
 import (
 	"errors"
 	"fmt"
+	"math/rand"
 	"os"
+	"time"
 
 	"github.com/docker/app/internal"
 )
@@ -38,6 +40,7 @@ func getCnabAction() (cnabAction, string, error) {
 }
 
 func main() {
+	rand.Seed(time.Now().UnixNano())
 	action, actionName, err := getCnabAction()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error while parsing CNAB operation: %s", err)

cmd/docker-app/main.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"math/rand"
+	"time"
+
 	"github.com/docker/app/internal"
 	app "github.com/docker/app/internal/commands"
 	"github.com/docker/cli/cli-plugins/manager"
@@ -10,6 +13,7 @@ import (
 )
 
 func main() {
+	rand.Seed(time.Now().UnixNano())
 	plugin.Run(func(dockerCli command.Cli) *cobra.Command {
 		cmd := app.NewRootCmd("app", dockerCli)
 		originalPreRun := cmd.PersistentPreRunE

e2e/run_test.go

@@ -0,0 +1,27 @@
+package e2e
+
+import (
+	"path/filepath"
+	"testing"
+
+	"gotest.tools/icmd"
+)
+
+func TestRunTwice(t *testing.T) {
+	// Test that we are indeed generating random app names
+	// We had a problem where the second run would fail with an error
+	// "Installation "gallant_poitras" already exists, use 'docker app update' instead"
+	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
+		cmd := info.configuredCmd
+		contextPath := filepath.Join("testdata", "simple")
+
+		cmd.Command = dockerCli.Command("app", "build", "--tag", "myapp", contextPath)
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		cmd.Command = dockerCli.Command("app", "run", "myapp", "--set", "web_port=8080")
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		cmd.Command = dockerCli.Command("app", "run", "myapp", "--set", "web_port=8081")
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+	})
+}