chore: move botfpdf to lambda-src/api-render-pdf/

tested:

-  `make test`
-  `make test-json`
-  `make script-gmv`

Removed old terraform stuff, and the www/ directory.

Author: chizmw

.bumpversion.cfg

@@ -5,6 +5,6 @@ current_version = 0.3.5
 
 [bumpversion:file:README.md]
 
-[bumpversion:file:pyproject.toml]
+[bumpversion:file:lambda-src/api-render-pdf/pyproject.toml]
 search = version = "{current_version}"
 replace = version = "{new_version}"

.gitignore

@@ -308,3 +308,5 @@ terraform/poetry-version.json
 templates/generated.css
 .envrc
 test-results.xml
+generated.css
+builds/

Makefile

@@ -1,3 +1,5 @@
+.ONESHELL: # Applies to every targets in the file!
+
 INPUT_FILE=
 
 .PHONY: all
@@ -13,7 +15,9 @@ variations: install-dev
 clean:
 	@find . -type f \( -iname "*.pdf" -o -iname "*.html" \) -exec rm -vf {} \;
 
+APP_DIR=lambda-src/api-render-pdf
 POETRY=poetry
+POETRY_QUIET=--verbose
 POETRY_OK:=$(shell command -v $(POETRY) 2> /dev/null)
 PYSRC=botcpdf
 MAKE_PDF=bin/make-pdf --format sample
@@ -25,7 +29,7 @@ endif
 
 install-dev: poetry
 	@$(POETRY) config virtualenvs.in-project true
-	@$(POETRY) install --quiet
+	@$(POETRY) --directory=$(APP_DIR) $(POETRY_QUIET) install
 
 fmt: install-dev
 	@$(POETRY) run black -t py311 $(PYSRC)
@@ -34,10 +38,16 @@ lint: install-dev
 	@$(POETRY) run pylint $(PYSRC)
 
 test: install-dev
-	@$(POETRY) run poetry run pytest -v --junit-xml=test-results.xml botcpdf/tests/
+	# for some reason -C doesn't work here
+	cd $(APP_DIR) && \
+	pwd && \
+	$(POETRY) run pytest -v --junit-xml=test-results.xml botcpdf/tests/
 
 test-json: install-dev
-	@$(POETRY) run poetry run pytest -v botcpdf/tests/test_external_json.py
+	# for some reason -C doesn't work here
+	cd $(APP_DIR) && \
+	pwd && \
+	$(POETRY) run pytest -v botcpdf/tests/test_external_json.py
 
 # some quick helpers to (quickly) generate some pdfs
 script-tb: TARGET:="Trouble Brewing"
@@ -47,7 +57,7 @@ script-cs: TARGET:="Clean Sweep"
 script-jinx: TARGET="Let's Test Some Jinxes"
 
 script-tb script-nrb script-gmv script-cs script-jinx: poetry
-	$(MAKE_PDF) scripts/$(TARGET).json
+	$(MAKE_PDF) ../../scripts/$(TARGET).json
 ifeq ($(shell uname),Darwin)
 	@open -a Preview "pdfs/just-baked.pdf"
 endif
@@ -101,7 +111,7 @@ release: fmt lint changelog
 	@git push --tags
 
 fetch-combined-json:
-	@curl --silent --create-dirs -o data/imported/roles-combined.json https://raw.githubusercontent.com/chizmw/json-on-the-clocktower/main/data/generated/roles-combined.json
+	@curl --silent --create-dirs -o lambda-src/api-render-pdf/data/imported/roles-combined.json https://raw.githubusercontent.com/chizmw/json-on-the-clocktower/main/data/generated/roles-combined.json
 
 grab-some-scripts:
 # make certain we have a scripts directory

bin/make-pdf

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
+cd "$(dirname "$0")/../lambda-src/api-render-pdf" || exit 1
 poetry run python -m botcpdf.cli make-pdf "$@"

botcpdf/__init__.py lambda-src/api-render-pdf/README.md

@@ -1,3 +1,6 @@
+data "aws_caller_identity" "current" {}
+data "aws_region" "current" {}
+
 
 # the dummy file we used when working through the CORS api
 # https://mrponath.medium.com/terraform-and-aws-api-gateway-a137ee48a8ac
@@ -9,34 +12,34 @@ data "archive_file" "lambda" {
 
 # this allows us to rely on existing information to specify the lambda function name
 # supporting serverless config options and terraform workspaces
-data "aws_lambda_function" "api_render_pdf" {
-  provider      = aws.default
-  function_name = "${var.sls_service_name}-${terraform.workspace}-${var.sls_function_name}"
-}
-
-data "aws_lambda_function" "lambda_invalidate_cache" {
-  provider      = aws.default
-  function_name = "invalidate-cache"
-}
-
-data "aws_iam_role" "iam_for_lambda" {
-  provider = aws.default
-  name     = "deploy_json2pdf"
-}
-
-
-data "aws_lambda_function" "invalidate_cache" {
-  provider      = aws.default
-  function_name = "invalidate-cache"
-}
-
-data "aws_api_gateway_rest_api" "json2pdf_api" {
-  provider = aws.default
-  name     = local.pdf_api_name
-}
-
-data "aws_api_gateway_resource" "json2pdf_resource" {
-  provider    = aws.default
-  rest_api_id = data.aws_api_gateway_rest_api.json2pdf_api.id
-  path        = "/${local.pdf_render_path}"
-}
+#data "aws_lambda_function" "api_render_pdf" {
+#provider      = aws.default
+#function_name = "${var.sls_service_name}-${terraform.workspace}-${var.sls_function_name}"
+#}
+
+#data "aws_lambda_function" "lambda_invalidate_cache" {
+#provider      = aws.default
+#function_name = "invalidate-cache"
+#}
+
+#data "aws_iam_role" "iam_for_lambda" {
+#provider = aws.default
+#name     = "deploy_json2pdf"
+#}
+
+
+#data "aws_lambda_function" "invalidate_cache" {
+#provider      = aws.default
+#function_name = "invalidate-cache"
+#}
+
+#data "aws_api_gateway_rest_api" "json2pdf_api" {
+#provider = aws.default
+#name     = local.pdf_api_name
+#}
+
+#data "aws_api_gateway_resource" "json2pdf_resource" {
+#provider    = aws.default
+#rest_api_id = data.aws_api_gateway_rest_api.json2pdf_api.id
+#path        = "/${local.pdf_render_path}"
+#}

data/imported/.gitkeep lambda-src/api-render-pdf/botcpdf/__init__.py

@@ -1,3 +1,23 @@
+locals {
+  project_name = "arcane-scripts-api"
+
+  aws_default_region = "eu-west-2"
+
+  # we want a lookup of region to secrets lambda ARN
+  # https://docs.aws.amazon.com/secretsmanager/latest/userguide/retrieving-secrets_lambda.html#retrieving-secrets_lambda_ARNs
+  secrets_layer_arns = {
+    "eu-west-1" = "arn:aws:lambda:eu-west-1:015030872274:layer:AWS-Parameters-and-Secrets-Lambda-Extension:10"
+    "eu-west-2" = "arn:aws:lambda:eu-west-2:133256977650:layer:AWS-Parameters-and-Secrets-Lambda-Extension:10"
+  }
+
+  # secret_layer_arn is the lookup for the current region, or a default message of "ARN Missing For Region"
+  secrets_layer_arn = lookup(local.secrets_layer_arns, data.aws_region.current.name, "ARN Missing For Region")
+}
+
+
+
+
+## ORIGINAL LOCALS - CLEANUP REQUIRED
 locals {
 
   tag_defaults = {
@@ -10,8 +30,9 @@ locals {
 
   # wkspc_site_name is based on the workspace name; if it's 'prod' we use 'make', if it's 'dev' we use 'preview'
   wkspc_site_name = {
-    prod = "make"
-    dev  = "beta"
+    prod    = "make"
+    dev     = "beta"
+    default = "alpha"
   }
 
   # get the lookup value from the wkspc_site_name map based on the workspace name

botcpdf/benchmark.py lambda-src/api-render-pdf/botcpdf/benchmark.py

@@ -10,16 +10,3 @@ output "commit_version" {
 output "project_dir" {
   value = data.external.useful_version_info.result.project_dir
 }
-
-output "stage_function_name" {
-  value = "${var.sls_service_name}-${terraform.workspace}-${var.sls_function_name}"
-}
-
-output "stage_url" {
-  value = aws_api_gateway_deployment.deployment.invoke_url
-}
-
-
-output "www-a" {
-  value = aws_route53_record.wkspc_www-a.fqdn
-}

botcpdf/cli.py lambda-src/api-render-pdf/botcpdf/cli.py

@@ -3,7 +3,7 @@ set -e
 
 commit_version="$(git describe --tags --always)"
 project_dir="$(basename "$(git rev-parse --show-toplevel)")"
-poetry_version="$(poetry version --short)"
+poetry_version="$(cd "../lambda-src/api-render-pdf/" && poetry version --short)"
 
 jq -n \
     --arg commit_version "$commit_version" \