use context services

Author: jgkawell

tools/dctl/cmd/infra.go

@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	defaultServices = []string{"blueprint", "catalyst", "fuse", "envoy"}
+	defaultServices = []string{}
 )
 
 var infraCmd = &cobra.Command{
@@ -59,6 +59,7 @@ func init() {
 	rootCmd.AddCommand(infraCmd)
 	// add children
 	infraCmd.AddCommand(infraCleanCmd)
+	infraCleanCmd.Flags().BoolVarP(&infra.Full, "full", "f", false, "whether or not to delete data volumes associated with services (true/FALSE)")
 	infraCleanCmd.Flags().StringSliceVarP(&infra.Services, "services", "s", defaultServices, "infra services to act on")
 	infraCmd.AddCommand(infraInitCmd)
 	infraInitCmd.Flags().StringSliceVarP(&infra.Services, "services", "s", defaultServices, "infra services to act on")

tools/dctl/cmd/infra/configs.go

@@ -9,6 +9,7 @@ import (
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
+	"github.com/steady-bytes/draft/tools/dctl/config"
 )
 
 type (
@@ -28,7 +29,8 @@ type (
 )
 
 var (
-	infraConfigs = map[string]infraConfig{
+	defaultServices = []string{"blueprint", "catalyst", "fuse", "envoy"}
+	infraConfigs    = map[string]infraConfig{
 		"blueprint": {
 			containerConfig: &container.Config{
 				Image: "ghcr.io/steady-bytes/draft-core-blueprint:latest",
@@ -448,11 +450,20 @@ func containerName(infra string) string {
 }
 
 func getInfraConfig(name string) (infraConfig, error) {
+	dctx := config.GetContext()
 	config, ok := infraConfigs[name]
 	if !ok {
 		return config, fmt.Errorf("invalid infra service name: %s", name)
 	}
 
+	// apply context config overrides
+	ctxConfig, ok := dctx.Infra[name]
+	if ok {
+		if ctxConfig.ImageName != "" {
+			config.containerConfig.Image = ctxConfig.ImageName
+		}
+	}
+
 	if config.configFile != nil {
 		path, err := configPath()
 		if err != nil {
@@ -470,7 +481,7 @@ func getInfraConfig(name string) (infraConfig, error) {
 		}
 		config.hostConfig.Mounts = []mount.Mount{
 			{
-				Type: mount.TypeBind,
+				Type:   mount.TypeBind,
 				Source: filepath.Join(path, name),
 				Target: config.mountPoint.mountPath,
 			},

tools/dctl/cmd/infra/init.go

@@ -6,13 +6,15 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/steady-bytes/draft/tools/dctl/config"
 	"github.com/steady-bytes/draft/tools/dctl/docker"
 	"github.com/steady-bytes/draft/tools/dctl/output"
 
 	"github.com/spf13/cobra"
 )
 
 func Init(cmd *cobra.Command, args []string) error {
+	defineServices()
 	ctx := cmd.Context()
 	dockerCtl, err := docker.NewDockerController()
 	if err != nil {
@@ -42,21 +44,21 @@ func Init(cmd *cobra.Command, args []string) error {
 			home, err := os.UserHomeDir()
 			if err != nil {
 				output.Error(err)
-				os.Exit(1)
+				continue
 			}
 
 			dirName := filepath.Join(home, ".config", "dctl", "infra")
 			err = os.Mkdir(dirName, 0666)
 			if err != nil && !os.IsExist(err) {
 				output.Error(err)
-				os.Exit(1)
+				continue
 			}
 
 			fileName := filepath.Join(dirName, fmt.Sprintf("%s.yaml", name))
 			err = os.WriteFile(fileName, []byte(config.configFile.contents), 0666)
 			if err != nil {
 				output.Error(err)
-				os.Exit(1)
+				continue
 			}
 		}
 
@@ -65,17 +67,38 @@ func Init(cmd *cobra.Command, args []string) error {
 			home, err := os.UserHomeDir()
 			if err != nil {
 				output.Error(err)
-				os.Exit(1)
+				continue
 			}
 
 			dirName := filepath.Join(home, ".config", "dctl", "infra", name)
 			err = os.MkdirAll(dirName, 0666)
 			if err != nil && !os.IsExist(err) {
 				output.Error(err)
-				os.Exit(1)
+				continue
 			}
 		}
 	}
 
 	return nil
 }
+
+// defineServices sets the Services variable based off of the user
+// input and current context.
+func defineServices() {
+	dctx := config.GetContext()
+
+	// if user didn't define services, use the ones defined in the context
+	if len(Services) == 0 {
+		Services = make([]string, len(dctx.Infra))
+		i := 0
+		for key := range dctx.Infra {
+			Services[i] = key
+			i++
+		}
+	}
+
+	// if neither user nor context defined services, use default
+	if len(Services) == 0 {
+		Services = defaultServices
+	}
+}

tools/dctl/cmd/infra/start.go

@@ -13,11 +13,12 @@ import (
 var (
 	Follow   bool
 	Services []string
+	Full     bool
 )
 
 func Start(cmd *cobra.Command, args []string) (err error) {
+	defineServices()
 	ctx := cmd.Context()
-
 	dockerCtl, err := docker.NewDockerController()
 	if err != nil {
 		return nil

tools/dctl/cmd/infra/status.go

@@ -11,6 +11,7 @@ import (
 )
 
 func Status(cmd *cobra.Command, args []string) (err error) {
+	defineServices()
 	ctx := cmd.Context()
 	dockerCtl, err := docker.NewDockerController()
 	if err != nil {

tools/dctl/cmd/infra/stop.go

@@ -8,6 +8,7 @@ import (
 )
 
 func Stop(cmd *cobra.Command, args []string) (err error) {
+	defineServices()
 	ctx := cmd.Context()
 	dockerCtl, err := docker.NewDockerController()
 	if err != nil {