Merge pull request #26 from catenax-ng/main

Sync from catena-x

Author: mkanal

.github/workflows/veracode.yaml

@@ -29,5 +29,5 @@ jobs:
           appname: "Traceability-Foss-Frontend"
           createprofile: false
           filepath: "./veracode-scan-target.zip"
-          vid: "${{ secrets.ORG_VERACODE_API_ID }}"
-          vkey: "${{ secrets.ORG_VERACODE_API_KEY }}"
+          vid: '${{ secrets.VERACODE_API_ID || secrets.ORG_VERACODE_API_ID }}'
+          vkey: '${{ secrets.VERACODE_API_KEY || secrets.ORG_VERACODE_API_KEY }}'

.github/workflows/veracode-upload.yml renamed to .github/workflows/veracode.yml

@@ -6,8 +6,6 @@ Support environment variables are:
 const ENV_VARS_MAPPING = {
   CATENAX_PORTAL_KEYCLOAK_URL: 'keycloakUrl',
   CATENAX_PORTAL_CLIENT_ID: 'clientId',
-  CATENAX_PORTAL_DEFAULT_REALM: 'defaultRealm',
-  CATENAX_PORTAL_REALM_LOGO: 'realmLogo',
   CATENAX_PORTAL_API_URL: 'apiUrl',
   CATENAX_PORTAL_BASE_URL: 'baseUrl',
 };
@@ -19,12 +17,6 @@ This variable is used to set up and use keycloak
 `CATENAX_PORTAL_CLIENT_ID`
 This variable is used to identify the client on keycloak
 
-`CATENAX_PORTAL_DEFAULT_REALM`
-This variable is used the set de default realm of the application
-
-`CATENAX_PORTAL_REALM_LOGO`
-This variable is used to replace the logo on the application
-
 `CATENAX_PORTAL_API_URL`
 This variable points to the desired api
 
@@ -110,7 +102,7 @@ When running the build docker image you are able to pass through multiple enviro
 ### Example command:
 
 ```shell
-$ docker run -d -p 4200:8080 -e CATENAX_PORTAL_DEFAULT_REALM=TEST ${dockerImage}
+$ docker run -d -p 4200:8080 -e ENV_VAR=VAR_VALUE ${dockerImage}
 ```
 
 #### `Docker run`
@@ -125,7 +117,7 @@ To start a container in detached mode, you use `-d=true` or just `-d` option. By
 
 To expose a container’s internal port, an operator can start the container with the `-P` or `-p` flag. The exposed port is accessible on the host and the ports are available to any client that can reach the host.
 
-#### `-e CATENAX_PORTAL_DEFAULT_REALM=TEST`
+#### `-e ENV_VAR=VAR_VALUE`
 
 The operator can set any environment variable in the container by using one or more `-e` flags, even overriding already defined flags by the developer with a Dockerfile `ENV`.
 

INSTALL.md

@@ -99,6 +99,14 @@
                 }
               ]
             },
+            "localBackendNoAuth": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.localBackendNoAuth.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
@@ -154,6 +162,9 @@
             "localBackend": {
               "browserTarget": "trace-x:build:dev,localBackend"
             },
+            "localBackendNoAuth": {
+              "browserTarget": "trace-x:build:dev,localBackendNoAuth"
+            },
             "production": {
               "browserTarget": "trace-x:build:production"
             },

angular.json

@@ -49,8 +49,6 @@ spec:
               value: "{{ .Values.image.CATENAX_PORTAL_KEYCLOAK_URL }}"
             - name: CATENAX_PORTAL_CLIENT_ID
               value: "{{ .Values.image.CATENAX_PORTAL_CLIENT_ID }}"
-            - name: CATENAX_PORTAL_DEFAULT_REALM
-              value: "{{ .Values.image.CATENAX_PORTAL_DEFAULT_REALM }}"
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

charts/traceability-foss-frontend/templates/deployment.yaml

@@ -3,8 +3,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability-test.dev.demo.catena-x.net/api'
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
-  CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
-  CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
 
 nameOverride: "traceability-foss-test-frontend"
 fullnameOverride: "traceability-foss-test-frontend"

charts/traceability-foss-frontend/values-dev-test.yaml

@@ -2,8 +2,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability.dev.demo.catena-x.net/api'
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
-  CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
-  CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
 
 ingress:
   enabled: true

charts/traceability-foss-frontend/values-dev.yaml

@@ -2,8 +2,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability-test.int.demo.catena-x.net/api'
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
-  CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
-  CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
 
 nameOverride: "traceability-foss-test-frontend"
 fullnameOverride: "traceability-foss-test-frontend"

charts/traceability-foss-frontend/values-int-test.yaml

@@ -2,8 +2,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability.int.demo.catena-x.net/api'
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
-  CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
-  CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
 
 ingress:
   enabled: true

charts/traceability-foss-frontend/values-int.yaml

@@ -2,8 +2,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability-pen.dev.demo.catena-x.net/api'
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp-pen.dev.demo.catena-x.net/auth'
-  CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
-  CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
 
 # important to not conflict with dev env (both use same ArgoCD instance)
 namespace: product-traceability-foss-pen