[apply] execute make in each project #145

thdaraujo · 2020-06-02T19:06:53Z

Apply Command [closes #132]

This MR will add the zero apply basic functionality.

zero apply loads the zero-project.yaml config file and executes make on each module folder of a specific project, passing environment variables as received by the command.

The zero-project.yaml file was changed to reflect the spec (link). Notice the change to the modules attribute from a list to just a single map of modulues. See example below:

name: abc

context:

modules:
    infrastructure:
        parameters:
            repoName: infrastructure
            region: us-east-1
            accountId: 12345
            productionHost: something.com
        files:
            dir: infrastructure
            repo: https://github.com/myorg/infrastructure
    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

The struct projectconfig.ZeroProjectConfig that holds the unmarshalled config information was also changed to reflect that.

Some changes to the zero init function were also needed, like marshalling the config context that the user fills in during the execution of init and saving the zero-project.yaml file, and everything related to the struct.

bmonkman · 2020-06-08T17:52:14Z

internal/config/projectconfig/project_config.go

-	Infrastructure Infrastructure // TODO simplify and flatten / rename?
-	Context        map[string]string
-	Modules        []string
+	Name           string            `yaml:"name"`


This will likely cause conflicts with @dtoki 's stuff but we can figure it out.

bmonkman · 2020-06-08T17:53:36Z

internal/config/projectconfig/apply.go

@@ -0,0 +1,43 @@
+package projectconfig


I don't think this is the right place for this. Maybe move to an internal/apply package?

bmonkman · 2020-06-08T17:53:54Z

internal/context/apply.go

@@ -0,0 +1,65 @@
+package context


Move to an internal/apply package?

bmonkman · 2020-06-08T18:24:18Z

internal/context/apply.go

+		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!
+Only a single environment may be suitable for an initial test, but for a real system we suggest setting up both staging and production environments.`)
+		applyEnvironments = promptEnvironments()


This won't affect the value of applyEnvironments in the calling code, but it might be better to merge this and the stuff in the other file into the same package anyway.

bmonkman · 2020-06-08T18:27:39Z

internal/context/init.go

@@ -63,11 +63,11 @@ func Init(projectName string, outDir string) *projectconfig.ZeroProjectConfig {
 }

 // loadAllModules takes a list of module sources, downloads those modules, and parses their config
-func loadAllModules(moduleSources []string) map[string]moduleconfig.ModuleConfig {
+func loadAllModules(moduleSources projectconfig.Modules) map[string]moduleconfig.ModuleConfig {


This shouldn't accept projectconfig.Modules, just a slice of string. At this point there is no project config and all we have are some repo paths.

changed it back to a []string

Thanks, could you remove the changes to the registry section as well?

internal/config/projectconfig/apply.go

bmonkman

Some changes requested

bmonkman · 2020-06-09T19:23:34Z

internal/util/util.go

+
+// AppendProjectEnvToCmdEnv will add all the keys and values from envMap
+// into envList as key-value pair strings (e.g.: "key=value")
+func AppendProjectEnvToCmdEnv(envMap map[string]string, envList []string) []string {


This will conflict with a change in David's PR since he also moved this function. But I agree it should be here in util.

bmonkman

Nice! Thanks!

Runs `make` on every created project folder [related to #132]

the reason is because yaml does not support tabs

thdaraujo force-pushed the ta/make-projects branch from e683ff4 to 1ae62bc Compare June 3, 2020 00:52

thdaraujo changed the title ~~[apply] execute make in each project~~ (WIP) [apply] execute make in each project Jun 3, 2020

thdaraujo force-pushed the ta/make-projects branch 2 times, most recently from 423ea69 to 4d64652 Compare June 4, 2020 19:33

thdaraujo marked this pull request as ready for review June 6, 2020 03:08

thdaraujo changed the title ~~(WIP) [apply] execute make in each project~~ [apply] execute make in each project Jun 6, 2020

thdaraujo force-pushed the ta/make-projects branch from 541970b to 5428e94 Compare June 7, 2020 20:42

thdaraujo self-assigned this Jun 8, 2020

bmonkman reviewed Jun 8, 2020

View reviewed changes

internal/config/projectconfig/apply.go Outdated Show resolved Hide resolved

bmonkman requested changes Jun 8, 2020

View reviewed changes

bmonkman reviewed Jun 9, 2020

View reviewed changes

thdaraujo force-pushed the ta/make-projects branch from 986cbae to b7e908d Compare June 10, 2020 02:27

bmonkman approved these changes Jun 10, 2020

View reviewed changes

thdaraujo added 6 commits June 10, 2020 11:08

adds apply command

6799dc6

Runs `make` on every created project folder [related to #132]

zero apply context (WIP)

de27965

changes example config tabs to spaces

3926600

the reason is because yaml does not support tabs

changes ZeroProjectConfig.Modules structure and yaml file

9998eb4

marshall and save config file

1b38e8c

apply path fix

9cb7d30

thdaraujo force-pushed the ta/make-projects branch from ddbb4e7 to fc0217e Compare June 10, 2020 18:27

thdaraujo added 4 commits June 10, 2020 11:38

adds tests for apply output and sample project

c3d0fa0

loadAllModules should accept a slice of string

945146b

append module parameters when running apply

aef6b57

moving apply to internal/apply

5c6786c

thdaraujo force-pushed the ta/make-projects branch from fc0217e to 2e2718a Compare June 10, 2020 18:39

fix initialization of config

51b52d5

thdaraujo force-pushed the ta/make-projects branch from 2e2718a to 51b52d5 Compare June 10, 2020 18:46

bmonkman approved these changes Jun 10, 2020

View reviewed changes

thdaraujo merged commit dbfbb43 into master Jun 10, 2020

thdaraujo deleted the ta/make-projects branch June 10, 2020 21:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[apply] execute make in each project #145

[apply] execute make in each project #145

thdaraujo commented Jun 2, 2020 •

edited

bmonkman Jun 8, 2020

bmonkman Jun 8, 2020

bmonkman Jun 8, 2020

bmonkman Jun 8, 2020

bmonkman Jun 8, 2020

thdaraujo Jun 9, 2020 •

edited

bmonkman Jun 9, 2020

thdaraujo Jun 10, 2020

bmonkman left a comment

bmonkman Jun 9, 2020

bmonkman left a comment

[apply] execute make in each project #145

[apply] execute make in each project #145

Conversation

thdaraujo commented Jun 2, 2020 • edited

Apply Command [closes #132]

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thdaraujo Jun 9, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmonkman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmonkman left a comment

Choose a reason for hiding this comment

thdaraujo commented Jun 2, 2020 •

edited

thdaraujo Jun 9, 2020 •

edited