From 413cf8a3b13d5b2c1c262a88086ba41ead793edd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:43:30 +0200 Subject: [PATCH 1/3] chore(release/v1.2.1): release 1.2.1 (#75) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa391a9..eb60ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.2.1](https://github.com/SAP/ssi-dim-middle-layer/compare/v1.2.0...v1.2.1) (2024-08-02) + + +### Bug Fixes + +* adjust variable naming ([#70](https://github.com/SAP/ssi-dim-middle-layer/issues/70)) ([2853060](https://github.com/SAP/ssi-dim-middle-layer/commit/2853060e08ce93cabd5cfde34dda024e47c8c8a1)), closes [#59](https://github.com/SAP/ssi-dim-middle-layer/issues/59) +* **dependencies:** fix high severity finding ([#65](https://github.com/SAP/ssi-dim-middle-layer/issues/65)) ([9616c52](https://github.com/SAP/ssi-dim-middle-layer/commit/9616c52fdfcb4a7d65135e3e36df029c37e8073e)), closes [#71](https://github.com/SAP/ssi-dim-middle-layer/issues/71) + ## [1.2.0](https://github.com/SAP/ssi-dim-middle-layer/compare/v1.1.0...v1.2.0) (2024-07-17) From bdfae4a332c32b8fbe1729194f0037de6588c1c5 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 2 Aug 2024 15:46:25 +0200 Subject: [PATCH 2/3] chore(consortia): remove deployment config --- .../argocd-app-templates/appsetup-dev.yaml | 42 ------- .../argocd-app-templates/appsetup-int.yaml | 39 ------- .../argocd-app-templates/appsetup-rc.yaml | 42 ------- consortia/environments/values-dev.yaml | 105 ------------------ consortia/environments/values-int.yaml | 96 ---------------- consortia/environments/values-rc.yaml | 105 ------------------ 6 files changed, 429 deletions(-) delete mode 100644 consortia/argocd-app-templates/appsetup-dev.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-int.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-rc.yaml delete mode 100644 consortia/environments/values-dev.yaml delete mode 100644 consortia/environments/values-int.yaml delete mode 100644 consortia/environments/values-rc.yaml diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml deleted file mode 100644 index a6d9f0c..0000000 --- a/consortia/argocd-app-templates/appsetup-dev.yaml +++ /dev/null @@ -1,42 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors. -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim -spec: - destination: - namespace: product-iam - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/sap/ssi-dim-middle-layer.git' - targetRevision: main - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-dev.yaml' - project: project-portal - syncPolicy: - automated: - prune: true diff --git a/consortia/argocd-app-templates/appsetup-int.yaml b/consortia/argocd-app-templates/appsetup-int.yaml deleted file mode 100644 index 77977d3..0000000 --- a/consortia/argocd-app-templates/appsetup-int.yaml +++ /dev/null @@ -1,39 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors. -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim -spec: - destination: - namespace: product-iam - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/sap/ssi-dim-middle-layer.git' - targetRevision: dim-1.2.0 - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-int.yaml' - project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-rc.yaml b/consortia/argocd-app-templates/appsetup-rc.yaml deleted file mode 100644 index 2acf2be..0000000 --- a/consortia/argocd-app-templates/appsetup-rc.yaml +++ /dev/null @@ -1,42 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors. -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim -spec: - destination: - namespace: product-iam - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/sap/ssi-dim-middle-layer.git' - targetRevision: main - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-rc.yaml' - project: project-portal - syncPolicy: - automated: - prune: true diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml deleted file mode 100644 index ec23dcc..0000000 --- a/consortia/environments/values-dev.yaml +++ /dev/null @@ -1,105 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors. -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.dev.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim.dev.demo.catena-x.net" - hosts: - - host: "dim.dev.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - port: 8080 - -dim: - image: - tag: "main" - imagePullPolicy: "Always" - swaggerEnabled: true - rootDirectoryId: "ee464a81-fca4-431d-8315-5db5e49b4c3c" - operatorId: "27fee02a-e265-4cfc-af70-4f217a33840b" - -migrations: - image: - tag: "main" - imagePullPolicy: "Always" - logging: - default: "Debug" - -processesworker: - image: - tag: "main" - imagePullPolicy: "Always" - logging: - default: "Debug" - dim: - adminMail: "phil.schneider@digitalnativesolutions.de" - clientIdCisCentral: "" - clientSecretCisCentral: "" - authUrl: "https://catena-x-dev-dim.authentication.eu10.hana.ondemand.com" - subaccount: - # -- Url to the subaccount service api - baseUrl: "https://accounts-service.cfapps.eu10.hana.ondemand.com" - entitlement: - # -- Url to the entitlement service api - baseUrl: "https://entitlements-service.cfapps.eu10.hana.ondemand.com" - cf: - clientId: "" - clientSecret: "" - tokenAddress: "https://login.cf.eu10.hana.ondemand.com/oauth/token" - # -- Url to the cf service api - baseUrl: "https://api.cf.eu10.hana.ondemand.com" - grantType: "client_credentials" - callback: - scope: "openid" - grantType: "client_credentials" - # -- Provide client-id for callback. - clientId: "" - # -- Client-secret for callback client-id. Secret-key 'callback-client-secret'. - clientSecret: "" - tokenAddress: "http://centralidp.dev.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - # -- Url to the cf service api - baseAddress: "https://portal-backend.dev.demo.catena-x.net" - technicalUserCreation: - encryptionConfigs: - index0: - encryptionKey: "" - -idp: - address: "https://centralidp.dev.demo.catena-x.net" - jwtBearerOptions: - tokenValidationParameters: - validAudience: "DIM-Middle-Layer" - -postgresql: - auth: - postgrespassword: "" - password: "" - replicationPassword: "" diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml deleted file mode 100644 index d1b624a..0000000 --- a/consortia/environments/values-int.yaml +++ /dev/null @@ -1,96 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors. -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.int.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim.int.demo.catena-x.net" - hosts: - - host: "dim.int.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - port: 8080 - -dim: - swaggerEnabled: true - rootDirectoryId: "27fee02a-e265-4cfc-af70-4f217a33840b" - operatorId: "27fee02a-e265-4cfc-af70-4f217a33840b" - -migrations: - logging: - default: "Debug" - -processesworker: - logging: - default: "Debug" - dim: - adminMail: "phil.schneider@digitalnativesolutions.de" - clientIdCisCentral: "" - clientSecretCisCentral: "" - authUrl: "https://catena-x-int-dim.authentication.eu10.hana.ondemand.com" - subaccount: - # -- Url to the subaccount service api - baseUrl: "https://accounts-service.cfapps.eu10.hana.ondemand.com" - entitlement: - # -- Url to the entitlement service api - baseUrl: "https://entitlements-service.cfapps.eu10.hana.ondemand.com" - cf: - clientId: "" - clientSecret: "" - tokenAddress: "https://login.cf.eu10.hana.ondemand.com/oauth/token" - # -- Url to the cf service api - baseUrl: "https://api.cf.eu10.hana.ondemand.com" - grantType: "client_credentials" - callback: - scope: "openid" - grantType: "client_credentials" - # -- Provide client-id for callback. - clientId: "" - # -- Client-secret for callback client-id. Secret-key 'callback-client-secret'. - clientSecret: "" - tokenAddress: "http://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - # -- Url to the cf service api - baseAddress: "https://portal-backend.int.demo.catena-x.net" - technicalUserCreation: - encryptionConfigs: - index0: - encryptionKey: "" - -idp: - address: "https://centralidp.int.demo.catena-x.net" - jwtBearerOptions: - tokenValidationParameters: - validAudience: "DIM-Middle-Layer" - -postgresql: - auth: - postgrespassword: "" - password: "" - replicationPassword: "" diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml deleted file mode 100644 index ea02863..0000000 --- a/consortia/environments/values-rc.yaml +++ /dev/null @@ -1,105 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors. -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.dev.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim-rc.dev.demo.catena-x.net" - hosts: - - host: "dim-rc.dev.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - port: 8080 - -dim: - image: - tag: "main" - imagePullPolicy: "Always" - swaggerEnabled: true - rootDirectoryId: "ee464a81-fca4-431d-8315-5db5e49b4c3c" - operatorId: "27fee02a-e265-4cfc-af70-4f217a33840b" - -migrations: - image: - tag: "main" - imagePullPolicy: "Always" - logging: - default: "Debug" - -processesworker: - image: - tag: "main" - imagePullPolicy: "Always" - logging: - default: "Debug" - dim: - adminMail: "phil.schneider@digitalnativesolutions.de" - clientIdCisCentral: "" - clientSecretCisCentral: "" - authUrl: "https://catena-x-dev-dim.authentication.eu10.hana.ondemand.com" - subaccount: - # -- Url to the subaccount service api - baseUrl: "https://accounts-service.cfapps.eu10.hana.ondemand.com" - entitlement: - # -- Url to the entitlement service api - baseUrl: "https://entitlements-service.cfapps.eu10.hana.ondemand.com" - cf: - clientId: "" - clientSecret: "" - tokenAddress: "https://login.cf.eu10.hana.ondemand.com/oauth/token" - # -- Url to the cf service api - baseUrl: "https://api.cf.eu10.hana.ondemand.com" - grantType: "client_credentials" - callback: - scope: "openid" - grantType: "client_credentials" - # -- Provide client-id for callback. - clientId: "" - # -- Client-secret for callback client-id. Secret-key 'callback-client-secret'. - clientSecret: "" - tokenAddress: "http://centralidp-rc.dev.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - # -- Url to the cf service api - baseAddress: "https://portal-backend-rc.dev.demo.catena-x.net" - technicalUserCreation: - encryptionConfigs: - index0: - encryptionKey: "" - -idp: - address: "https://centralidp-rc.dev.demo.catena-x.net" - jwtBearerOptions: - tokenValidationParameters: - validAudience: "DIM-Middle-Layer" - -postgresql: - auth: - postgrespassword: "" - password: "" - replicationPassword: "" \ No newline at end of file From 5777510ae5bea6d3b6948fafee9975351017ce90 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 2 Aug 2024 15:47:36 +0200 Subject: [PATCH 3/3] buld(1.2.1): bump version --- charts/dim/Chart.yaml | 4 ++-- charts/dim/README.md | 2 +- environments/argocd-app-templates/appsetup-int.yaml | 2 +- src/Directory.Build.props | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/dim/Chart.yaml b/charts/dim/Chart.yaml index 4e27dc3..ffdea21 100644 --- a/charts/dim/Chart.yaml +++ b/charts/dim/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 name: dim type: application -version: 1.2.0 -appVersion: 1.2.0 +version: 1.2.1 +appVersion: 1.2.1 description: Helm chart for DIM Middle Layer home: https://github.com/catenax-ng/dim-repo dependencies: diff --git a/charts/dim/README.md b/charts/dim/README.md index 3ce2cbd..c0f771c 100644 --- a/charts/dim/README.md +++ b/charts/dim/README.md @@ -27,7 +27,7 @@ To use the helm chart as a dependency: dependencies: - name: dim repository: https://sap.github.io/ssi-dim-middle-layer - version: 1.2.0 + version: 1.2.1 ``` ## Requirements diff --git a/environments/argocd-app-templates/appsetup-int.yaml b/environments/argocd-app-templates/appsetup-int.yaml index c1f8cc6..6b31dc6 100644 --- a/environments/argocd-app-templates/appsetup-int.yaml +++ b/environments/argocd-app-templates/appsetup-int.yaml @@ -29,7 +29,7 @@ spec: source: path: charts/dim repoURL: 'https://github.com/SAP/ssi-dim-middle-layer.git' - targetRevision: dim-1.2.0 + targetRevision: dim-1.2.1 plugin: env: - name: AVP_SECRET diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ab22cf7..eff91e4 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -20,7 +20,7 @@ - 1.2.0 + 1.2.1