Integrated terraform outputs in frontend code-gen (#75)

* updated frontend templates
* updated readme and configs
* added s3 hosting module and organized terraform

Author: zthomas

README.md

@@ -94,6 +94,7 @@ The application starts at `cmd/generate.go`
 2. loads the config from the commit0.yml config file
 3. based on the configs, run the appropriate generators
   - templator is passed in to the Generate function for dependency injection
+  - `internal/generate/generate_helper.go` iterates through all the configs and runs each generator
 4. each generator (`react/generate.go`, `ci/generate.go` etc) further delegates and actually executes the templating based on the configs passed in.
   - `internal/templator/templator.go` is the base class and includes generic templating handling logic 
   - it CI is required, it'll also call a CI generator and pass in the service specific CI configs

internal/config/config.go

@@ -77,14 +77,23 @@ type aws struct {
 	AccountId string `yaml:"accountId"`
 	Region    string
 	EKS       eks
-	Cognito   bool
+	Cognito   cognito
+	S3Hosting s3Hosting `yaml:"s3_hosting"`
 	Terraform terraform
 }
 
 type terraform struct {
 	RemoteState bool
 }
 
+type cognito struct {
+	Deploy bool
+}
+
+type s3Hosting struct {
+	Deploy bool
+}
+
 type eks struct {
 	ClusterName string `yaml:"clusterName"`
 	WorkerAMI   string `yaml:"workerAMI"`

internal/config/react.go

@@ -4,18 +4,15 @@ type reactApp struct {
 	Name string
 }
 
-type reactAccount struct {
-	Enabled  bool
-	Required bool
-}
-
-type reactView struct {
-	Path      string
-	Component string
+type environment struct {
+	CognitoPoolID   string
+	CognitoClientID string
 }
 
 type frontend struct {
 	Framework string
+	Hostname  string
 	App       reactApp
 	CI        CI
+	Env       environment
 }

internal/generate/generate_helper.go

@@ -45,13 +45,6 @@ func GenerateArtifactsHelper(t *templator.Templator, cfg *config.Commit0Config,
 		kubernetes.Generate(t, cfg, &wg, pathPrefix)
 	}
 
-	// @TODO : This strucuture probably needs to be adjusted. Probably too generic.
-	switch cfg.Frontend.Framework {
-	case util.React:
-		log.Println(aurora.Cyan(emoji.Sprintf("Creating React frontend")))
-		react.Generate(t, cfg, &wg, pathPrefix)
-	}
-
 	util.TemplateFileIfDoesNotExist(pathPrefix, "README.md", t.Readme, &wg, templator.GenericTemplateData{*cfg})
 
 	// Wait for all the templates to be generated
@@ -63,4 +56,22 @@ func GenerateArtifactsHelper(t *templator.Templator, cfg *config.Commit0Config,
 		terraform.Execute(cfg, pathPrefix)
 		kubernetes.Execute(cfg, pathPrefix)
 	}
+
+	if cfg.Infrastructure.AWS.Cognito.Deploy {
+		outputs := []string{
+			"cognito_pool_id",
+			"cognito_client_id",
+		}
+		outputValues := terraform.GetOutputs(cfg, pathPrefix, outputs)
+		cfg.Frontend.Env.CognitoPoolID = outputValues["cognito_pool_id"]
+		cfg.Frontend.Env.CognitoClientID = outputValues["cognito_client_id"]
+	}
+
+	// @TODO : This strucuture probably needs to be adjusted. Probably too generic.
+	switch cfg.Frontend.Framework {
+	case util.React:
+		log.Println(aurora.Cyan(emoji.Sprintf("Creating React frontend")))
+		react.Generate(t, cfg, &wg, pathPrefix)
+	}
+
 }

internal/generate/terraform/generate.go

@@ -9,6 +9,7 @@ import (
 	"github.com/commitdev/commit0/internal/config"
 	"github.com/commitdev/commit0/internal/templator"
 	"github.com/commitdev/commit0/internal/util"
+
 	"github.com/kyokomi/emoji"
 	"github.com/logrusorgru/aurora"
 )
@@ -36,6 +37,23 @@ func Generate(t *templator.Templator, cfg *config.Commit0Config, wg *sync.WaitGr
 	t.Terraform.TemplateFiles(data, false, wg, pathPrefix)
 }
 
+func GetOutputs(config *config.Commit0Config, pathPrefix string, outputs []string) map[string]string {
+	outputsMap := make(map[string]string)
+
+	log.Println("Preparing aws environment...")
+
+	envars := util.MakeAwsEnvars(util.GetSecrets())
+
+	path := filepath.Join(pathPrefix, "terraform")
+
+	for _, output := range outputs {
+		outputValue := util.ExecuteCommandOutput(exec.Command("terraform", "output", output), path, envars)
+		outputsMap[output] = outputValue
+	}
+
+	return outputsMap
+}
+
 // Execute terrafrom init & plan
 func Execute(config *config.Commit0Config, pathPrefix string) {
 	// @TODO : Change this check. Most likely we should discover the accountid

internal/templator/templator.go

@@ -120,7 +120,7 @@ func NewCITemplator(box *packr.Box) *CITemplator {
 
 	githubTemplateSource, _ := box.FindString("ci/github.tmpl")
 	// Github also uses double curly braces for their templates
-	githubTemplate, _ := template.New("CIConfig").Delims("<%=", "%>").Parse(githubTemplateSource)
+	githubTemplate, _ := template.New("CIConfig").Delims("<%", "%>").Parse(githubTemplateSource)
 
 	return &CITemplator{
 		CircleCI: circleciTemplate,
@@ -170,7 +170,7 @@ func NewEJSDirectoryTemplator(box *packr.Box, dir string) *DirectoryTemplator {
 	templates := []*template.Template{}
 	for _, file := range getFileNames(box, dir) {
 		templateSource, _ := box.FindString(file)
-		template, err := template.New(file).Delims("<%=", "%>").Funcs(util.FuncMap).Parse(templateSource)
+		template, err := template.New(file).Delims("<%", "%>").Funcs(util.FuncMap).Parse(templateSource)
 		if err != nil {
 			panic(err)
 		}

internal/util/util.go

@@ -124,3 +124,19 @@ func ExecuteCommand(cmd *exec.Cmd, pathPrefix string, envars []string) {
 		log.Printf("Failed to capture stderr: %v\n", errStderr)
 	}
 }
+
+func ExecuteCommandOutput(cmd *exec.Cmd, pathPrefix string, envars []string) string {
+	dir := GetCwd()
+
+	cmd.Dir = path.Join(dir, pathPrefix)
+
+	if envars != nil {
+		cmd.Env = envars
+	}
+
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Fatalf("Executing terraform output failed: %v\n", err)
+	}
+	return string(out)
+}

templates/ci/github.tmpl

@@ -26,4 +26,29 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: build
-        path: build
+        path: build
+
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      
+      - name: Download build artifacts
+        uses: actions/download-artifact@v1
+        with:
+          name: build
+
+      # https://github.com/opspresso/action-s3-sync
+      - name: Publish to AWS S3
+        uses: opspresso/action-s3-sync@master
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: "<% .Config.AWS.Region %>"
+          FROM_PATH: "./build"
+          DEST_PATH: "s3://<% .Config.Frontend.App.Name %>"
+          OPTIONS: "--acl public-read"

templates/commit0/commit0.tmpl

@@ -14,11 +14,15 @@ infrastructure:
     eks:
       clusterName: staging
       deploy: true
+    cognito:
+      deploy: true
+    s3_hosting:
+      deploy: true
 
 frontend:
   framework: {{.FrontendFramework}}
   ci:
-    system: circleci
+    system: github
   app:
     name: {{.ProjectName}}
 

templates/react/.env

@@ -3,4 +3,6 @@ REACT_APP_HOST=http://localhost:3000
 REACT_APP_AUTH_DOMAIN=
 REACT_APP_AUTH_CLIENT_ID=
 REACT_APP_GRAPHQL_HOST=http://localhost:4000
-REACT_APP_FILE_HOST=http://localhost:4000
+REACT_APP_FILE_HOST=http://localhost:4000
+<% if .Config.Frontend.Env.CognitoPoolID %>REACT_APP_COGNITO_POOL_ID=<% .Config.Frontend.Env.CognitoPoolID %><%- end %>
+<% if .Config.Frontend.Env.CognitoClientID %>REACT_APP_COGNITO_CLIENT_ID=<% .Config.Frontend.Env.CognitoClientID %><%- end %>