add logic control to force recreate

ArrisLee · ArrisLee · commit 6ea0330ec679 · 2022-01-13T17:02:23.000+13:00
diff --git a/compose/compose_test.go b/compose/compose_test.go
@@ -49,7 +49,7 @@ func Test_UpAndDown(t *testing.T) {
 
 	ctx := context.Background()
 
-	err = deployer.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "")
+	err = deployer.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/compose/internal/composebinary/composebinary.go b/compose/internal/composebinary/composebinary.go
@@ -32,8 +32,8 @@ func NewComposeWrapper(binaryPath, configPath string) (libstack.Deployer, error)
 }
 
 // Deploy creates and starts containers
-func (wrapper *ComposeWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {
-	output, err := wrapper.Command(newUpCommand(filePaths), workingDir, host, projectName, envFilePath)
+func (wrapper *ComposeWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error {
+	output, err := wrapper.Command(newUpCommand(filePaths, forceRereate), workingDir, host, projectName, envFilePath)
 	if len(output) != 0 {
 		log.Printf("[libstack,composebinary] [message: finish deploying] [output: %s] [err: %s]", output, err)
 	}
@@ -114,8 +114,13 @@ func newCommand(command []string, filePaths []string) composeCommand {
 	}
 }
 
-func newUpCommand(filePaths []string) composeCommand {
-	return newCommand([]string{"up", "-d", "--force-recreate"}, filePaths)
+func newUpCommand(filePaths []string, forceRereate bool) composeCommand {
+	args := []string{"up", "-d"}
+	//set `--force-recreate` flag if forceRereate param is true
+	if forceRereate {
+		args = append(args, "--force-recreate")
+	}
+	return newCommand(args, filePaths)
 }
 
 func newDownCommand(filePaths []string) composeCommand {
diff --git a/compose/internal/composebinary/composebinary_test.go b/compose/internal/composebinary/composebinary_test.go
@@ -79,7 +79,7 @@ services:
 	}
 
 	ctx := context.Background()
-	err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "")
+	err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/compose/internal/composeplugin/composeplugin.go b/compose/internal/composeplugin/composeplugin.go
@@ -62,8 +62,8 @@ func NewPluginWrapper(binaryPath, configPath string) (libstack.Deployer, error)
 }
 
 // Up create and start containers
-func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {
-	output, err := wrapper.command(newUpCommand(filePaths), workingDir, host, projectName, envFilePath)
+func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error {
+	output, err := wrapper.command(newUpCommand(filePaths, forceRereate), workingDir, host, projectName, envFilePath)
 	if len(output) != 0 {
 		log.Printf("[libstack,composebinary] [message: finish deploying] [output: %s] [err: %s]", output, err)
 	}
@@ -91,7 +91,6 @@ func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projec
 	return err
 }
 
-
 // Command exectue a docker-compose commanåd
 func (wrapper *PluginWrapper) command(command composeCommand, workingDir, url, projectName, envFilePath string) ([]byte, error) {
 	program := utils.ProgramPath(wrapper.binaryPath, "docker")
@@ -149,7 +148,7 @@ func newCommand(command []string, filePaths []string) composeCommand {
 	}
 }
 
-func newUpCommand(filePaths []string) composeCommand {
+func newUpCommand(filePaths []string, forceRereate bool) composeCommand {
 	return newCommand([]string{"up", "-d"}, filePaths)
 }
 
diff --git a/compose/internal/composeplugin/composeplugin_test.go b/compose/internal/composeplugin/composeplugin_test.go
@@ -79,7 +79,7 @@ services:
 	}
 
 	ctx := context.Background()
-	err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "")
+	err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/libstack.go b/libstack.go
@@ -5,7 +5,7 @@ import (
 )
 
 type Deployer interface {
-	Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error
+	Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error
 	Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
 	Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func Test_UpAndDown(t *testing.T) {`
`49`	`49`
`50`	`50`	`ctx := context.Background()`
`51`	`51`
`52`		`- err = deployer.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "")`
	`52`	`+ err = deployer.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)`
`53`	`53`	`if err != nil {`
`54`	`54`	`t.Fatal(err)`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ func NewComposeWrapper(binaryPath, configPath string) (libstack.Deployer, error)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Deploy creates and starts containers`
`35`		`-func (wrapper *ComposeWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {`
`36`		`- output, err := wrapper.Command(newUpCommand(filePaths), workingDir, host, projectName, envFilePath)`
	`35`	`+func (wrapper *ComposeWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error {`
	`36`	`+ output, err := wrapper.Command(newUpCommand(filePaths, forceRereate), workingDir, host, projectName, envFilePath)`
`37`	`37`	`if len(output) != 0 {`
`38`	`38`	`log.Printf("[libstack,composebinary] [message: finish deploying] [output: %s] [err: %s]", output, err)`
`39`	`39`	`}`
`@@ -114,8 +114,13 @@ func newCommand(command []string, filePaths []string) composeCommand {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`-func newUpCommand(filePaths []string) composeCommand {`
`118`		`- return newCommand([]string{"up", "-d", "--force-recreate"}, filePaths)`
	`117`	`+func newUpCommand(filePaths []string, forceRereate bool) composeCommand {`
	`118`	`+ args := []string{"up", "-d"}`
	`119`	+ //set `--force-recreate` flag if forceRereate param is true
	`120`	`+ if forceRereate {`
	`121`	`+ args = append(args, "--force-recreate")`
	`122`	`+ }`
	`123`	`+ return newCommand(args, filePaths)`
`119`	`124`	`}`
`120`	`125`
`121`	`126`	`func newDownCommand(filePaths []string) composeCommand {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ services:`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`ctx := context.Background()`
`82`		`- err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "")`
	`82`	`+ err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)`
`83`	`83`	`if err != nil {`
`84`	`84`	`t.Fatal(err)`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ func NewPluginWrapper(binaryPath, configPath string) (libstack.Deployer, error)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Up create and start containers`
`65`		`-func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error {`
`66`		`- output, err := wrapper.command(newUpCommand(filePaths), workingDir, host, projectName, envFilePath)`
	`65`	`+func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error {`
	`66`	`+ output, err := wrapper.command(newUpCommand(filePaths, forceRereate), workingDir, host, projectName, envFilePath)`
`67`	`67`	`if len(output) != 0 {`
`68`	`68`	`log.Printf("[libstack,composebinary] [message: finish deploying] [output: %s] [err: %s]", output, err)`
`69`	`69`	`}`
`@@ -91,7 +91,6 @@ func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projec`
`91`	`91`	`return err`
`92`	`92`	`}`
`93`	`93`
`94`		`-`
`95`	`94`	`// Command exectue a docker-compose commanåd`
`96`	`95`	`func (wrapper *PluginWrapper) command(command composeCommand, workingDir, url, projectName, envFilePath string) ([]byte, error) {`
`97`	`96`	`program := utils.ProgramPath(wrapper.binaryPath, "docker")`
`@@ -149,7 +148,7 @@ func newCommand(command []string, filePaths []string) composeCommand {`
`149`	`148`	`}`
`150`	`149`	`}`
`151`	`150`
`152`		`-func newUpCommand(filePaths []string) composeCommand {`
	`151`	`+func newUpCommand(filePaths []string, forceRereate bool) composeCommand {`
`153`	`152`	`return newCommand([]string{"up", "-d"}, filePaths)`
`154`	`153`	`}`
`155`	`154`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type Deployer interface {`
`8`		`- Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error`
	`8`	`+ Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string, forceRereate bool) error`
`9`	`9`	`Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error`
`10`	`10`	`Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error`
`11`	`11`	`}`