From 004928676a0c45595c0383faa8c843c39856f0f7 Mon Sep 17 00:00:00 2001 From: Sachin Argade Date: Tue, 21 Nov 2023 14:55:36 +0530 Subject: [PATCH 1/4] Unit test case fixes --- DEPENDENCIES | 4 ++-- .../eclipse/tractusx/autosetup/manager/VaultManagerTest.java | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 22c21f9d..7cefbbdd 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -39,7 +39,7 @@ maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR G maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.1.0, EPL-2.0 OR BSD-3-Clause AND (EPL-2.0 OR BSD-3-Clause AND BSD-3-Clause), approved, #7696 maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697 -maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/javax.activation/activation/1.1, CDDL-1.0, approved, CQ134 maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.4, Apache-2.0, approved, #7164 @@ -93,7 +93,7 @@ maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.2, Apache- maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.2, Apache-2.0, approved, #5950 maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.0.2, Apache-2.0, approved, #5923 maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.0, Apache-2.0, approved, #9341 -maven/mavencentral/org.springframework.boot/spring-boot-configuration-processor/3.1.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-configuration-processor/3.1.0, Apache-2.0, approved, #11406 maven/mavencentral/org.springframework.boot/spring-boot-devtools/3.1.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.0, Apache-2.0, approved, #9338 maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/3.1.0, Apache-2.0, approved, #9733 diff --git a/src/test/java/org/eclipse/tractusx/autosetup/manager/VaultManagerTest.java b/src/test/java/org/eclipse/tractusx/autosetup/manager/VaultManagerTest.java index 3cdcc065..6c35b9c5 100644 --- a/src/test/java/org/eclipse/tractusx/autosetup/manager/VaultManagerTest.java +++ b/src/test/java/org/eclipse/tractusx/autosetup/manager/VaultManagerTest.java @@ -56,9 +56,6 @@ class VaultManagerTest { @MockBean private AutoSetupTriggerManager autoSetupTriggerManager; - @MockBean - private OpenSSLClientManager openSSLClientManager; - @Autowired private VaultManager vaultManager; From 5395eab3c784aab79f3e3b63d09df5fb181d8f28 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Wed, 22 Nov 2023 11:23:41 +0530 Subject: [PATCH 2/4] veracode fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4a5b4dd..c96aa2ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] - Update in installation steps - Updated notice for docker in Readme + - Veracode workflow fix ## [1.5.1] - 2023-11-17 ### Changed From ca48278ad8b87534f34331285b1f5278b5284c8a Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Wed, 22 Nov 2023 11:37:22 +0530 Subject: [PATCH 3/4] linting fix --- .github/workflows/helm-lint.yaml | 4 +-- CHANGELOG.md | 1 + .../templates/tests/test-connection.yaml | 35 ------------------- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 charts/orchestrator/templates/tests/test-connection.yaml diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml index c822e7ea..5d894beb 100644 --- a/.github/workflows/helm-lint.yaml +++ b/.github/workflows/helm-lint.yaml @@ -38,8 +38,8 @@ on: type: string upgrade_from: description: 'Managed service orchestrator service chart version to upgrade from' - # version from 3.1 release - default: '1.4.2' + # version from 23.12 release + default: '1.5.2' jobs: lint-test: diff --git a/CHANGELOG.md b/CHANGELOG.md index c96aa2ed..759ca367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Update in installation steps - Updated notice for docker in Readme - Veracode workflow fix + - Fixed linting of charts ## [1.5.1] - 2023-11-17 ### Changed diff --git a/charts/orchestrator/templates/tests/test-connection.yaml b/charts/orchestrator/templates/tests/test-connection.yaml deleted file mode 100644 index 6269ff09..00000000 --- a/charts/orchestrator/templates/tests/test-connection.yaml +++ /dev/null @@ -1,35 +0,0 @@ -#****************************************************************************** -# 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. -# -# 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: v1 -kind: Pod -metadata: - name: "{{ include "managed-service-orchestrator.fullname" . }}-test-connection" - labels: - {{- include "managed-service-orchestrator.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "managed-service-orchestrator.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never From 01799bcea9921b1fa357f988095157aacf242ca9 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Wed, 22 Nov 2023 13:52:19 +0530 Subject: [PATCH 4/4] Update helm-lint.yaml --- .github/workflows/helm-lint.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml index 5d894beb..c822e7ea 100644 --- a/.github/workflows/helm-lint.yaml +++ b/.github/workflows/helm-lint.yaml @@ -38,8 +38,8 @@ on: type: string upgrade_from: description: 'Managed service orchestrator service chart version to upgrade from' - # version from 23.12 release - default: '1.5.2' + # version from 3.1 release + default: '1.4.2' jobs: lint-test: