apply modules

apply/apply.go

@@ -44,7 +44,10 @@ func Apply(fs afero.Fs, configFile string, tmp *templates.T) error {
 		return e
 	}
 
-	// TODO modules
+	e = applyModules(fs, p.Modules, &tmp.Module)
+	if e != nil {
+		return e
+	}
 
 	return nil
 }
@@ -77,6 +80,22 @@ func applyAccounts(fs afero.Fs, p *plan.Plan, accountBox *packr.Box) (e error) {
 	return nil
 }
 
+func applyModules(fs afero.Fs, p map[string]plan.Module, moduleBox *packr.Box) error {
+	var e error
+	for module, modulePlan := range p {
+		path := fmt.Sprintf("%s/modules/%s", rootPath, module)
+		e = fs.MkdirAll(path, 0755)
+		if e != nil {
+			return e
+		}
+		e = applyTree(moduleBox, afero.NewBasePathFs(fs, path), modulePlan)
+		if e != nil {
+			return e
+		}
+	}
+	return nil
+}
+
 func applyEnvs(fs afero.Fs, p *plan.Plan, envBox *packr.Box, componentBox *packr.Box) (e error) {
 	for env, envPlan := range p.Envs {
 		path := fmt.Sprintf("%s/envs/%s", rootPath, env)

plan/plan.go

@@ -23,7 +23,7 @@ type account struct {
 	TerraformVersion   string
 }
 
-type module struct {
+type Module struct {
 	TerraformVersion string
 }
 
@@ -65,7 +65,7 @@ type Plan struct {
 	Accounts map[string]account
 	Envs     map[string]Env
 	Global   Component
-	Modules  map[string]module
+	Modules  map[string]Module
 	Version  string
 }
 
@@ -205,10 +205,10 @@ func buildAccounts(c *config.Config) map[string]account {
 	return accountPlans
 }
 
-func buildModules(c *config.Config) map[string]module {
-	modulePlans := make(map[string]module, len(c.Modules))
+func buildModules(c *config.Config) map[string]Module {
+	modulePlans := make(map[string]Module, len(c.Modules))
 	for name, conf := range c.Modules {
-		modulePlan := module{}
+		modulePlan := Module{}
 
 		modulePlan.TerraformVersion = resolveRequired(c.Defaults.TerraformVersion, conf.TerraformVersion)
 		modulePlans[name] = modulePlan

templates/module/Makefile.tmpl

@@ -0,0 +1,46 @@
+# Auto-generated by sicc. Do not edit
+# Make improvements in sicc, so that everyone can benefit.
+
+TF_VARS := $(patsubst %,-e%,$(filter TF_VAR_%,$(.VARIABLES)))
+REPO_ROOT := $(shell git rev-parse --show-toplevel)
+REPO_RELATIVE_PATH := $(shell git rev-parse --show-prefix)
+# We need to do this because `terraform fmt` recurses into .terraform/modules
+# and wont' accept more than one file at a time.
+TF=$(wildcard *.tf)
+
+docker_base = \
+	docker run -it --rm -e HOME=/home -v $$HOME/.aws:/home/.aws -v $(REPO_ROOT):/repo \
+	-e GIT_SSH_COMMAND='ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
+	-e TF_PLUGIN_CACHE_DIR="/repo/.terraform.d/plugin-cache" -e TF="$(TF)" \
+	-w /repo/$(REPO_RELATIVE_PATH) $(TF_VARS) $$($(REPO_ROOT)/scripts/docker-ssh-mount.sh)
+docker_terraform = $(docker_base) hashicorp/terraform:{{ .TerraformVersion }}
+docker_sh = $(docker_base) --entrypoint='/bin/sh' hashicorp/terraform:{{ .TerraformVersion }}
+
+all: fmt lint doc
+
+fmt:
+	@$(docker_sh) -c "for f in $(TF); do printf '.'; terraform fmt $$f; done"; \
+	echo
+
+lint: lint-tf
+
+lint-tf:
+	@$(docker_sh) -c "for f in $(TF); do printf '.'; terraform fmt --check=true --diff=true $$f || exit $$? ; done"; \
+	echo
+
+readme:
+	bash .update-readme.sh update
+
+docs: readme
+
+check-docs:
+	@bash .update-readme.sh check; \
+	if [ ! $$? -eq 0 ];  then \
+		echo "Docs are out of date, run \`make docs\`"; \
+	fi
+
+clean:
+
+test:
+
+.PHONY: all check-doc clean docs fmt lint lint-tf readme test

templates/module/README.md.create

@@ -0,0 +1,2 @@
+<!-- START -->
+<!-- END -->

templates/module/sicc.tf.tmpl

@@ -0,0 +1,6 @@
+# Auto-generated by sicc. Do not edit
+# Make improvements in sicc, so that everyone can benefit.
+
+terraform {
+  required_version = "~>{{ .TerraformVersion }}"
+}

templates/templates.go

@@ -7,6 +7,7 @@ type T struct {
 	Component packr.Box
 	Env       packr.Box
 	Global    packr.Box
+	Module    packr.Box
 	Repo      packr.Box
 }
 
@@ -15,5 +16,6 @@ var Templates = &T{
 	Component: packr.NewBox("component"),
 	Env:       packr.NewBox("env"),
 	Global:    packr.NewBox("global"),
+	Module:    packr.NewBox("module"),
 	Repo:      packr.NewBox("repo"),
 }