template/*-rest-api: Clean up templated environment variables

seek-oss · May 22, 2024 · c7923ec · c7923ec
1 parent 6855c0f
commit c7923ec
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 22 deletions.
diff --git a/.changeset/violet-crabs-bake.md b/.changeset/violet-crabs-bake.md
@@ -0,0 +1,11 @@
+---
+'skuba': patch
+---
+
+template/\*-rest-api: Clean up templated environment variables
+
+- `AWS_NODEJS_CONNECTION_REUSE_ENABLED` is no longer required with AWS SDK V3.
+
+- The `env` boilerplate in Gantry values files was largely unnecessary and confusing.
+
+  Our templates prefer to declare configuration values directly in `src/config.ts`.
diff --git a/template/express-rest-api/.gantry/dev.yml b/template/express-rest-api/.gantry/dev.yml
@@ -1,6 +1,4 @@
 environment: dev
-env:
-  SOME_ENVIRONMENT_VARIABLE: dev-value
 
 maxInstanceCount: 1
 minInstanceCount: 1

diff --git a/template/express-rest-api/.gantry/prod.yml b/template/express-rest-api/.gantry/prod.yml
@@ -1,6 +1,4 @@
 environment: prod
-env:
-  SOME_ENVIRONMENT_VARIABLE: prod-value
 
 maxInstanceCount: 10
 minInstanceCount: 3
diff --git a/template/express-rest-api/gantry.apply.yml b/template/express-rest-api/gantry.apply.yml
@@ -9,16 +9,9 @@ owner: '{{values "owner"}}'
 image: '{{values "image"}}'
 
 env:
-  # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-  AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
-
   ENVIRONMENT: '{{values "environment"}}'
   SERVICE: '{{values "service"}}'
 
-  {{range $key, $value := .Values.env}}
-  {{$key}}: {{$value}}
-  {{end}}
-
 {{if .Values.cloudwatchDashboardDisabled}}
 cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 {{end}}

diff --git a/template/koa-rest-api/.gantry/dev.yml b/template/koa-rest-api/.gantry/dev.yml
@@ -1,6 +1,4 @@
 environment: dev
-env:
-  SOME_ENVIRONMENT_VARIABLE: dev-value
 
 maxInstanceCount: 1
 minInstanceCount: 1

diff --git a/template/koa-rest-api/.gantry/prod.yml b/template/koa-rest-api/.gantry/prod.yml
@@ -1,6 +1,4 @@
 environment: prod
-env:
-  SOME_ENVIRONMENT_VARIABLE: prod-value
 
 maxInstanceCount: 10
 minInstanceCount: 3

diff --git a/template/koa-rest-api/gantry.apply.yml b/template/koa-rest-api/gantry.apply.yml
@@ -9,17 +9,10 @@ owner: '{{values "owner"}}'
 image: '{{values "image"}}'
 
 env:
-  # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-  AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
-
   ENVIRONMENT: '{{values "environment"}}'
   OPENTELEMETRY_ENABLED: '{{.Values.openTelemetry.enabled | default false}}'
   SERVICE: '{{values "service"}}'
 
-  {{range $key, $value := .Values.env}}
-  {{$key}}: {{$value}}
-  {{end}}
-
 {{if .Values.cloudwatchDashboardDisabled}}
 cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 {{end}}