improved the cmd executor tests

Author: Southclaws

executor/cmd.go

@@ -25,32 +25,43 @@ func NewCommandExecutor(secrets secret.Store) CommandExecutor {
 // Subscribe implements executor.Executor
 func (e *CommandExecutor) Subscribe(bus chan task.ExecutionTask) {
 	for t := range bus {
-		if err := e.execute(t.Target, t.Path, t.Shutdown); err != nil {
+		if err := e.execute(t.Target, t.Path, t.Shutdown, t.Env); err != nil {
 			zap.L().Error("executor task unsuccessful",
 				zap.String("target", t.Target.Name),
 				zap.Bool("shutdown", t.Shutdown),
 				zap.Error(err))
 		}
 	}
-	return
 }
 
 func (e *CommandExecutor) execute(
 	target task.Target,
 	path string,
 	shutdown bool,
+	execEnv map[string]string,
 ) (err error) {
-	env, err := e.secrets.GetSecretsForTarget(target.Name)
+	secrets, err := e.secrets.GetSecretsForTarget(target.Name)
 	if err != nil {
 		return errors.Wrap(err, "failed to get secrets for target")
 	}
 
+	env := make(map[string]string)
+
+	// merge execution environment with secrets
+	for k, v := range execEnv {
+		env[k] = v
+	}
+	for k, v := range secrets {
+		env[k] = v
+	}
+
 	zap.L().Debug("executing with secrets",
 		zap.String("target", target.Name),
 		zap.Strings("cmd", target.Up),
 		zap.String("url", target.RepoURL),
 		zap.String("dir", path),
-		zap.Int("secrets", len(env)))
+		zap.Int("env", len(env)),
+		zap.Int("secrets", len(secrets)))
 
 	return target.Execute(path, env, shutdown)
 }

executor/cmd_test.go

@@ -18,7 +18,11 @@ func TestMain(m *testing.M) {
 }
 
 func TestCommandExecutor(t *testing.T) {
-	ce := executor.NewCommandExecutor(&memory.MemorySecrets{})
+	ce := executor.NewCommandExecutor(&memory.MemorySecrets{
+		Secrets: map[string]string{
+			"SOME_SECRET": "123",
+		},
+	})
 	bus := make(chan task.ExecutionTask)
 
 	g := errgroup.Group{}
@@ -27,7 +31,7 @@ func TestCommandExecutor(t *testing.T) {
 		bus <- task.ExecutionTask{
 			Target: task.Target{
 				Name: "test_executor",
-				Up:   []string{"touch", "01"},
+				Up:   []string{"git", "init"},
 			},
 			Path: "./.test",
 		}
@@ -43,7 +47,9 @@ func TestCommandExecutor(t *testing.T) {
 	// wait for the task to be consumed and executed
 	time.Sleep(time.Second)
 
-	if _, err := os.Stat(".test/01"); err == os.ErrNotExist {
-		t.Error("expected file .test/01 to exist:", err)
+	if _, err := os.Stat(".test/.git"); err != nil {
+		t.Error("expected path .test/.git to exist:", err)
 	}
+
+	os.RemoveAll(".test/.git")
 }