Some fixes to k8s generation and tf execution

Author: bmonkman

cmd/generate.go

@@ -1,6 +1,9 @@
 package cmd
 
 import (
+	"log"
+	"sync"
+
 	"github.com/commitdev/commit0/internal/config"
 	"github.com/commitdev/commit0/internal/generate/docker"
 	"github.com/commitdev/commit0/internal/generate/golang"
@@ -12,8 +15,6 @@ import (
 	"github.com/commitdev/commit0/internal/util"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/spf13/cobra"
-	"log"
-	"sync"
 )
 
 var configPath string
@@ -71,7 +72,14 @@ var generateCmd = &cobra.Command{
 			docker.GenerateGoHTTPGWDockerFile(t, cfg, &wg)
 		}
 
+		// Wait for all the templates to be generated
 		wg.Wait()
+
+		switch language {
+		case Kubernetes:
+			kubernetes.Execute(cfg)
+		}
+
 	},
 }
 

internal/config/config.go

@@ -60,10 +60,10 @@ type Commit0Config struct {
 }
 
 type Kubernetes struct {
-	ClusterName  string
-	Deploy       bool
-	AWSAccountId string
-	AWSRegion    string
+	ClusterName  string `yaml:"clusterName"`
+	Deploy       bool   `yaml:"deploy"`
+	AWSAccountId string `yaml:"awsAccountId"`
+	AWSRegion    string `yaml:"awsRegion"`
 }
 
 func LoadConfig(filePath string) *Commit0Config {

internal/generate/kubernetes/generate.go

@@ -1,13 +1,11 @@
 package kubernetes
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"log"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"sync"
 
 	"github.com/commitdev/commit0/internal/config"
@@ -17,65 +15,50 @@ import (
 func Generate(templator *templator.Templator, config *config.Commit0Config, wg *sync.WaitGroup) {
 	templator.Kubernetes.TemplateFiles(config, false, wg)
 
-	if config.Kubernetes.Deploy {
-		_tf_init := tf_init()
-		_tf_plan := tf_plan()
-		execute(_tf_init)
-		execute(_tf_plan)
-	}
-
 }
 
-// Terraform init cmd
-func tf_init() *exec.Cmd {
-
-	return exec.Command("terraform", "init")
-}
-
-// Terraform plan cmd
-func tf_plan() *exec.Cmd {
-
-	return exec.Command("terraform", "plan")
+func Execute(config *config.Commit0Config) {
+	if config.Kubernetes.Deploy {
+		log.Println("Planning infrastructure...")
+		execute(exec.Command("terraform", "init"))
+		execute(exec.Command("terraform", "plan"))
+	}
 }
 
 func execute(cmd *exec.Cmd) {
-	dir, err1 := filepath.Abs(filepath.Dir(os.Args[0]))
-	if err1 != nil {
-		log.Fatal(err1)
+	dir, err := os.Getwd()
+	if err != nil {
+		log.Fatalf("Getting working directory failed: %v\n", err)
 	}
 
-	cmd.Dir = dir + "/kubernetes/terraform/environments/staging"
+	cmd.Dir = fmt.Sprintf("%s/kubernetes/terraform/environments/staging", dir)
 
-	var stdoutBuf, stderrBuf bytes.Buffer
-	stdoutIn, _ := cmd.StdoutPipe()
-	stderrIn, _ := cmd.StderrPipe()
+	stdoutPipe, _ := cmd.StdoutPipe()
+	stderrPipe, _ := cmd.StderrPipe()
 
 	var errStdout, errStderr error
-	stdout := io.MultiWriter(os.Stdout, &stdoutBuf)
-	stderr := io.MultiWriter(os.Stderr, &stderrBuf)
-	err := cmd.Start()
+	err = cmd.Start()
 	if err != nil {
-		log.Fatalf("cmd.Start() failed with '%s'\n", err)
+		log.Fatalf("Starting terraform command failed: %v\n", err)
 	}
 
-	var wg sync.WaitGroup
-	wg.Add(1)
-
 	go func() {
-		_, errStdout = io.Copy(stdout, stdoutIn)
-		wg.Done()
+		_, errStdout = io.Copy(os.Stdout, stdoutPipe)
+	}()
+	go func() {
+		_, errStderr = io.Copy(os.Stderr, stderrPipe)
 	}()
-
-	_, errStderr = io.Copy(stderr, stderrIn)
-	wg.Wait()
 
 	err = cmd.Wait()
 	if err != nil {
-		log.Fatalf("cmd.Run() failed with %s\n", err)
+		log.Fatalf("Executing terraform command failed: %v\n", err)
+	}
+
+	if errStdout != nil {
+		log.Printf("Failed to capture stdout: %v\n", errStdout)
 	}
-	if errStdout != nil || errStderr != nil {
-		log.Fatal("failed to capture stdout or stderr\n")
+
+	if errStderr != nil {
+		log.Printf("Failed to capture stderr: %v\n", errStderr)
 	}
-	outStr, errStr := string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())
-	fmt.Printf("\nout:\n%s\nerr:\n%s\n", outStr, errStr)
 }

templates/commit0/commit0.tmpl

@@ -7,6 +7,12 @@ maintainers:
 # - name: bob
 #   email: bob@test.com
 
+kubernetes:
+  clusterName: staging
+  deploy: true
+  awsAccountId: 1234
+  awsRegion: us-east-1
+
 network:
   grpc:
     host: 0.0.0.0

templates/kubernetes/terraform/modules/eks/main.tf

@@ -9,7 +9,7 @@ module "eks" {
   source  = "terraform-aws-modules/eks/aws"
   version = "6.0.2"
 
-  cluster_name    = "${var.project}"
+  cluster_name    = var.project
   cluster_version = "1.14"
   subnets         = var.private_subnets
   vpc_id          = var.vpc_id
@@ -44,4 +44,4 @@ module "eks" {
   tags = {
     environment = var.environment
   }
-}
+}