@docupace/pipeline 1.0.26-alpha-1 → 1.0.26-alpha-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.26-alpha-1",
+  "version": "1.0.26-alpha-3",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/configure.js

@@ -55,7 +55,6 @@ async function configureUI(
   docupaceHost,
   site,
   env,
-  useNewDomain,
   auth0Domain,
   auth0ClientId,
   auth0ClientSecret,
@@ -143,39 +142,6 @@ ingress:
     - hosts:
         - ${siteHost}
       secretName: dp-next-ui-cert
-externalConnectIngress:
-  enabled: ${useNewDomain}
-  className: nginx
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    external-dns.alpha.kubernetes.io/hostname: ${siteHost}
-    external-dns.alpha.kubernetes.io/zone: public
-    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      proxy_set_header Host ${siteHost};
-    nginx.ingress.kubernetes.io/proxy-buffer-size: 8k
-  hosts:
-    - host: ${siteHost}
-      paths:
-        - path: /core
-        - path: /core_b2b
-        - path: /core_reports
-        - path: /corerealm
-        - path: /connect
-        - path: /webstart
-        - path: /core_ws
-        - path: /core_docupload
-        - path: /core_ariws
-        - path: /core_restws
-        - path: /core_webdav
-  tls:
-    - hosts:
-        - ${siteHost}
-      secretName: dp-next-ui-cert
-externalConnectService:
-  enabled: ${useNewDomain}
-  name: external-connect
-  domain: ${docupaceHost}
 `.trim();
 
     // Write configuration files
@@ -317,6 +283,39 @@ ingress:
     - hosts:
         - ${siteHost}
       secretName: dp-next-ui-cert
+externalConnectIngress:
+  enabled: true
+  className: nginx
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    external-dns.alpha.kubernetes.io/hostname: ${siteHost}
+    external-dns.alpha.kubernetes.io/zone: public
+    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header Host ${siteHost};
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 8k
+  hosts:
+    - host: ${siteHost}
+      paths:
+        - path: /core
+        - path: /core_b2b
+        - path: /core_reports
+        - path: /corerealm
+        - path: /connect
+        - path: /webstart
+        - path: /core_ws
+        - path: /core_docupload
+        - path: /core_ariws
+        - path: /core_restws
+        - path: /core_webdav
+  tls:
+    - hosts:
+        - ${siteHost}
+      secretName: dp-next-ui-cert
+externalConnectService:
+  enabled: true
+  name: external-connect
+  domain: ${docupaceHost}
 `.trim();
 
     // Write configuration files
@@ -452,14 +451,13 @@ export async function configureFromSite(
     CONNECT_URL = `${oldUrl}_ui`;
   }
 
-  if (deployUI === 'true') {
+  if (deployUI === true || deployUI === 'true') {
     await configureUI(
       SITE_HOST,
       CORE_URL,
       DOCUPACE_HOST,
       toSite,
       toEnv,
-      useNewDomain,
       auth0Domain,
       auth0ClientId,
       auth0ClientSecret,

package/src/next/config.js

@@ -79,6 +79,6 @@ export const getVaultSecretsConfigs = (site) => {
     commonSecretsPath: 'secret/data/common/config',
     siteCommonSecretsPath: `secret/data/${site}/common/config`,
     graphqlServerSecretsPath: `secret/data/${site}/graphql-server/config`,
-    uiSecretsPath: `secret/data/${site}/ui/config`
-  }
+    uiSecretsPath: `secret/data/${site}/ui/config`,
+  };
 };

package/terraform/plan.sh

@@ -49,6 +49,7 @@ elif [[ "$PROJECT" == "idp" ]];then
           -var="site=${SITE_NAME}" \
           -var="env=${CURRENT_ENVIRONMENT}" \
           -var="docupace_domain=${DOCUPACE_DOMAIN}" \
+          -var="docupace_next_domain=${DOCUPACE_NEXT_DOMAIN}" \
           -var="old_page_design=${USE_OLD_PAGE_DESIGN}" \
           -var="use_new_domain=${USE_NEW_DOMAIN}" \
           -var="configure_autologin=${CONFIGURE_AUTOLOGIN}" \