springboot

eclipse-tractusx · Mar 7, 2023 · a6a3dbe · a6a3dbe
1 parent 0c9af87
commit a6a3dbe
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 100 deletions.
diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/.github/workflows/dapsreg-pipeline.yml b/.github/workflows/dapsreg-pipeline.yml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 Catena-X
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -18,34 +18,32 @@
 # SPDX-License-Identifier: Apache-2.0
 ################################################################################
 
-
-
 name: DapsRegistrationService
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches:
       - main
+    # trigger events for SemVer like tags
     tags:
       - 'v*.*.*'
       - 'v*.*.*-*'
   pull_request:
     branches:
       - main
-  
+
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+
 env:
   # Use GH Container Registry instead of docker
   # github.repository equals to <account|org>/<repo>
   REGISTRY: ghcr.io
   IMAGE_NAME: catenax-ng/tx-daps-registration-service/dapsreg
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -62,9 +60,11 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=semver,pattern={{version}},value=1.0.5-SNAPSHOT
-            
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
 
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
@@ -81,4 +81,4 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
+
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 Catena-X
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -16,7 +16,7 @@
 # under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-#################################################################################
+################################################################################
 
 name: "Trivy"
 on:

diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -57,4 +57,4 @@ jobs:
           filepath: "./target/*.jar"
           vid: "${{ secrets.VERACODE_API_ID }}"
           vkey: "${{ secrets.VERACODE_API_KEY }}"
-          
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 NA
 
+## [2.0.0] - 2023-03-07
+
+### Changed
+- upgrade Spring Boot to 3.0.3
+- upgrade Snakeyaml to 2.0 as 1.33 has security issue
+- New application.properties changes
+- sprint boot upgrade, keycloak upgrade
+
 
 ## [1.0.6] - 2023-02-22
 
@@ -16,7 +24,6 @@ NA
  - Added service port to values.yaml
  - Added comments in values.yaml
  - Created README.md inside charts/dapsreg-svc/
-
 
 ### Changed
  - Upgrade the springboot Library
@@ -48,7 +55,3 @@ NA
 
 ### Removed
 - Controller has been removed
-
-### Known knowns
-- Cross side scripting (XSS) shall be mitigated (low risk)
-- Improving the validation of the input parameters (low risk)
diff --git a/INSTALL.md b/INSTALL.md
@@ -32,3 +32,4 @@ How to install application using helm:-
     d.) These secrets should be defined in Hashicorp vault. <br />
     e.) Deploy in a kubernetes cluster  <br />
         helm install daps-reg-svc charts/daps-reg-service/ -n NameSpace  <br />
+        
diff --git a/README.md b/README.md
@@ -7,10 +7,11 @@ keycloak bearer token and shall have appropriate role to create
 records at DAPS side. Therefore, the secrets for admin interface
 of the DAPS are not disclosed to the requester.
 
+
 ### Software Version
 ```shell
-Helm version is v1.0.6
-Application version is v1.0.5
+Helm version is v2.0.0
+Application version is v2.0.0
 ```
 
 # Solution Strategy 
@@ -131,6 +132,7 @@ Please note the name of jar-file as it may differ if version is changed.
 
 ## Installation Steps
 
+
 [INSTALL.md](INSTALL.md)
 
 

diff --git a/charts/daps-reg-service/.helmignore b/charts/daps-reg-service/.helmignore
@@ -6,4 +6,5 @@
 .git/
 .gitignore
 values?*.yaml
-values?*.yml
+values?*.yml
+
diff --git a/charts/daps-reg-service/Chart.yaml b/charts/daps-reg-service/Chart.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -38,10 +38,11 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.6
+version: 2.0.0
+
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 1.0.5
+appVersion: 2.0.0
diff --git a/charts/daps-reg-service/README.md b/charts/daps-reg-service/README.md
@@ -1,6 +1,6 @@
 # daps-reg-service
 
-![Version: 1.0.6](https://img.shields.io/badge/Version-1.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.5](https://img.shields.io/badge/AppVersion-1.0.5-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 Daps regisgter service is used to register the EDC connector into DAPS
 
@@ -21,13 +21,14 @@ Daps regisgter service is used to register the EDC connector into DAPS
 | drs.secret.authServerUrl | string | `""` | Auth URL for keycloak |
 | drs.secret.clientId | string | `""` | Client id for DAPS |
 | drs.secret.clientSecret | string | `""` | Client Secret for DAPS |
+| drs.secret.jwkSetUri | string | `""` | JWK Set URI |
 | drs.secret.realm | string | `""` | Realm for portal keycloak  |
 | drs.secret.resource | string | `""` | Resource for portal keycloak |
 | drs.secret.tokenUri | string | `""` | DAPS token URL |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"Always"` | Set the Image Pull Policy |
 | image.repository | string | `"ghcr.io/catenax-ng/tx-daps-registration-service/dapsreg"` | Image to use for deploying an application |
-| image.tag | string | `"1.0.5-SNAPSHOT"` | Image tage is defined in chart appVersion. |
+| image.tag | string | `""` | Image tage is defined in chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/use-regex" | string | `"true"` |  |
@@ -49,7 +50,7 @@ Daps regisgter service is used to register the EDC connector into DAPS
 | resources.requests.memory | string | `"300Mi"` |  |
 | securityContext.allowPrivilegeEscalation | bool | `false` | Controls whether a process can gain more privileges |
 | securityContext.capabilities.drop[0] | string | `"ALL"` |  |
-| service.port | int | `8080` | Port details for sevice |
+| service.port | int | `80` | Port details for sevice |
 | service.targetPort | int | `8080` | Container Port details for sevice |
 | service.type | string | `"ClusterIP"` | Type of service |
 | serviceAccount.annotations | object | `{}` |  |

diff --git a/charts/daps-reg-service/templates/deployment.yaml b/charts/daps-reg-service/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           env:          
           - name: APP_DAPS_CLIENTID

diff --git a/charts/daps-reg-service/templates/secret.yaml b/charts/daps-reg-service/templates/secret.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -32,3 +32,4 @@ stringData:
   apiUri: {{ .Values.drs.secret.apiUri | default "https://apiUri" }}
   tokenUri: {{ .Values.drs.secret.tokenUri | default "https://tokenUri" }}
   jwkSetUri: {{ .Values.drs.secret.jwkSetUri | default "https://jwk-set-uri" }}
+
diff --git a/charts/daps-reg-service/templates/service.yaml b/charts/daps-reg-service/templates/service.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/charts/daps-reg-service/templates/serviceaccount.yaml b/charts/daps-reg-service/templates/serviceaccount.yaml
@@ -1,8 +1,8 @@
 {{- if .Values.serviceAccount.create -}}
 
 #################################################################################
-# Copyright (c) 2021,2022 Catena-X
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 Catena-X
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/charts/daps-reg-service/values-beta.yaml b/charts/daps-reg-service/values-beta.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/charts/daps-reg-service/values-dev.yaml b/charts/daps-reg-service/values-dev.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -57,4 +57,3 @@ drs:
     apiUri: "<path:essential-services/data/daps-register-svc#apiUri>"
     tokenUri: "<path:essential-services/data/daps-register-svc#tokenUri>"
     jwkSetUri: "<path:essential-services/data/daps-register-svc#jwk-set-uri>"
-
diff --git a/charts/daps-reg-service/values-int.yaml b/charts/daps-reg-service/values-int.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/charts/daps-reg-service/values-pen.yaml b/charts/daps-reg-service/values-pen.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/charts/daps-reg-service/values-test.yaml b/charts/daps-reg-service/values-test.yaml
diff --git a/charts/daps-reg-service/values.yaml b/charts/daps-reg-service/values.yaml
@@ -31,7 +31,8 @@ image:
     # -- Set the Image Pull Policy
   pullPolicy: Always
     # -- Image tage is defined in chart appVersion.
-  tag: "1.0.5-SNAPSHOT"
+  tag: ""
+
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>dapsreg</artifactId>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>2.0.0</version>
 	<name>dapsreg</name>
 	<description>client registration to the DAPS</description>
 	<properties>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,4 @@ How to install application using helm:-
		d.) These secrets should be defined in Hashicorp vault. <br />
		e.) Deploy in a kubernetes cluster <br />
		helm install daps-reg-svc charts/daps-reg-service/ -n NameSpace <br />