hope-family-fellowship/hff-entry-forms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: Fix file naming, add support for DEBUG env var.

Browse Source
This commit is contained in:
Jonathan Bernard 2024-08-12 14:45:49 -05:00
parent dd384f2b53
commit f9184379b2
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.DS_Store .DS_Store
.terraform .terraform
node_modules node_modules
/api/deploy
/web/dist /web/dist
/dist /dist

14
api/Makefile
View File

@ -90,19 +90,19 @@ echo-vars:
"PORT=$(PORT)\n" \ "PORT=$(PORT)\n" \
"INTEGRATION_TOKEN=$(INTEGRATION_TOKEN)\n" "INTEGRATION_TOKEN=$(INTEGRATION_TOKEN)\n"
publis: publish:
-rm -r deploy -rm -r deploy
-mkdir deploy -mkdir deploy
m4 \ m4 \
-D "HFF_ENTRY_FORMS_API_VERSION=$(VERSION)" \ -D "HFF_ENTRY_FORMS_API_VERSION=$(VERSION)" \
-D "TARGET_ENV=$(TARGET_ENV)" \ -D "TARGET_ENV=$(TARGET_ENV)" \
-D "TARGET_PORT=$(TARGET_PORT)" \ -D "TARGET_PORT=$(PORT)" \
hff_entry_forms_api.service \ hff_entry_forms_api.service \
> deploy/hff_entry_forms_api.$(TARGET_ENV).service > deploy/hff_entry_forms_api.$(TARGET_ENV).service
-ssh deployer@$(TARGET_SERVER) "docker stop hff_entry_forms.$(TARGET_ENV).service && sudo systemctl stop hff_entry_forms.$(TARGET_ENV)" -ssh deployer@$(TARGET_SERVER) "docker stop hff_entry_forms_api.$(TARGET_ENV).service && sudo systemctl stop hff_entry_forms_api.$(TARGET_ENV)"
ssh deployer@$(TARGET_SERVER) "aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin $(ECR_ACCOUNT_URL) && docker pull $(ECR_ACCOUNT_URL)/hff_entry_forms:$(VERSION)" ssh deployer@$(TARGET_SERVER) "aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin $(ECR_ACCOUNT_URL) && docker pull $(ECR_ACCOUNT_URL)/hff_entry_forms_api:$(VERSION)"
scp \ scp \
deploy/hff_entry_forms.$(TARGET_ENV).service \ deploy/hff_entry_forms_api.$(TARGET_ENV).service \
deployer@$(TARGET_SERVER):/etc/systemd/system/hff_entry_forms.$(TARGET_ENV).service deployer@$(TARGET_SERVER):/etc/systemd/system/hff_entry_forms_api.$(TARGET_ENV).service
ssh deployer@$(TARGET_SERVER) "sudo systemctl daemon-reload" ssh deployer@$(TARGET_SERVER) "sudo systemctl daemon-reload"
ssh deployer@$(TARGET_SERVER) "sudo systemctl start hff_entry_forms.$(TARGET_ENV)" ssh deployer@$(TARGET_SERVER) "sudo systemctl start hff_entry_forms_api.$(TARGET_ENV)"

2
api/hff_entry_forms.service → api/hff_entry_forms_api.service
View File

@ -9,7 +9,7 @@ Restart=always
ExecStartPre=-/usr/bin/docker rm %n ExecStartPre=-/usr/bin/docker rm %n
ExecStart=/usr/bin/docker run --rm -p TARGET_PORT:80 --name %n \ ExecStart=/usr/bin/docker run --rm -p TARGET_PORT:80 --name %n \
--env-file /etc/hff_entry_forms/TARGET_ENV.env \ --env-file /etc/hff_entry_forms/TARGET_ENV.env \
063932952339.dkr.ecr.us-west-2.amazonaws.com/hff_entry_forms:HFF_ENTRY_FORMS_VERSION 063932952339.dkr.ecr.us-west-2.amazonaws.com/hff_entry_forms_api:HFF_ENTRY_FORMS_API_VERSION
ExecStop=/usr/bin/docker stop --name %n ExecStop=/usr/bin/docker stop --name %n
[Install] [Install]

11
api/src/hff_entry_forms_api.nim
View File

@ -1,4 +1,5 @@
import cliutils, docopt, json, logging, sequtils, strutils, tables import std/[json, logging, os, sequtils, strutils, tables]
import cliutils, docopt
import hff_entry_forms_apipkg/api import hff_entry_forms_apipkg/api
import hff_entry_forms_apipkg/version import hff_entry_forms_apipkg/version
@ -26,7 +27,7 @@ proc loadConfig(args: Table[string, docopt.Value]): HffEntryFormsApiConfig =
let cfg = CombinedConfig(docopt: args, json: json) let cfg = CombinedConfig(docopt: args, json: json)
result = HffEntryFormsApiConfig( result = HffEntryFormsApiConfig(
debug: args["--debug"], debug: cfg.hasKey("debug") and cfg.getVal("debug") == "true",
eventParentId: cfg.getVal("event-parent-id"), eventParentId: cfg.getVal("event-parent-id"),
integrationToken: cfg.getVal("integration-token"), integrationToken: cfg.getVal("integration-token"),
knownOrigins: cfg.getVal("known-origins")[1..^2].split(',').mapIt(it[1..^2]), knownOrigins: cfg.getVal("known-origins")[1..^2].split(',').mapIt(it[1..^2]),
@ -59,11 +60,11 @@ Options:
# Initialize our service context # Initialize our service context
let args = docopt(doc, version = HFF_ENTRY_FORMS_API_VERSION) let args = docopt(doc, version = HFF_ENTRY_FORMS_API_VERSION)
if args["--debug"]:
consoleLogger.levelThreshold = lvlDebug
let cfg = loadConfig(args) let cfg = loadConfig(args)
if cfg.debug:
consoleLogger.levelThreshold = lvlDebug
if args["serve"]: start(cfg) if args["serve"]: start(cfg)
except: except: