rename; use in more contexts

alxndrsn · Dec 9, 2024 · 1b53af7 · 1b53af7
1 parent 19808d3
commit 1b53af7
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
         fetch-depth: 0
         fetch-tags: true
         submodules: recursive
-    - run: cd test/envsubber && ./run-tests.sh
+    - run: cd test/envsub && ./run-tests.sh
   test-nginx:
     timeout-minutes: 10
     runs-on: ubuntu-latest

diff --git a/enketo.dockerfile b/enketo.dockerfile
@@ -10,6 +10,7 @@ WORKDIR ${ENKETO_SRC_DIR}
 # care about anything the server needs. because the client config is baked at
 # build time, we therefore hand it the untemplated config.
 
+COPY files/shared/envsub.sh /scripts/
 COPY files/enketo/config.json.template ${ENKETO_SRC_DIR}/config/config.json.template
 COPY files/enketo/config.json.template ${ENKETO_SRC_DIR}/config/config.json
 COPY files/enketo/start-enketo.sh ${ENKETO_SRC_DIR}/start-enketo.sh

diff --git a/files/enketo/start-enketo.sh b/files/enketo/start-enketo.sh
@@ -7,7 +7,7 @@ BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https:
 SECRET=$(cat /etc/secrets/enketo-secret) \
 LESS_SECRET=$(cat /etc/secrets/enketo-less-secret) \
 API_KEY=$(cat /etc/secrets/enketo-api-key) \
-envsubst \
+/scripts/envsub.sh \
     < "$CONFIG_PATH.template" \
     > "$CONFIG_PATH"
 

diff --git a/files/nginx/setup-odk.sh b/files/nginx/setup-odk.sh
@@ -6,7 +6,7 @@ if [[ $OIDC_ENABLED != 'true' ]] && [[ $OIDC_ENABLED != 'false' ]]; then
   exit 1
 fi
 
-/scripts/envsubber \
+/scripts/envsub.sh \
   < /usr/share/odk/nginx/client-config.json.template \
   > /usr/share/nginx/html/client-config.json
 
@@ -32,7 +32,7 @@ echo "writing fresh nginx templates..."
 cp /usr/share/odk/nginx/redirector.conf /etc/nginx/conf.d/redirector.conf
 
 CNAME=$( [ "$SSL_TYPE" = "customssl" ] && echo "local" || echo "$DOMAIN") \
-nginx_envsubst \
+/scripts/envsub.sh \
   < /usr/share/odk/nginx/odk.conf.template \
   > /etc/nginx/conf.d/odk.conf
 

diff --git a/files/service/scripts/start-odk.sh b/files/service/scripts/start-odk.sh
@@ -4,7 +4,7 @@ echo "generating local service configuration.."
 
 ENKETO_API_KEY=$(cat /etc/secrets/enketo-api-key) \
 BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https://"${DOMAIN}":"${HTTPS_PORT}" ) \
-envsubst \
+/scripts/envsub.sh \
     < /usr/share/odk/config.json.template \
     > /usr/odk/config/local.json
 

diff --git a/files/nginx/envsubber → files/shared/envsub.sh b/files/nginx/envsubber → files/shared/envsub.sh
diff --git a/nginx.dockerfile b/nginx.dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y netcat-openbsd
 RUN mkdir -p /usr/share/odk/nginx/
 
 COPY files/nginx/setup-odk.sh \
-     files/nginx/envsubber \
+     files/shared/envsub.sh \
      /scripts/
 RUN chmod +x /scripts/setup-odk.sh
 

diff --git a/service.dockerfile b/service.dockerfile
@@ -58,6 +58,7 @@ RUN apt-get update \
         --fund=false --update-notifier=false
 
 COPY server/ ./
+COPY files/shared/envsub.sh /scripts/
 COPY files/service/scripts/ ./
 
 COPY files/service/config.json.template /usr/share/odk/

diff --git a/test/envsubber/good-example.expected → test/envsub/good-example.expected b/test/envsubber/good-example.expected → test/envsub/good-example.expected
diff --git a/test/envsubber/good-example.in → test/envsub/good-example.in b/test/envsubber/good-example.in → test/envsub/good-example.in
diff --git a/test/envsubber/run-tests.sh → test/envsub/run-tests.sh b/test/envsubber/run-tests.sh → test/envsub/run-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-log() { echo >&2 "[test/envsubber] $*"; }
+log() { echo >&2 "[test/envsub] $*"; }
 
 
 failed=0
@@ -10,7 +10,7 @@ if diff <( \
   SIMPLE=sv_simple \
   SUBVAL_1=sub_val_one \
   SUBVAL_2=sub_val_two \
-  ../../files/nginx/envsubber \
+  ../../files/shared/envsub.sh \
 < good-example.in
 ) good-example.expected; then
   log "  OK"
@@ -20,7 +20,7 @@ else
 fi
 
 log "should fail when asked to substitute undefined value"
-if ! ../../files/nginx/envsubber <<<'${NOT_DEFINED}'; then
+if ! ../../files/shared/envsub.sh <<<'${NOT_DEFINED}'; then
   log "  OK"
 else
   failed=1