Merge pull request #282 from bcgov/develop

add support for adminGroup to request api docker container and helm d…
bcgov · Feb 13, 2020 · 214b241 · 214b241
2 parents bd93186 + 28adbb5
commit 214b241
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/helm/ocwa/values.yaml b/helm/ocwa/values.yaml
@@ -394,6 +394,7 @@ request-api:
   formioUsername: "[email protected]"
   formioPassword: "CHANGEME"
   orgAttribute: "businessCategory"
+  adminGroup: "admin"
 
 
   resources: {}

diff --git a/microservices/requestApi/entrypoint.sh b/microservices/requestApi/entrypoint.sh
@@ -67,6 +67,7 @@ printf "\"webhookSecret\": \"${WEBHOOK_API_KEY}\",\n" >> ./config/default.json
 
 printf "\"emailOnInitialSubmit\": ${EMAIL_ON_SUBMIT},\n" >> ./config/default.json
 printf "\"orgAttribute\": \"${ORG_ATTRIBUTE}\",\n" >> ./config/default.json
+printf "\"adminGroup\": \"${ADMIN_GROUP}\",\n" >> ./config/default.json
 
 printf "\"user\": {\n" >> ./config/default.json
 printf "\"idField\": \"${USER_ID_FIELD}\",\n" >> ./config/default.json

diff --git a/microservices/requestApi/helm/request-api/templates/deployment.yaml b/microservices/requestApi/helm/request-api/templates/deployment.yaml
@@ -181,6 +181,9 @@ spec:
 
             - name: ORG_ATTRIBUTE
               value: "{{ .Values.orgAttribute }}"
+
+            - name: ADMIN_GROUP
+              value: "{{ .Values.adminGroup }}"
 
           ports:
             - name: http

diff --git a/microservices/requestApi/helm/request-api/values.yaml b/microservices/requestApi/helm/request-api/values.yaml
@@ -109,6 +109,7 @@ formioUrl: "http://ocwa-formio.ocwa"
 formioUsername: "[email protected]"
 formioPassword: "CHANGEME"
 orgAttribute: "businessCategory"
+adminGroup: "admin"
 
 resources: {}
   # If you want to specify resources, uncomment the following

diff --git a/terraform/ocwa_request_api.tf b/terraform/ocwa_request_api.tf
@@ -72,7 +72,8 @@ resource "docker_container" "ocwa_request_api" {
     "FORMIO_URL=http://ocwa_formio:3001",
     "[email protected]",
     "FORMIO_PASSWORD=CHANGEME",
-    "ORG_ATTRIBUTE=businessCategory"
+    "ORG_ATTRIBUTE=businessCategory",
+    "ADMIN_GROUP=admin"
   ]
 }