feat: add list command, allow slashes in id names

cmd/togomak/cli.go

@@ -13,6 +13,14 @@ func initCli() *cli.App {
 		Action:               cliContextRunner,
 		EnableBashCompletion: true,
 
+		Commands: []*cli.Command{
+			{
+				Name:    "list",
+				Aliases: []string{"ls"},
+				Usage:   "List all the available stages",
+				Action:  cliListStages,
+			},
+		},
 		Flags: []cli.Flag{
 			&cli.PathFlag{
 				Name:     "file",

cmd/togomak/run.go

@@ -44,13 +44,6 @@ func cliContextRunner(cliCtx *cli.Context) error {
 	if cliCtx.Bool("silent") {
 		log.SetLevel(log.ErrorLevel)
 	}
-	var p string
-	contextDir := cliCtx.Path("context")
-	if cliCtx.Path("file") != "" {
-		p = cliCtx.Path("file")
-	} else {
-		p = autoDetectFile(contextDir)
-	}
 
 	if cliCtx.Bool("child") {
 		log.SetFormatter(&log.JSONFormatter{
@@ -66,8 +59,26 @@ func cliContextRunner(cliCtx *cli.Context) error {
 			ForceColors:      false,
 		})
 	}
+	runner.Orchestrator(configFromCliContext(cliCtx))
+	return nil
+}
+
+func cliListStages(clictx *cli.Context) error {
+	runner.List(configFromCliContext(clictx))
+	return nil
+}
 
-	runner.Orchestrator(config.Config{
+func configFromCliContext(cliCtx *cli.Context) config.Config {
+
+	var p string
+	contextDir := cliCtx.Path("context")
+	if cliCtx.Path("file") != "" {
+		p = cliCtx.Path("file")
+	} else {
+		p = autoDetectFile(contextDir)
+	}
+
+	return config.Config{
 		RunStages:     cliCtx.Args().Slice(),
 		ContextDir:    contextDir,
 		NoInteractive: cliCtx.Bool("no-interactive"),
@@ -79,6 +90,5 @@ func cliContextRunner(cliCtx *cli.Context) error {
 		Parameters:    cliCtx.StringSlice("parameters"),
 		FailLazy:      cliCtx.Bool("fail-lazy"),
 		Summary:       config.GetSummaryType(cliCtx.String("summary")),
-	})
-	return nil
+	}
 }

pkg/bootstrap/stage.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-var StageIdValidation = regexp.MustCompile(`^([a-zA-Z_]+)$`)
+var StageIdValidation = regexp.MustCompile(`^([a-zA-Z_/]+)$`)
 
 func StageValidate(ctx *context.Context, data schema.SchemaConfig) {
 

pkg/ops/stage_run.go

@@ -246,6 +246,23 @@ func RunStage(cfg config.Config, stageCtx *context.Context, stage schema.StageCo
 	cmd.Stdout = stageCtx.Logger.Writer()
 	cmd.Stderr = stageCtx.Logger.Writer()
 
+	// add environment variables
+	for k, v := range stage.Environment {
+		tpl, err := pongo2.FromString(v)
+		if err != nil {
+			return fmt.Errorf("cannot render args '%s': %v", v, err)
+		}
+		parsedV, err := tpl.Execute(rootCtx.Data.AsMap())
+		if err != nil {
+			return fmt.Errorf("cannot render args '%s': %v", v, err)
+		}
+
+		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", k, parsedV))
+		if cfg.DryRun {
+			fmt.Printf("export %s=%s\n", k, parsedV)
+		}
+	}
+
 	// we will be reading input from togomak, so we need rich output
 	if stage.Source.Type != "" {
 

pkg/runner/runner.go

@@ -17,6 +17,20 @@ import (
 const SupportedCiConfigVersion = 1
 const StateWorkspace = "state_workspace"
 
+func List(cfg config.Config) {
+
+	/// create context
+	ctx := &context.Context{
+		Logger: log.WithFields(log.Fields{}),
+		Data:   context.Data{},
+	}
+	/// load config
+	data := bootstrap.Config(ctx, &cfg)
+	for _, v := range data.Stages {
+		fmt.Println(v.Id)
+	}
+}
+
 func Orchestrator(cfg config.Config) {
 	orchestratorStartTime := time.Now()
 

pkg/schema/ci.go

@@ -65,6 +65,10 @@ type StageConfig struct {
 
 	DisableLock bool `yaml:"disable-lock,omitempty"`
 
+	// Environment specifies the key value map on the environment variables that need to be exported
+	// in the running stage before the script is executed
+	Environment map[string]string `yaml:"environment,omitempty"`
+
 	tainted bool `yaml:"-"`
 }