cdep: add terraform workspace types (#771)

tools/cdep/app/publish_slack.go

@@ -6,14 +6,13 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/cuvva/cuvva-public-go/tools/cdep/parsers"
-
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/sns"
+	"github.com/cuvva/cuvva-public-go/tools/cdep/parsers"
 )
 
 func (a App) PublishToSlack(ctx context.Context, req *parsers.Params, commitMessage string, updatedFiles []string, repoPath string) error {
-	user, err := exec.CommandContext(ctx, "git", "config", "user.name").Output()
+	user, err := exec.CommandContext(ctx, "git", "config", "user.name").CombinedOutput()
 	if err != nil {
 		fmt.Println(string(user))
 		return err

tools/cdep/app/update.go

@@ -43,7 +43,7 @@ func (a App) Update(ctx context.Context, req *parsers.Params, overruleChecks []s
 
 	log.Info("fetching config repo")
 
-	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "fetch", "--all").Output(); err != nil {
+	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "fetch", "--all").CombinedOutput(); err != nil {
 		fmt.Println(string(out))
 		return err
 	}
@@ -69,14 +69,18 @@ func (a App) Update(ctx context.Context, req *parsers.Params, overruleChecks []s
 
 	defaultRef := fmt.Sprintf("refs/heads/%s", cdep.DefaultBranch)
 	if ref.Name().String() != defaultRef {
-		return cher.New("config_not_on_master", nil)
+		if !slicecontains.String(overruleChecks, "config_not_on_master") {
+			return cher.New("config_not_on_master", nil)
+		}
+
+		log.Warn("config_not_on_master overruled")
 	}
 
 	log.Info("pulling config repo from remote")
 
-	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "pull", "origin", cdep.DefaultBranch).Output(); err != nil {
+	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "pull").CombinedOutput(); err != nil {
 		fmt.Println(string(out))
-		return err
+		return fmt.Errorf("git pull: %w", err)
 	}
 
 	wt, err := configRepo.Worktree()
@@ -152,6 +156,24 @@ func (a App) Update(ctx context.Context, req *parsers.Params, overruleChecks []s
 					updatedFiles = append(updatedFiles, shorthandPath)
 				}
 			}
+		case "terra": // terraform
+			for _, workspace := range req.Items {
+				p := paths.GetPathForTerra(repoPath, req.System, env, workspace)
+
+				if _, err := os.Stat(p); err != nil {
+					log.Warn(err)
+				}
+
+				changed, err := a.AddToConfig(p, req.Branch, latestHash)
+				if err != nil {
+					return err
+				}
+
+				if changed {
+					shorthandPath := path.Join(req.System, env, "terra", workspace+".json")
+					updatedFiles = append(updatedFiles, shorthandPath)
+				}
+			}
 		default:
 			return cher.New("unexpected_type", cher.M{"type": req.Type})
 		}
@@ -188,7 +210,7 @@ func (a App) Update(ctx context.Context, req *parsers.Params, overruleChecks []s
 
 	log.Info("pushing commit to config repo")
 
-	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "push", "origin", cdep.DefaultBranch).Output(); err != nil {
+	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "push", "origin", "HEAD").CombinedOutput(); err != nil {
 		fmt.Println(string(out))
 		return fmt.Errorf("config git push: %w", err)
 	}

tools/cdep/app/update_default.go

@@ -33,7 +33,7 @@ func (a App) UpdateDefault(ctx context.Context, req *parsers.Params, overruleChe
 
 	log.Info("fetching config repo")
 
-	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "fetch", "--all").Output(); err != nil {
+	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "fetch", "--all").CombinedOutput(); err != nil {
 		fmt.Println(string(out))
 		return err
 	}
@@ -64,7 +64,7 @@ func (a App) UpdateDefault(ctx context.Context, req *parsers.Params, overruleChe
 
 	log.Info("pulling config repo from remote")
 
-	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "pull", "origin", cdep.DefaultBranch).Output(); err != nil {
+	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "pull", "origin", cdep.DefaultBranch).CombinedOutput(); err != nil {
 		fmt.Println(string(out))
 		return err
 	}
@@ -170,7 +170,7 @@ func (a App) UpdateDefault(ctx context.Context, req *parsers.Params, overruleChe
 
 	log.Info("pushing commit to config repo")
 
-	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "push", "origin", cdep.DefaultBranch).Output(); err != nil {
+	if out, err := exec.CommandContext(ctx, "git", "-C", repoPath, "push", "origin", cdep.DefaultBranch).CombinedOutput(); err != nil {
 		fmt.Println(string(out))
 		return err
 	}

tools/cdep/parsers/parse.go

@@ -11,7 +11,7 @@ import (
 // exceptions of services that start with "service-"
 var exceptions = map[string]struct{}{
 	"web-underwriter": {},
-	"web-mid": {},
+	"web-mid":         {},
 }
 
 func Parse(args []string, branch string, prodSys bool, message string) (*Params, error) {

tools/cdep/paths/terra.go

@@ -0,0 +1,9 @@
+package paths
+
+import (
+	"path"
+)
+
+func GetPathForTerra(repo, system, env, workspace string) string {
+	return path.Join(repo, system, env, "terra", workspace+".json")
+}

tools/cdep/types.go

@@ -11,6 +11,7 @@ var Types = map[string]struct{}{
 	"lambdas":  {},
 	"service":  {},
 	"services": {},
+	"terra":    {},
 }
 
 func ParseTypeArg(in string) (string, error) {
@@ -26,6 +27,8 @@ func ParseTypeArg(in string) (string, error) {
 		return "service", nil
 	case "lambda", "lambdas":
 		return "lambda", nil
+	case "terra":
+		return "terra", nil
 	default:
 		return "", cher.New("impossible", nil)
 	}