Skip to content

Commit

Permalink
Merge pull request #38 from mercedes-benz/miw-26-july-2023
Browse files Browse the repository at this point in the history
Miw 26 july 2023
  • Loading branch information
carslen authored Jul 27, 2023
2 parents 0610454 + 64afc1b commit 9540164
Show file tree
Hide file tree
Showing 111 changed files with 2,763 additions and 2,606 deletions.
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: 2
updates:
# maintain dependencies for GitHub actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monday"
open-pull-requests-limit: 5
labels:
- "dependencies"
- "github_actions"

# maintain dependencies for Gradle
- package-ecosystem: "gradle" # checks build.gradle(.kts) and settings.gradle(.kts)
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 5
labels:
- "dependencies"
- "java"
125 changes: 68 additions & 57 deletions .github/workflows/chart-lint.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,68 @@
name: Lint and Test Charts

# Run chart linting and tests on each pull request
on:
pull_request:
paths:
- 'charts/**'

jobs:
lint-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v1
with:
version: v3.9.3

- name: Add Helm repos
run: |
cd charts/managed-identity-wallet
helm repo add bitnami https://charts.bitnami.com/bitnami
helm dependency update
# Setup python as a prerequisite for chart linting
- uses: actions/setup-python@v2
with:
python-version: 3.7

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.3.1

- name: Run chart-testing (list-changed)
id: list-changed
run: |
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
if [[ -n "$changed" ]]; then
echo "::set-output name=changed::true"
fi
# run chart linting
- name: Run chart-testing (lint)
run: ct lint --target-branch ${{ github.event.repository.default_branch }} --config charts/chart-testing-config.yaml

# Preparing a kind cluster to install and test charts on
- name: Create kind cluster
uses: helm/kind-action@v1.4.0
if: steps.list-changed.outputs.changed == 'true'

# install the chart to the kind cluster and run helm test
# define charts to test with the --charts parameter
- name: Run chart-testing (install)
run: ct install --charts charts/managed-identity-wallet --config charts/chart-testing-config.yaml
if: steps.list-changed.outputs.changed == 'true'
# name: Lint and Test Charts

# # Run chart linting and tests on each pull request
# on:
# pull_request:
# paths:
# - 'charts/**'

# jobs:
# chart-lint:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v2
# with:
# fetch-depth: 0

# - name: Set up Helm
# uses: azure/setup-helm@v3
# with:
# version: v3.11.3

# - name: Update Helm dependencies
# run: |
# cd charts/managed-identity-wallet
# helm dependency update

# - name: Install Helm unittest plugin
# run: |
# helm plugin install https://github.com/helm-unittest/helm-unittest.git

# # Setup python as a prerequisite for chart linting
# - uses: actions/setup-python@v2
# with:
# python-version: 3.7

# - name: Set up chart-testing
# uses: helm/chart-testing-action@v2.3.1

# - name: Install Task
# uses: arduino/setup-task@v1

# - name: Run chart-testing (list-changed)
# id: list-changed
# run: |
# changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
# if [[ -n "$changed" ]]; then
# echo "::set-output name=changed::true"
# fi

# # run chart linting
# - name: Run chart-testing (lint)
# run: ct lint --config charts/chart-testing-config.yaml --charts ./charts/managed-identity-wallet

# # run chart unittest
# - name: Run Helm unittests
# run: task helm:unittest

# # Preparing a kind cluster to install and test charts on
# - name: Create kind cluster
# uses: helm/kind-action@v1.7.0
# if: steps.list-changed.outputs.changed == 'true'

# # install the chart to the kind cluster and run helm test
# # define charts to test with the --charts parameter
# - name: Run chart-testing (install)
# run: ct install --charts charts/managed-identity-wallet --config charts/chart-testing-config.yaml
# if: steps.list-changed.outputs.changed == 'true'
62 changes: 0 additions & 62 deletions .github/workflows/initdb.yml

This file was deleted.

18 changes: 9 additions & 9 deletions .github/workflows/kics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ name: "KICS"

on:
push:
branches: [main, master, develop]
# pull_request:
branches: [main, development]
pull_request:
# The branches below must be a subset of the branches above
# branches: [main, master]
# paths-ignore:
# - "**/*.md"
# - "**/*.txt"
branches: [main, development]
paths:
- "charts/managed-identity-wallet/**"
- "dev-assets/docker-environment/**"
- "docs/**"
schedule:
- cron: "0 0 * * *"

Expand All @@ -43,10 +44,10 @@ jobs:
- uses: actions/checkout@v3

- name: KICS scan
uses: checkmarx/kics-github-action@master
uses: checkmarx/kics-github-action@v1.7.0
with:
# Scanning directory .
path: "."
path: "charts/managed-identity-wallet,dev-assets/docker-environment,docs"
# Fail on HIGH severity results
fail_on: high
# Disable secrets detection - we use GitGuardian
Expand All @@ -63,7 +64,6 @@ jobs:
# GITHUB_TOKEN enables this github action to access github API and post comments in a pull request
# token: ${{ secrets.GITHUB_TOKEN }}
# enable_comments: true
exclude_paths: "docs/openapi_v330.json"

# Upload findings to GitHub Advanced Security Dashboard
- name: Upload SARIF file for GitHub Advanced Security Dashboard
Expand Down
96 changes: 0 additions & 96 deletions .github/workflows/service-build.yaml

This file was deleted.

Loading

0 comments on commit 9540164

Please sign in to comment.