Merge branch 'develop'

OWASP · Jan 9, 2024 · f124d0d · f124d0d
2 parents 96c16d7 + 4c8655e
commit f124d0d
Show file tree

Hide file tree

Showing 38 changed files with 1,963 additions and 610 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -177,7 +177,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install newman
         run: npm install -g newman

diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
@@ -245,7 +245,7 @@ services:
     #ports:
     #  - "${LISTEN_IP:-127.0.0.1}:8443:443" # https
     healthcheck:
-      test: echo -n "GET / HTTP/1.1\n\n" > /dev/tcp/api.mypremiumdealership.com/443
+      test: echo -n "GET / HTTP/1.1\n\n" > /dev/tcp/127.0.0.1/443
       interval: 15s
       timeout: 15s
       retries: 15

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/deploy/helm/templates/identity/config.yaml b/deploy/helm/templates/identity/config.yaml
@@ -27,7 +27,7 @@ data:
   SMTP_PASS: {{ .Values.identity.config.smtpPass }}
   SMTP_FROM: {{ .Values.identity.config.smtpFrom }}
   SMTP_AUTH: {{ .Values.identity.config.smtpAuth | quote }}
-  JWT_EXPIRATION: {{ .Values.identity.config.jwtExpiration | quote }}
+  JWT_EXPIRATION: {{ .Values.jwtExpiration | quote }}
   SMTP_STARTTLS: {{ .Values.identity.config.smtpStartTLS | quote }}
   SERVER_PORT: {{ .Values.identity.port | quote }}
   API_GATEWAY_URL: {{ if .Values.apiGatewayServiceInstall }}"https://{{ .Values.apiGatewayService.service.name }}"{{ else }}{{ .Values.apiGatewayServiceUrl }}{{ end }}

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -10,6 +10,7 @@ apiGatewayServiceUrl: https://api.mypremiumdealership.com
 apiGatewayServiceInstall: true
 apiGatewayPassword:
 tlsEnabled: false
+jwtExpiration: 604800000
 
 waitForK8sResources:
   image: groundnuty/k8s-wait-for:v1.3
@@ -73,7 +74,6 @@ identity:
     smtpFrom: "no-reply@example.com"
     smtpAuth: true
     smtpStartTLS: true
-    jwtExpiration: 604800000
     keyStoreType: PKCS12
     keyStore: classpath:certs/server.p12
     keyStorePassword: passw0rd