Skip to content

Commit 2c58805

Browse files
authored
Merge pull request #48 from catenax-ng/main
Release 3.0.0
2 parents f1093a5 + f3e6552 commit 2c58805

File tree

992 files changed

+68442
-789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

992 files changed

+68442
-789
lines changed

.editorconfig

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
root = true
2+
13
[*]
24
charset = utf-8
35
end_of_line = lf
@@ -648,7 +650,7 @@ ij_html_keep_whitespaces_inside = span,pre,textarea
648650
ij_html_line_comment_at_first_column = true
649651
ij_html_new_line_after_last_attribute = never
650652
ij_html_new_line_before_first_attribute = never
651-
ij_html_quote_style = single
653+
ij_html_quote_style = double
652654
ij_html_remove_new_line_before_tags = br
653655
ij_html_space_after_tag_name = false
654656
ij_html_space_around_equality_in_attribute = false
@@ -687,6 +689,7 @@ ij_markdown_wrap_text_inside_blockquotes = true
687689

688690
[{*.yaml,*.yml}]
689691
indent_size = 2
692+
indent_style = space
690693
ij_yaml_align_values_properties = do_not_align
691694
ij_yaml_autoinsert_sequence_marker = true
692695
ij_yaml_block_mapping_on_new_line = false
@@ -697,3 +700,15 @@ ij_yaml_sequence_on_new_line = false
697700
ij_yaml_space_before_colon = false
698701
ij_yaml_spaces_within_braces = true
699702
ij_yaml_spaces_within_brackets = true
703+
704+
# .editorconfig keeps breaking helmchart templating braces
705+
# thus we need to exclude the folder from formatting
706+
[/chart/**]
707+
ij_formatter_enabled = false
708+
709+
[{*.kt, *.kts}]
710+
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
711+
ij_continuation_indent_size = 8
712+
713+
[*.md]
714+
max_line_length = 999

.github/codeql/codeql-config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: "TraceX CodeQL config"
2+
3+
# Exclude "Unused classes and interfaces"
4+
query-filters:
5+
- exclude:
6+
id: java/unused-reference-type

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ updates:
1414
day: "wednesday"
1515
time: "03:00"
1616

17+
- package-ecosystem: "maven"
18+
directory: "/"
19+
schedule:
20+
interval: "weekly"
21+
day: "wednesday"
22+
time: "03:00"
23+

.github/scripts/eclipse_dash.sh

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
java -jar org.eclipse.dash.licenses-0.0.1-20221105.055038-599.jar yarn.lock -project automotive.tractusx -summary DASH_SUMMARY
2-
grep -E '(restricted, #)|(restricted$)' DASH_SUMMARY | if test $(wc -l) -gt 0; then exit 1; fi
1+
java -jar /home/runner/work/tx-traceability-foss-frontend/tx-traceability-foss-frontend/org.eclipse.dash.licenses-0.0.1-20221105.055038-599.jar yarn.lock -project automotive.tractusx -summary /home/runner/work/tx-traceability-foss-frontend/tx-traceability-foss-frontend/frontend/DASH_SUMMARY
2+
grep -E '(restricted, #)|(restricted$)' /home/runner/work/tx-traceability-foss-frontend/tx-traceability-foss-frontend/frontend/DASH_SUMMARY | if test $(wc -l) -gt 0; then exit 1; fi

.github/workflows/.trivyignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# ref https://github.com/catenax-ng/product-traceability-foss-backend/security/code-scanning/1419
2+
CVE-2022-25857

.github/workflows/chart-release.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL code analysis"
13+
14+
on:
15+
push:
16+
branches: main
17+
paths-ignore:
18+
- '**/*.md'
19+
- '**/*.txt'
20+
pull_request:
21+
branches: main
22+
paths-ignore:
23+
- '**/*.md'
24+
- '**/*.txt'
25+
- '.husky/**'
26+
- 'cypress/**'
27+
- 'charts/**'
28+
- 'dev/**'
29+
- 'docs/**'
30+
- 'frontend/charts/**'
31+
- 'backend/charts/**'
32+
- 'backend/ci/**'
33+
- 'backend/collection/**'
34+
- 'backend/openapi/**'
35+
- 'README.md'
36+
- 'CHANGELOG.md'
37+
schedule:
38+
- cron: '0 1 * * 1-5' # At 01:00 on every day-of-week from Monday through Friday.
39+
40+
jobs:
41+
analyze:
42+
name: Analyze
43+
runs-on: ubuntu-latest
44+
defaults:
45+
run:
46+
working-directory: backend
47+
permissions:
48+
actions: read
49+
contents: read
50+
security-events: write
51+
52+
strategy:
53+
fail-fast: false
54+
matrix:
55+
language: [ 'java' ]
56+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
57+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
58+
59+
steps:
60+
- name: Checkout repository
61+
uses: actions/checkout@v3
62+
63+
- name: Set up JDK 17
64+
uses: actions/setup-java@v3
65+
with:
66+
java-version: '17'
67+
distribution: 'temurin'
68+
69+
# Initializes the CodeQL tools for scanning.
70+
- name: Initialize CodeQL
71+
uses: github/codeql-action/init@v2
72+
with:
73+
languages: ${{ matrix.language }}
74+
# If you wish to specify custom queries, you can do so here or in a config file.
75+
# By default, queries listed here will override any specified in a config file.
76+
# Prefix the list here with "+" to use these queries and those in the config file.
77+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
78+
# The queries security-extended and security-and-quality are built into CodeQL.
79+
config-file: ./.github/codeql/codeql-config.yml
80+
queries: +security-and-quality,security-extended
81+
82+
- name: Cache maven packages
83+
uses: actions/cache@v3
84+
with:
85+
path: ~/.m2
86+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
87+
restore-keys: ${{ runner.os }}-m2
88+
89+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
90+
# If this step fails, then you should remove it and run the build manually (see below)
91+
#- name: Autobuild
92+
# uses: github/codeql-action/autobuild@v2
93+
94+
# ℹ️ Command-line programs to run using the OS shell.
95+
# 📚 https://git.io/JvXDl
96+
97+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
98+
# and modify them (or add more) to build your code if your project
99+
# uses a compiled language
100+
- name: Build Package
101+
run: |
102+
mvn clean package --batch-mode -DskipTests
103+
104+
- name: Perform CodeQL Analysis
105+
uses: github/codeql-action/analyze@v2

.github/workflows/docker-image-for-branch.yml renamed to .github/workflows/docker-image-branch_frontend.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
name: Build&Push Docker image for branch
2-
on: [ pull_request ]
1+
name: Frontend Build&Push Docker image for branch
2+
on:
3+
pull_request:
4+
paths:
5+
- 'frontend/**'
6+
- '.github/workflows/**'
37

48
env:
59
REGISTRY: ghcr.io
@@ -8,6 +12,9 @@ jobs:
812

913
build:
1014
runs-on: ubuntu-latest
15+
defaults:
16+
run:
17+
working-directory: frontend
1118

1219
permissions:
1320
contents: read
@@ -29,5 +36,6 @@ jobs:
2936
- name: Build and push
3037
uses: docker/build-push-action@v4
3138
with:
39+
context: frontend/
3240
push: true
33-
tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }}
41+
tags: ${{ env.REGISTRY }}/${{ github.repository }}-frontend:${{ github.event.pull_request.head.sha }}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Backend Build&Push Docker image on main
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
7+
env:
8+
REGISTRY: ghcr.io
9+
JAVA_VERSION: 17
10+
COMMIT_SHA: ${{ github.sha }}
11+
12+
jobs:
13+
Publish-docker-image:
14+
runs-on: ubuntu-latest
15+
defaults:
16+
run:
17+
working-directory: backend
18+
permissions:
19+
contents: read
20+
packages: write
21+
22+
steps:
23+
- uses: actions/checkout@v3
24+
- uses: actions/setup-java@v3
25+
with:
26+
java-version: '${{ env.JAVA_VERSION }}'
27+
distribution: 'temurin'
28+
cache: 'maven'
29+
30+
- name: Login to Docker Registry
31+
uses: docker/login-action@v2
32+
with:
33+
registry: ${{ env.REGISTRY }}
34+
username: ${{ github.actor }}
35+
password: ${{ secrets.GITHUB_TOKEN }}
36+
37+
- name: Build & Push docker image ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.COMMIT_SHA }}
38+
run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:${{ env.COMMIT_SHA }}

.github/workflows/docker-image.yml renamed to .github/workflows/docker-image-main_frontend.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: Build&Push Docker image
1+
name: Backend Build&Push Docker image on main
22
on:
33
push:
4-
branches: [ main ]
4+
branches: main
55

66
env:
77
REGISTRY: ghcr.io
@@ -10,6 +10,9 @@ jobs:
1010

1111
build:
1212
runs-on: ubuntu-latest
13+
defaults:
14+
run:
15+
working-directory: frontend
1316

1417
permissions:
1518
contents: read
@@ -29,5 +32,6 @@ jobs:
2932
- name: Build and push
3033
uses: docker/build-push-action@v4
3134
with:
35+
context: frontend/
3236
push: true
33-
tags: ${{ env.REGISTRY }}/${{ github.repository }}:latest , ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.sha }}
37+
tags: ${{ env.REGISTRY }}/${{ github.repository }}-frontend:latest , ${{ env.REGISTRY }}/${{ github.repository }}-frontend:${{ github.sha }}

0 commit comments

Comments
 (0)