Move templates out of lambda folder

asfadmin · Mar 3, 2023 · a532520 · a532520
1 parent 2e27d0f
commit a532520
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -4,8 +4,8 @@ SOURCES := \
 	lambda/tea_bumper.py \
 	lambda/update_lambda.py
 
-HTML_TEMPLATES := $(wildcard lambda/templates/*.html)
-MD_TEMPLATES := $(wildcard lambda/templates/*.md)
+HTML_TEMPLATES := $(wildcard templates/*.html)
+MD_TEMPLATES := $(wildcard templates/*.md)
 TERRAFORM := $(wildcard terraform/*)
 
 REQUIREMENTS_IN := $(wildcard requirements/*.in)
@@ -16,8 +16,8 @@ DIR := dist
 EMPTY := $(DIR)/empty
 # Temporary artifacts
 DIST_SOURCES := $(SOURCES:lambda/%=$(DIR)/code/%)
-DIST_MD_RESOURCES := $(MD_TEMPLATES:lambda/%.md=$(DIR)/code/%.html)
-DIST_HTML_RESOURCES := $(HTML_TEMPLATES:lambda/%=$(DIR)/code/%)
+DIST_MD_RESOURCES := $(MD_TEMPLATES:%.md=$(DIR)/code/%.html)
+DIST_HTML_RESOURCES := $(HTML_TEMPLATES:%=$(DIR)/code/%)
 DIST_RESOURCES := $(DIST_HTML_RESOURCES) $(DIST_MD_RESOURCES)
 DIST_TERRAFORM := $(TERRAFORM:terraform/%=$(DIR)/terraform/%)
 
@@ -109,12 +109,12 @@ $(DIR)/thin-egress-app-dependencies.zip: requirements/requirements.txt $(REQUIRE
 	$(DOCKER_LAMBDA_CI) build/dependency_builder.sh "$(DIR)/thin-egress-app-dependencies.zip" "$(DIR)"
 
 .SECONDARY: $(DIST_MD_RESOURCES)
-$(DIST_MD_RESOURCES): $(DIR)/code/%.html: lambda/%.md $(BUILD_VENV)
+$(DIST_MD_RESOURCES): $(DIR)/code/%.html: %.md $(BUILD_VENV)
 	@mkdir -p $(@D)
 	$(BUILD_VENV)/bin/python scripts/render_md.py $< --output $@
 
 .SECONDARY: $(DIST_RESOURCES)
-$(DIST_HTML_RESOURCES): $(DIR)/code/%: lambda/%
+$(DIST_HTML_RESOURCES): $(DIR)/code/%: %
 	@mkdir -p $(@D)
 	cp $< $@
 

diff --git a/lambda/templates/s3access.md b/lambda/templates/s3access.md
diff --git a/lambda/templates/base.html → templates/base.html b/lambda/templates/base.html → templates/base.html
diff --git a/lambda/templates/error.html → templates/error.html b/lambda/templates/error.html → templates/error.html
diff --git a/lambda/templates/profile.html → templates/profile.html b/lambda/templates/profile.html → templates/profile.html
diff --git a/lambda/templates/root.html → templates/root.html b/lambda/templates/root.html → templates/root.html
diff --git a/templates/s3access.md b/templates/s3access.md
@@ -0,0 +1 @@
+../docs/s3access.md
diff --git a/lambda/templates/s3credentials_readme.html → templates/s3credentials_readme.html b/lambda/templates/s3credentials_readme.html → templates/s3credentials_readme.html