Go 1.19, dependabot configuration and smaller improvements

several small improvements

Author: boxblinkracer

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci_pipe.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Run Unit Tests
         run: make test -B

README.md

@@ -42,7 +42,7 @@ dockware-cli creator
 
 The output should then look like this. Just continue answering the questions and you'll end up with a nice docker-compose.yml file.
 
-```bash 
+``` 
 Dockware Creator
 
 ? What do you want to do?  [Use arrows to move, type to filter]

cmd/creator.go

@@ -6,6 +6,7 @@ import (
 	dc "github.com/dockware/dockware-cli/dockercompose"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
+	"log"
 	"os"
 	"os/exec"
 	"strings"
@@ -29,9 +30,8 @@ var creatorCmd = &cobra.Command{
 	Short: "Use the interactive dockware creator to get what you need for today's task",
 	Long:  "",
 	Run: func(cmd *cobra.Command, args []string) {
-		if !term.IsTerminal(int(syscall.Stdin)) {
-			fmt.Println("interactive terminal required")
-			os.Exit(1)
+		if !term.IsTerminal(syscall.Stdin) {
+			log.Fatal("interactive terminal required")
 		}
 
 		a := &Answers{}
@@ -41,7 +41,7 @@ var creatorCmd = &cobra.Command{
 		case dc.Play:
 
 			a.SwVersion = askShopwareVersion(dc.Play.String())
-			runArgs := []string{"run", "--rm", "--name", "shopware", "-p", "80:80", "-p" , "443:443", fmt.Sprintf("dockware/%s:%s", a.DevIntentString, a.SwVersion)}
+			runArgs := []string{"run", "--rm", "--name", "shopware", "-p", "80:80", "-p", "443:443", fmt.Sprintf("dockware/%s:%s", a.DevIntentString, a.SwVersion)}
 
 			fmt.Printf("All done! Just run the following command in your terminal and enjoy Shopware %s:\n\n", a.SwVersion)
 			fmt.Printf("docker %s\n\n", strings.Join(runArgs, " "))
@@ -50,8 +50,7 @@ var creatorCmd = &cobra.Command{
 				Message: "Run the command now?",
 			}, &execute)
 			if err != nil {
-				fmt.Printf("%s\n", err.Error())
-				os.Exit(1)
+				log.Fatalf("%s\n", err.Error())
 			}
 			if execute {
 				cmd := exec.Command("docker", runArgs...)
@@ -60,8 +59,7 @@ var creatorCmd = &cobra.Command{
 				cmd.Stdout = os.Stdout
 				err := cmd.Run()
 				if err != nil {
-					fmt.Println(err.Error())
-					os.Exit(1)
+					log.Fatal(err.Error())
 				}
 			}
 			return
@@ -80,14 +78,12 @@ var creatorCmd = &cobra.Command{
 
 			composeString, err := dc.BuildDockware("dev", dc.MountType(a.MountType), swVersion, withMySQL, withElastic, withRedis, withAppServer, withPWA)
 			if err != nil {
-				fmt.Printf("could not build YAML: %s\n", err.Error())
-				os.Exit(1)
+				log.Fatalf("could not build YAML: %s\n", err.Error())
 			}
 
 			err = os.WriteFile("docker-compose.yml", []byte(composeString), 0666)
 			if err != nil {
-				fmt.Printf("could not write file: %s\n", err.Error())
-				os.Exit(1)
+				log.Fatalf("could not write file: %s\n", err.Error())
 			}
 
 			fmt.Println("File generated: ./docker-compose.yml")
@@ -99,13 +95,12 @@ var creatorCmd = &cobra.Command{
 
 			composeString, err := dc.BuildDockware("contribute", dc.MountType(a.MountType), "latest", false, false, false, false, false)
 			if err != nil {
-				fmt.Errorf("could not build YAML: %s\n", err.Error())
+				log.Fatalf("could not build YAML: %s\n", err.Error())
 			}
 
 			err = os.WriteFile("docker-compose.yml", []byte(composeString), 0666)
 			if err != nil {
-				fmt.Printf("could not write file: %s\n", err.Error())
-				os.Exit(1)
+				log.Fatalf("could not write file: %s\n", err.Error())
 			}
 
 			fmt.Println("File generated: ./docker-compose.yml")
@@ -143,8 +138,7 @@ func (a *Answers) getDevType() {
 
 	err := survey.Ask(devTypeQuestion, a)
 	if err != nil {
-		fmt.Println(err.Error())
-		os.Exit(1)
+		log.Fatal(err.Error())
 	}
 }
 
@@ -174,8 +168,7 @@ func (a *Answers) getMountType() {
 	}
 	err := survey.Ask(asMountType, a)
 	if err != nil {
-		fmt.Println(err.Error())
-		os.Exit(1)
+		log.Fatal(err.Error())
 	}
 }
 
@@ -186,7 +179,7 @@ func (a *Answers) getDevIntent() {
 		dc.Contribute: "Best for contributing changes to the Shopware core",
 	}
 	imageTitles := make([]string, len(images))
-	for i, _ := range images {
+	for i := range images {
 		it := dc.DevIntent(i)
 		imageTitles[i] = it.String()
 	}
@@ -205,8 +198,7 @@ func (a *Answers) getDevIntent() {
 	}
 	err := survey.Ask(askImage, a)
 	if err != nil {
-		fmt.Printf("Could not get Dev Intent: %s\n", err.Error())
-		os.Exit(1)
+		log.Fatalf("Could not get Dev Intent: %s\n", err.Error())
 	}
 	a.DevIntentString = dc.DevIntent(a.DevIntent).String()
 }

cmd/root.go

@@ -9,13 +9,12 @@ import (
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "dockware",
-	Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "Our interactive way of getting started with dockware, docker and Shopware",
+	Long: `The creator is a tool that helps you to build your Docker setup in an interactive way. 
+It will guide you through all these questions on what and how you want to develop.
+The final result might be a single line to start a Shopware version, or even a full 
+docker-compose.yml file with all kinds of containers and settings, ready to be used.
+And as always, we just try to help you with the onboarding steps to Docker and stick with the standard.`,
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	// Run: func(cmd *cobra.Command, args []string) { },

dockercompose/dockercompose.go

@@ -5,7 +5,7 @@ import (
 )
 import "gopkg.in/yaml.v3"
 
-type dockerCompose struct {
+type DockerCompose struct {
 	Version       string                  `yaml:"version"`
 	Services      map[string]*Service     `yaml:"services"`
 	VolumeDrivers map[string]VolumeDriver `yaml:"volumes,omitempty"`
@@ -24,20 +24,20 @@ type Service struct {
 	Links         []string `yaml:"links,omitempty"`
 }
 
-func Create(version string) dockerCompose {
-	return dockerCompose{
+func Create(version string) DockerCompose {
+	return DockerCompose{
 		Version:       version,
 		Services:      map[string]*Service{},
 		VolumeDrivers: map[string]VolumeDriver{},
 	}
 }
 
-func (dc *dockerCompose) AddOverwriteService(serviceName, containerName, image string) *Service {
+func (dc *DockerCompose) AddOverwriteService(serviceName, containerName, image string) *Service {
 	dc.Services[serviceName] = &Service{ContainerName: containerName, Image: image}
 	return dc.Services[serviceName]
 }
 
-func (dc *dockerCompose) AddVolume(volumeName, driver string) {
+func (dc *DockerCompose) AddVolume(volumeName, driver string) {
 	dc.VolumeDrivers[volumeName] = VolumeDriver{Driver: driver}
 }
 
@@ -69,7 +69,7 @@ func (s *Service) AddEnv(key, value string) {
 	s.Environment = append(s.Environment, fmt.Sprintf("%s=%s", key, value))
 }
 
-func (dc *dockerCompose) ToString() (string, error) {
+func (dc *DockerCompose) ToString() (string, error) {
 	d, err := yaml.Marshal(&dc)
 	if err != nil {
 		return "", err

dockercompose/dockercompose_test.go

@@ -7,7 +7,7 @@ import (
 
 func TestCreate(t *testing.T) {
 	got := Create("3.0")
-	want := &dockerCompose{
+	want := &DockerCompose{
 		Version:       "3.0",
 		Services:      map[string]*Service{},
 		VolumeDrivers: map[string]VolumeDriver{},

go.mod

@@ -1,6 +1,6 @@
 module github.com/dockware/dockware-cli
 
-go 1.18
+go 1.19
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.6