Skip to content

Commit

Permalink
Merge branch 'bugfix/bugfix_47' of https://github.com/catenax-ng/tx-d…
Browse files Browse the repository at this point in the history
…emand-capacity-mgmt into bugfix/bugfix_47
  • Loading branch information
OSousa117 committed Sep 15, 2023
2 parents de21a17 + 1c7b57d commit 97aa140
Show file tree
Hide file tree
Showing 66 changed files with 2,991 additions and 735 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-master-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ name: build-and-push-image-frontend

on:
push:
paths:
- 'demand-capacity-mgmt-frontend/**'
branches:
- 'feat/DCMFOSS-56'
- 'main'
tags:
- 'v*.*.*'
- 'v*.*.*-*'
Expand Down
13 changes: 1 addition & 12 deletions .github/workflows/chart-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,21 @@
# ********************************************************************************


name: Release-Helm Charts
name: Release - Helm Charts

on:
push:
paths:
- 'charts/**'
branches:
- main

workflow_dispatch:
jobs:
release:
# depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
# see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
permissions:
contents: write
runs-on: ubuntu-latest

steps:
# fetch-depth: 0 is required to determine differences in chart(s)
- name: Checkout
uses: actions/checkout@v3
with:
Expand All @@ -54,12 +49,6 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Add Helm repos
run: |
cd charts
helm repo add bitnami https://charts.bitnami.com/bitnami
helm dependency update
- name: Run chart-releaser
uses: helm/[email protected]
env:
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/kics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: "KICS"

on:
push:
branches:
- main
- rc/**
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

steps:
- uses: actions/checkout@v3

- name: KICS scan
uses: checkmarx/kics-github-action@master
with:
path: "."
# Exclude paths from scan by providing the paths as comma separated list
# exclude_paths: "postgres-init.yaml,templates/sharedidp.yaml"
# Exclude queries by providing the query / rule ID as comma separated list
# exclude_queries: "b9c83569-459b-4110-8f79-6305aa33cb37"
# Fail on HIGH severity results
fail_on: high
# Disable secrets detection - we use GitGuardian
disable_secrets: true
# When provided with a directory on output_path
# it will generate the specified reports file named 'results.{extension}'
# in this example it will generate:
# - results-dir/results.json and results-dir/results.sarif
output_path: kicsResults/
output_formats: "json,sarif"

# Upload findings to GitHub Advanced Security Dashboard
- name: Upload SARIF file for GitHub Advanced Security Dashboard
if: always()
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: kicsResults/results.sarif
40 changes: 28 additions & 12 deletions .github/workflows/veracode-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,27 @@
# SPDX-License-Identifier: Apache-2.0
# ********************************************************************************



name: Veracode Static Analysis Pipeline Scan

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
# Once a day
# Once a day
- cron: "0 0 * * *"

permissions:
contents: read
workflow_dispatch:

jobs:
build-and-pipeline-scan:
build-and-pipeline-scan-backend:
permissions:
contents: read
security-events: write
actions: read
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
repository: ''
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v2
Expand All @@ -67,3 +60,26 @@ jobs:
filepath: "./veracode-scan-target.zip"
vid: "${{ secrets.VERACODE_API_ID }}"
vkey: "${{ secrets.VERACODE_API_KEY }}"

build-and-pipeline-scan-frontend:
permissions:
contents: read
security-events: write
actions: read
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Zip frontend
run: zip -r veracode-scan-target-frontend.zip ./demand-capacity-mgmt-frontend

- name: Run Veracode Upload And Scan
uses: veracode/[email protected]
with:
appname: "demand-capacity-mgmt-frontend"
createprofile: false
filepath: "./veracode-scan-target-frontend.zip"
vid: "${{ secrets.VERACODE_API_ID }}"
vkey: "${{ secrets.VERACODE_API_KEY }}"
Empty file removed DEPENDENCIES
Empty file.
Empty file removed DEPENDENCIES.txt
Empty file.
101 changes: 101 additions & 0 deletions DEPENDENCIES_BACKEND
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
maven/mavencentral/antlr/antlr/2.7.7, BSD-3-Clause, approved, #148
maven/mavencentral/ch.qos.logback/logback-classic/1.2.11, EPL-1.0, approved, CQ13636
maven/mavencentral/ch.qos.logback/logback-core/1.2.11, EPL-1.0, approved, CQ13635
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.4, Apache-2.0, approved, #2133
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.uuid/java-uuid-generator/3.1.5, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159
maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.sun.activation/jakarta.activation/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
maven/mavencentral/com.sun.istack/istack-commons-runtime/3.0.12, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310
maven/mavencentral/com.zaxxer/HikariCP/4.0.3, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.micrometer/micrometer-core/1.9.7, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #7711
maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.8, Apache-2.0, approved, clearlydefined
maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
maven/mavencentral/jakarta.persistence/jakarta.persistence-api/2.2.3, EPL-2.0 OR BSD-3-Clause, approved, clearlydefined
maven/mavencentral/jakarta.transaction/jakarta.transaction-api/1.3.3, EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0, approved, #7701
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/javax.annotation/javax.annotation-api/1.3.2, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ16910
maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.22, Apache-2.0, approved, #1810
maven/mavencentral/net.bytebuddy/byte-buddy/1.12.22, Apache-2.0 AND BSD-3-Clause, approved, #1811
maven/mavencentral/net.minidev/accessors-smart/2.4.8, Apache-2.0, approved, #7515
maven/mavencentral/net.minidev/json-smart/2.4.8, Apache-2.0, approved, #3288
maven/mavencentral/org.apache.logging.log4j/log4j-api/2.17.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.17.2, Apache-2.0, approved, #2163
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.71, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.71, Apache-2.0, approved, CQ20193
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.71, Apache-2.0, approved, CQ20194
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.aspectj/aspectjweaver/1.9.7, EPL-1.0, approved, tools.aspectj
maven/mavencentral/org.assertj/assertj-core/3.22.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.checkerframework/checker-qual/3.5.0, MIT, approved, clearlydefined
maven/mavencentral/org.eclipse.tractusx.demand-capacity-mgmt-specification/demand-capacity-mgmt-specification/1.0-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.flywaydb/flyway-core/8.5.13, Apache-2.0, approved, #2764
maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/2.3.7, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/txw2/2.3.7, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192
maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/5.1.2.Final, LGPL-2.1-or-later, approved, CQ21943
maven/mavencentral/org.hibernate/hibernate-core/5.6.14.Final, LGPL-2.1-or-later, approved, #1510
maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255
maven/mavencentral/org.jboss/jandex/2.4.2.Final, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291
maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.8.2, EPL-2.0, approved, #1292
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488
maven/mavencentral/org.junit.jupiter/junit-jupiter/5.8.2, EPL-2.0, approved, clearlydefined
maven/mavencentral/org.junit.platform/junit-platform-commons/1.8.2, EPL-2.0, approved, #1288
maven/mavencentral/org.junit.platform/junit-platform-engine/1.8.2, EPL-2.0, approved, #1289
maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, BSD-2-Clause, approved, CQ17408
maven/mavencentral/org.mockito/mockito-core/4.5.1, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #2360
maven/mavencentral/org.mockito/mockito-junit-jupiter/4.5.1, MIT, approved, clearlydefined
maven/mavencentral/org.objenesis/objenesis/3.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.openapitools/jackson-databind-nullable/0.2.0, Apache-2.0, approved, #3294
maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029
maven/mavencentral/org.postgresql/postgresql/42.3.8, BSD-2-Clause, approved, #2487
maven/mavencentral/org.projectlombok/lombok/1.18.24, MIT AND LicenseRef-Public-Domain, approved, CQ23907
maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842
maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/2.7.8, Apache-2.0, approved, #3273
maven/mavencentral/org.springframework.boot/spring-boot-actuator/2.7.8, Apache-2.0, approved, #4316
maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.8, Apache-2.0, approved, #4314
maven/mavencentral/org.springframework.boot/spring-boot-devtools/2.7.8, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/2.7.8, Apache-2.0, approved, #4318
maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/2.7.8, Apache-2.0, approved, #4310
maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/2.7.8, Apache-2.0, approved, #4379
maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/2.7.8, Apache-2.0, approved, #4401
maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.8, Apache-2.0, approved, #4307
maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.8, Apache-2.0, approved, #4327
maven/mavencentral/org.springframework.boot/spring-boot-starter-test/2.7.8, Apache-2.0, approved, #4320
maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.8, Apache-2.0, approved, #4305
maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.8, Apache-2.0, approved, #4304
maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.8, Apache-2.0, approved, #4308
maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/2.7.8, Apache-2.0, approved, #4313
maven/mavencentral/org.springframework.boot/spring-boot-test/2.7.8, Apache-2.0, approved, #4323
maven/mavencentral/org.springframework.boot/spring-boot/2.7.8, Apache-2.0, approved, #4322
maven/mavencentral/org.springframework.data/spring-data-commons/2.7.7, Apache-2.0, approved, #2768
maven/mavencentral/org.springframework.data/spring-data-jpa/2.7.7, Apache-2.0, approved, #2766
maven/mavencentral/org.springframework/spring-aop/5.3.25, Apache-2.0, approved, CQ23152
maven/mavencentral/org.springframework/spring-aspects/5.3.25, Apache-2.0, approved, #1546
maven/mavencentral/org.springframework/spring-beans/5.3.25, Apache-2.0, approved, CQ23153
maven/mavencentral/org.springframework/spring-context/5.3.25, Apache-2.0, approved, CQ23051
maven/mavencentral/org.springframework/spring-core/5.3.25, Apache-2.0 AND BSD-3-Clause, approved, CQ23154
maven/mavencentral/org.springframework/spring-expression/5.3.25, Apache-2.0, approved, CQ23155
maven/mavencentral/org.springframework/spring-jcl/5.3.25, Apache-2.0, approved, CQ23156
maven/mavencentral/org.springframework/spring-jdbc/5.3.25, Apache-2.0, approved, #1545
maven/mavencentral/org.springframework/spring-orm/5.3.25, Apache-2.0, approved, CQ23053
maven/mavencentral/org.springframework/spring-test/5.3.25, Apache-2.0, approved, CQ23054
maven/mavencentral/org.springframework/spring-tx/5.3.25, Apache-2.0, approved, CQ23055
maven/mavencentral/org.springframework/spring-web/5.3.25, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157
maven/mavencentral/org.springframework/spring-webmvc/5.3.25, Apache-2.0, approved, CQ23158
maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272
maven/mavencentral/org.yaml/snakeyaml/1.30, Apache-2.0, approved, clearlydefined
Loading

0 comments on commit 97aa140

Please sign in to comment.