update configs

finos · Nov 3, 2023 · 77b982b · 77b982b
1 parent 272cce6
commit 77b982b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 29 deletions.
diff --git a/installers/esg/engine/config/config.json b/installers/esg/engine/config/config.json
@@ -13,8 +13,8 @@
     ]
   },
   "pac4j": {
-    "bypassPaths": ["/api/server/v1/info"],
-    "callbackPrefix": "",
+    "bypassPaths": ["/engine/api/server/v1/info"],
+    "callbackPrefix": "/engine/api/pac4j",
     "mongoUri": "${MONGODB_URI}",
     "mongoDb": "${MONGODB_NAME}",
     "clients": [
@@ -29,7 +29,6 @@
       },
      {
         "org.finos.legend.server.pac4j.gitlab.GitlabPersonalAccessTokenClient": {
-          "name": "pat",
           "headerTokenName": "legend-test-pat",
           "scheme": "https",
           "gitlabHost": "gitlab.com",
@@ -57,18 +56,32 @@
     "uriPrefix": "/api"
   },
   "server": {
-    "type": "simple",
-    "applicationContextPath": "/engine",
-    "adminContextPath": "/engine/admin",
-    "connector": {
-      "maxRequestHeaderSize": "32KiB",
-      "type": "http",
-      "port": "${ENGINE_PORT}"
-    },
+    "rootPath": "/engine/api",
+    "applicationConnectors": [
+      {
+        "maxRequestHeaderSize": "32KiB",
+        "type": "http",
+        "port": "${ENGINE_PORT}"
+      }
+    ],
     "requestLog": {
       "appenders": []
     }
   },
+  "cors": {
+    "allowedHeaders": [
+      "X-Requested-With",
+      "Content-Type",
+      "Accept",
+      "Origin",
+      "Access-Control-Allow-Credentials",
+      "x-b3-parentspanid",
+      "x-b3-sampled",
+      "x-b3-spanid",
+      "x-b3-traceid",
+      "legend-test-pat"
+    ]
+  },
   "metadataserver": {
     "pure": {
       "host": "${METADATA_PURE_HOST}",
@@ -78,8 +91,16 @@
       "host": "${METADATA_ALLOY_HOST}",
       "port": ${METADATA_ALLOY_PORT},
       "prefix": "/depot/api"
-    }, 
-    "sdlc": { "host":"legend-sdlc", "port":${SDLC_PORT}}
+    },
+    "sdlc": {
+      "host": "legend-sdlc",
+      "port": ${SDLC_PORT},
+      "prefix": "/sdlc",
+      "pac4j": {
+        "_type": "privateAccessToken",
+        "accessTokenHeaderName": "legend-test-pat"
+      }
+    }
   },
   "temporarytestdb": {
     "port": ${TEMP_DB_PORT}
@@ -99,20 +120,6 @@
        "_type":"property",
         "location": "/config/vault.properties"
      }
-  ],
-  "cors": {
-    "allowedHeaders": [
-      "X-Requested-With",
-      "Content-Type",
-      "Accept",
-      "Origin",
-      "Access-Control-Allow-Credentials",
-      "x-b3-parentspanid",
-      "x-b3-sampled",
-      "x-b3-spanid",
-      "x-b3-traceid",
-      "legend-test-pat"
-    ]
-  }
+  ]
 }
 
diff --git a/installers/esg/sdlc/config/config.json b/installers/esg/sdlc/config/config.json
@@ -18,6 +18,18 @@ server:
       - type: console
         logFormat: "OFF"
   rootPath: /sdlc/api
+cors:
+  allowedHeaders:
+    - X-Requested-With
+    - Content-Type
+    - Accept
+    - Origin
+    - Access-Control-Allow-Credentials
+    - x-b3-parentspanid
+    - x-b3-sampled
+    - x-b3-spanid
+    - x-b3-traceid
+    - legend-test-pat
 sessionCookie: LEGEND_SDLC_JSESSIONID
 logging:
   level: INFO
@@ -31,7 +43,6 @@ swagger:
   schemes: []
 pac4j:
   callbackPrefix: /sdlc/api/pac4j
-  callbackBaseUrl: ${LEGEND_EXTERNAL_BASE_URL}/sdlc
   mongoUri: ${MONGODB_URI}
   mongoDb: ${MONGODB_NAME}
   mongoSession:
@@ -44,6 +55,12 @@ pac4j:
         secret: ${GITLAB_APP_SECRET}
         discoveryUri: https://gitlab.com/.well-known/openid-configuration
         scope: openid profile api
+    - org.finos.legend.server.pac4j.gitlab.GitlabPersonalAccessTokenClient:
+        name: gitlab-pat
+        headerTokenName: legend-test-pat
+        scheme: https
+        gitlabHost: gitlab.com
+        gitlabApiVersion: v4
   bypassPaths:
     - /sdlc/api/info
     - /sdlc/api/server/info