moving apply to internal/apply

Author: thdaraujo

cmd/apply.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
+	"github.com/commitdev/zero/internal/apply"
 	"github.com/commitdev/zero/internal/config/projectconfig"
 	"github.com/commitdev/zero/internal/constants"
-	"github.com/commitdev/zero/internal/context"
 	"github.com/spf13/cobra"
 )
 
@@ -21,12 +21,7 @@ var applyCmd = &cobra.Command{
 	Use:   "apply",
 	Short: "Execute modules to create projects, infrastructure, etc.",
 	Run: func(cmd *cobra.Command, args []string) {
-
-		// @TODO : Pass environments to make commands
-
-		// @TODO where applyConfigPath comes from?
-		projectContext := context.Apply(applyEnvironments, applyConfigPath)
 		// @TODO rootdir?
-		projectconfig.Apply(projectconfig.RootDir, projectContext, applyEnvironments)
+		apply.Apply(projectconfig.RootDir, applyConfigPath, applyEnvironments)
 	},
 }

internal/context/apply.go internal/apply/apply.gointernal/context/apply.go renamed to internal/apply/apply.go

@@ -1,17 +1,40 @@
-package context
+package apply
 
 import (
 	"fmt"
+
 	"log"
+	"os/exec"
 	"path"
+	"strings"
+
+	"github.com/commitdev/zero/internal/util"
+	"github.com/commitdev/zero/pkg/util/flog"
 
 	"github.com/commitdev/zero/internal/config/projectconfig"
 	"github.com/commitdev/zero/pkg/util/exit"
 	"github.com/manifoldco/promptui"
 )
 
-// Apply will load the context/configuration to be used by the apply command
-func Apply(applyEnvironments []string, applyConfigPath string) *projectconfig.ZeroProjectConfig {
+// Apply will bootstrap the runtime environment for the project
+func Apply(dir string, applyConfigPath string, applyEnvironments []string) []string {
+	context := loadContext(dir, applyConfigPath, applyEnvironments)
+
+	flog.Infof(":tada: Bootstrapping project %s. Please use the zero.[hcl, yaml] file to modify the project as needed. %s.", context.Name)
+
+	flog.Infof("Cloud provider: %s", "AWS") // will this come from the config?
+
+	flog.Infof("Runtime platform: %s", "Kubernetes")
+
+	flog.Infof("Infrastructure executor: %s", "Terraform")
+
+	// other details...
+
+	return makeAll(dir, context, applyEnvironments)
+}
+
+// loadContext will load the context/configuration to be used by the apply command
+func loadContext(dir string, applyConfigPath string, applyEnvironments []string) *projectconfig.ZeroProjectConfig {
 	if len(applyEnvironments) == 0 {
 		fmt.Println(`Choose the environments to apply. This will create infrastructure, CI pipelines, etc.
 At this point, real things will be generated that may cost money!
@@ -24,8 +47,7 @@ Only a single environment may be suitable for an initial test, but for a real sy
 	if applyConfigPath == "" {
 		exit.Fatal("config path cannot be empty!")
 	}
-
-	configPath := path.Join(projectconfig.RootDir, applyConfigPath)
+	configPath := path.Join(dir, applyConfigPath)
 	projectConfig := projectconfig.LoadConfig(configPath)
 	return projectConfig
 }
@@ -63,3 +85,18 @@ func validateEnvironments(applyEnvironments []string) {
 		}
 	}
 }
+
+func makeAll(dir string, projectContext *projectconfig.ZeroProjectConfig, applyEnvironments []string) []string {
+	environmentArg := fmt.Sprintf("ENVIRONMENT=%s", strings.Join(applyEnvironments, ","))
+	envList := []string{environmentArg}
+	outputs := []string{}
+
+	for _, mod := range projectContext.Modules {
+		modulePath := path.Join(dir, mod.Files.Directory)
+		envList = util.AppendProjectEnvToCmdEnv(mod.Parameters, envList)
+
+		output := util.ExecuteCommandOutput(exec.Command("make"), modulePath, envList)
+		outputs = append(outputs, output)
+	}
+	return outputs
+}

…ernal/config/projectconfig/apply_test.go internal/apply/apply_test.gointernal/config/projectconfig/apply_test.go renamed to internal/apply/apply_test.go internal/config/projectconfig/apply_test.go renamed to internal/apply/apply_test.go

@@ -1,21 +1,17 @@
-package projectconfig_test
+package apply_test
 
 import (
 	"testing"
 
-	"github.com/commitdev/zero/internal/config/projectconfig"
+	"github.com/commitdev/zero/internal/apply"
+	"github.com/commitdev/zero/internal/constants"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestApply(t *testing.T) {
 	// @TODO is there a way to do this without relative paths?
-	// execCMD will use the current folder as target...
-	dir := "../../../tests/test_data/"
-	projectName := "sample_project"
-	projectContext := &projectconfig.ZeroProjectConfig{
-		Name:    projectName,
-		Modules: projectconfig.EKSGoReactSampleModules(),
-	}
+	dir := "../../tests/test_data/sample_project/"
+	applyConfigPath := constants.ZeroProjectYml
 	applyEnvironments := []string{"staging", "production"}
 
 	want := []string{
@@ -25,7 +21,7 @@ func TestApply(t *testing.T) {
 	}
 
 	t.Run("Should run apply and execute make on each folder module", func(t *testing.T) {
-		got := projectconfig.Apply(dir, projectContext, applyEnvironments)
-		assert.Equal(t, want, got)
+		got := apply.Apply(dir, applyConfigPath, applyEnvironments)
+		assert.ElementsMatch(t, want, got)
 	})
 }

internal/config/projectconfig/apply.go

@@ -5,8 +5,6 @@ import (
 	"encoding/base64"
 	"io"
 	"log"
-	"os"
-	"os/exec"
 	"path"
 	"regexp"
 	"sync"
@@ -17,7 +15,6 @@ import (
 	"github.com/commitdev/zero/internal/util"
 	"github.com/commitdev/zero/pkg/util/exit"
 	"github.com/hashicorp/go-getter"
-	"github.com/manifoldco/promptui"
 )
 
 // TemplateModule merges a module instance params with the static configs
@@ -49,73 +46,6 @@ func ParseModuleConfig(source string) (moduleconfig.ModuleConfig, error) {
 	return config, err
 }
 
-// aws cli prints output with linebreak in them
-func sanitizePromptResult(str string) string {
-	re := regexp.MustCompile("\\n")
-	return re.ReplaceAllString(str, "")
-}
-
-// TODO : Use this function signature instead
-// PromptParams renders series of prompt UI based on the config
-func PromptParams(moduleConfig moduleconfig.ModuleConfig, parameters map[string]string) (map[string]string, error) {
-	return map[string]string{}, nil
-}
-
-// PromptParams renders series of prompt UI based on the config
-func (m *TemplateModule) PromptParams(projectContext map[string]string) error {
-	for _, promptConfig := range m.Config.Prompts {
-
-		label := promptConfig.Label
-		if promptConfig.Label == "" {
-			label = promptConfig.Field
-		}
-
-		// deduplicate fields already prompted and received
-		if _, isAlreadySet := projectContext[promptConfig.Field]; isAlreadySet {
-			continue
-		}
-
-		var err error
-		var result string
-		if len(promptConfig.Options) > 0 {
-			prompt := promptui.Select{
-				Label: label,
-				Items: promptConfig.Options,
-			}
-			_, result, err = prompt.Run()
-
-		} else if promptConfig.Execute != "" {
-			// TODO: this could perhaps be set as a default for part of regular prompt
-			cmd := exec.Command("bash", "-c", promptConfig.Execute)
-			cmd.Env = util.AppendProjectEnvToCmdEnv(projectContext, os.Environ())
-			out, err := cmd.Output()
-
-			if err != nil {
-				log.Fatalf("Failed to execute  %v\n", err)
-				panic(err)
-			}
-			result = string(out)
-		} else {
-			prompt := promptui.Prompt{
-				Label: label,
-			}
-			result, err = prompt.Run()
-		}
-		if err != nil {
-			return err
-		}
-
-		result = sanitizePromptResult(result)
-		if m.Params == nil {
-			m.Params = make(map[string]string)
-		}
-		m.Params[promptConfig.Field] = result
-		projectContext[promptConfig.Field] = result
-	}
-
-	return nil
-}
-
 // GetSourcePath gets a unique local source directory name. For local modules, it use the local directory
 func GetSourceDir(source string) string {
 	if !isLocal(source) {

internal/module/module.go

@@ -0,0 +1,17 @@
+name: sample_project
+
+context:
+
+modules:
+    aws-eks-stack:
+        files:
+            dir: zero-aws-eks-stack
+            repo: github.com/commitdev/zero-aws-eks-stack
+    deployable-backend:
+        files:
+            dir: zero-deployable-backend
+            repo: github.com/commitdev/zero-deployable-backend
+    deployable-react-frontend:
+        files:
+            dir: zero-deployable-react-frontend
+            repo: github.com/commitdev/zero-deployable-react-frontend