fix/misc (#354)

* fix topaz version -c output * refactor WithContainerPlatform
aserto-dev · Mar 23, 2024 · e71770d · e71770d
1 parent af57166
commit e71770d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/pkg/cli/cmd/startrun.go b/pkg/cli/cmd/startrun.go
@@ -87,7 +87,7 @@ func (cmd *StartRunCmd) run(c *cc.CommonCtx, mode runMode) error {
 
 	opts := []dockerx.RunOption{
 		dockerx.WithContainerImage(image),
-		dockerx.WithContainerPlatform("linux", strings.TrimPrefix(cmd.ContainerPlatform, "linux/")),
+		dockerx.WithContainerPlatform(cmd.ContainerPlatform),
 		dockerx.WithContainerName(cmd.ContainerName),
 		dockerx.WithContainerHostname(cmd.ContainerHostname),
 		dockerx.WithWorkingDir("/app"),

diff --git a/pkg/cli/cmd/version.go b/pkg/cli/cmd/version.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/aserto-dev/topaz/pkg/cli/cc"
 	"github.com/aserto-dev/topaz/pkg/cli/dockerx"
@@ -43,15 +42,15 @@ func (cmd *VersionCmd) Run(c *cc.CommonCtx) error {
 	)
 
 	if !dc.ImageExists(image) {
-		fmt.Fprintf(c.UI.Output(), "!!! image %s does not exist locally\n", image)
-		fmt.Fprint(c.UI.Output(), "!!! run `topaz install` to download\n", image)
+		fmt.Fprintf(c.UI.Output(), "!!! container image %q does not exist locally\n", image)
+		fmt.Fprint(c.UI.Output(), "!!! run 'topaz install' to download\n")
 		return nil
 	}
 
 	if err := dc.Run(
 		dockerx.WithContainerImage(image),
 		dockerx.WithEntrypoint([]string{"/app/topazd", "version"}),
-		dockerx.WithContainerPlatform("linux", strings.TrimPrefix(cmd.ContainerPlatform, "linux/")),
+		dockerx.WithContainerPlatform(cmd.ContainerPlatform),
 		dockerx.WithContainerName("topazd-version"),
 		dockerx.WithOutput(c.UI.Output()),
 		dockerx.WithError(c.UI.Err()),

diff --git a/pkg/cli/dockerx/docker.go b/pkg/cli/dockerx/docker.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/signal"
 	"path"
+	"strings"
 	"syscall"
 
 	"github.com/docker/docker/api/types"
@@ -189,7 +190,9 @@ func WithCmd(cmds []string) RunOption {
 	}
 }
 
-func WithContainerPlatform(goos, goarch string) RunOption {
+func WithContainerPlatform(platform string) RunOption {
+	goos, goarch := "linux", strings.TrimPrefix(platform, "linux/")
+
 	return func(r *runner) {
 		r.platform.OS = goos
 		r.platform.Architecture = goarch