A few small fixes

Author: bmonkman

internal/config/config.go

@@ -78,7 +78,7 @@ type aws struct {
 	Region    string
 	EKS       eks
 	Cognito   cognito
-	S3Hosting s3Hosting `yaml:"s3_hosting"`
+	S3Hosting s3Hosting `yaml:"s3Hosting"`
 	Terraform terraform
 }
 

internal/generate/kubernetes/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"
 )
 
@@ -24,7 +25,7 @@ func Execute(cfg *config.Commit0Config, pathPrefix string) {
 
 	pathPrefix = filepath.Join(pathPrefix, "kubernetes/terraform")
 
-	log.Println(aurora.Cyan(":alarm_clock: Applying kubernetes configuration..."))
+	log.Println(aurora.Cyan(emoji.Sprintf(":alarm_clock: Applying kubernetes configuration...")))
 	util.ExecuteCommand(exec.Command("terraform", "init"), filepath.Join(pathPrefix, "environments/staging"), envars)
 	util.ExecuteCommand(exec.Command("terraform", "apply", "-auto-approve"), filepath.Join(pathPrefix, "environments/staging"), envars)
 }

internal/generate/terraform/generate.go

@@ -82,7 +82,7 @@ func Execute(cfg *config.Commit0Config, pathPrefix string) {
 
 		pathPrefix = filepath.Join(pathPrefix, "terraform")
 
-		log.Println(aurora.Cyan(":alarm_clock: Applying infrastructure configuration..."))
+		log.Println(aurora.Cyan(emoji.Sprintf(":alarm_clock: Applying infrastructure configuration...")))
 		util.ExecuteCommand(exec.Command("terraform", "init"), filepath.Join(pathPrefix, "environments/staging"), envars)
 		util.ExecuteCommand(exec.Command("terraform", "apply", "-auto-approve"), filepath.Join(pathPrefix, "environments/staging"), envars)
 

templates/commit0/commit0.tmpl

@@ -15,7 +15,7 @@ infrastructure:
       clusterName: staging
     cognito:
       enabled: true
-    s3_hosting:
+    s3Hosting:
       enabled: true
 
 frontend:

templates/terraform/modules/environment/main.tf

@@ -44,14 +44,16 @@ module "kube2iam" {
 }
 
 # {{ if .Config.Infrastructure.AWS.Cognito.Enabled }}
-resource "cognito" "auth" {
+module "cognito" {
+  source      = "../../modules/cognito"
   user_pool   = var.user_pool
   hostname    = var.hostname
 }
 # {{- end}}
 
 # {{ if .Config.Infrastructure.AWS.S3Hosting.Enabled }}
-resource "s3_hosting" "assets" {
+module "s3_hosting" {
+  source        = "../../modules/s3_hosting"
   bucket_name   = var.s3_hosting_bucket_name
 }
 # {{- end}}

templates/terraform/modules/vpc/main.tf

@@ -5,7 +5,7 @@ module "vpc" {
   cidr = "10.20.0.0/16"
 
   azs              = ["${var.region}a", "${var.region}b", "${var.region}c"] # Most regions have 3+ azs
-  private_subnets  = ["10.20.10.0/22", "10.20.14.0/22", "10.20.18.0/22"]
+  private_subnets  = ["10.20.8.0/22", "10.20.12.0/22", "10.20.16.0/22"]
   public_subnets   = ["10.20.41.0/24", "10.20.43.0/24", "10.20.45.0/24"]
   database_subnets = ["10.20.60.0/24", "10.20.62.0/24", "10.20.64.0/24"]