Skip to content

Commit 1b993ef

Browse files
HaaroleanHaarolean
authored
Merge branch 'master' into issues/2538
2 parents 6987245 + 9858055 commit 1b993ef

File tree

600 files changed

+24799
-11789
lines changed

Some content is hidden

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

600 files changed

+24799
-11789
lines changed

‎.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,8 @@ ij_java_wrap_long_lines = false
279279
insert_final_newline = false
280280
trim_trailing_whitespace = false
281281

282+
[*.yaml]
283+
indent_size = 2
284+
[*.yml]
285+
indent_size = 2
286+

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,44 @@ assignees: ''
99

1010
<!--
1111
12+
We will close the issue without further explanation if you don't follow this template and don't provide the information requested within this template.
13+
1214
Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
1315
https://github.com/provectus/kafka-ui/issues
1416
https://github.com/provectus/kafka-ui/discussions
1517
1618
-->
1719

18-
**Describe the bug**
19-
<!--(A clear and concise description of what the bug is.)-->
20+
<!--
21+
Please follow the naming conventions for bugs:
22+
<Feature/Area/Scope> : <Compact, but specific problem summary>
23+
Avoid generic titles, like “Topics: incorrect layout of message sorting drop-down list”. Better use something like: “Topics: Message sorting drop-down list overlaps the "Submit" button”.
24+
25+
-->
26+
27+
**Describe the bug** (Actual behavior)
28+
<!--(A clear and concise description of what the bug is.Use a list, if there is more than one problem)-->
2029

30+
**Expected behavior**
31+
<!--(A clear and concise description of what you expected to happen.)-->
2132

2233
**Set up**
2334
<!--
35+
WE MIGHT CLOSE THE ISSUE without further explanation IF YOU DON'T PROVIDE THIS INFORMATION.
36+
2437
How do you run the app? Please provide as much info as possible:
2538
1. App version (docker image version or check commit hash in the top left corner in UI)
2639
2. Helm chart version, if you use one
2740
3. Any IAAC configs
28-
29-
We might close the issue without further explanation if you don't provide such information.
3041
-->
3142

3243

3344
**Steps to Reproduce**
3445
<!-- We'd like you to provide an example setup (via docker-compose, helm, etc.)
3546
to reproduce the problem, especially with a complex setups. -->
36-
Steps to reproduce the behavior:
3747

3848
1.
3949

40-
**Expected behavior**
41-
<!--
42-
(A clear and concise description of what you expected to happen)
43-
-->
44-
4550
**Screenshots**
4651
<!--
4752
(If applicable, add screenshots to help explain your problem)
@@ -50,5 +55,10 @@ Steps to reproduce the behavior:
5055

5156
**Additional context**
5257
<!--
53-
(Add any other context about the problem here)
58+
Add any other context about the problem here. E.g.:
59+
1. Are there any alternative scenarios (different data/methods/configuration/setup) you have tried?
60+
Were they successfull or same issue occured? Please provide steps as well.
61+
2. Related issues (if there are any).
62+
3. Logs (if available)
63+
4. Is there any serious impact or behaviour on the end-user because of this issue, that can be overlooked?
5464
-->

‎.github/workflows/aws_publisher.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
description: 'If set to true, the request to update AWS Server product version will be raised'
1515
required: true
1616
default: false
17+
type: boolean
1718

1819
jobs:
1920
build-ami:
@@ -30,7 +31,7 @@ jobs:
3031
echo "Packer will be triggered in this dir $WORK_DIR"
3132
3233
- name: Configure AWS credentials for Kafka-UI account
33-
uses: aws-actions/configure-aws-credentials@v1
34+
uses: aws-actions/configure-aws-credentials@v1-node16
3435
with:
3536
aws-access-key-id: ${{ secrets.AWS_AMI_PUBLISH_KEY_ID }}
3637
aws-secret-access-key: ${{ secrets.AWS_AMI_PUBLISH_KEY_SECRET }}
@@ -57,7 +58,7 @@ jobs:
5758

5859
# add fresh AMI to AWS Marketplace
5960
- name: Publish Artifact at Marketplace
60-
if: ${{ github.event.inputs.PublishOnMarketplace == true }}
61+
if: ${{ github.event.inputs.PublishOnMarketplace == 'true' }}
6162
env:
6263
PRODUCT_ID: ${{ secrets.AWS_SERVER_PRODUCT_ID }}
6364
RELEASE_VERSION: "${{ github.event.inputs.KafkaUIReleaseVersion }}"

‎.github/workflows/backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: backend
1+
name: Backend build and test
22
on:
33
push:
44
branches:

‎.github/workflows/block_merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
block_merge:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: mheap/github-action-required-labels@v2
9+
- uses: mheap/github-action-required-labels@v3
1010
with:
1111
mode: exactly
1212
count: 0

‎.github/workflows/branch-deploy.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: DeployFromBranch
1+
name: Feature testing init
22
on:
33
workflow_dispatch:
44

@@ -9,27 +9,16 @@ jobs:
99
if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' }}
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: ./.github/workflows/build-template.yaml
13+
with:
14+
APP_VERSION: $GITHUB_SHA
1315
- name: get branch name
1416
id: extract_branch
1517
run: |
1618
tag='pr${{ github.event.pull_request.number }}'
1719
echo "tag=${tag}" >> $GITHUB_OUTPUT
1820
env:
1921
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20-
- name: Set up JDK
21-
uses: actions/setup-java@v3
22-
with:
23-
java-version: '17'
24-
distribution: 'zulu'
25-
cache: 'maven'
26-
- name: Build
27-
id: build
28-
run: |
29-
./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
30-
./mvnw -B -V -ntp clean package -Pprod -DskipTests
31-
export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
32-
echo "version=${VERSION}" >> $GITHUB_OUTPUT
3322
- name: Set up QEMU
3423
uses: docker/setup-qemu-action@v2
3524
- name: Set up Docker Buildx
@@ -43,7 +32,7 @@ jobs:
4332
restore-keys: |
4433
${{ runner.os }}-buildx-
4534
- name: Configure AWS credentials for Kafka-UI account
46-
uses: aws-actions/configure-aws-credentials@v1
35+
uses: aws-actions/configure-aws-credentials@v1-node16
4736
with:
4837
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4938
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -53,7 +42,7 @@ jobs:
5342
uses: aws-actions/amazon-ecr-login@v1
5443
- name: Build and push
5544
id: docker_build_and_push
56-
uses: docker/build-push-action@v3
45+
uses: docker/build-push-action@v4
5746
with:
5847
builder: ${{ steps.buildx.outputs.name }}
5948
context: kafka-ui-api

‎.github/workflows/branch-remove.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: RemoveCustomDeployment
1+
name: Feature testing destroy
22
on:
33
workflow_dispatch:
44
pull_request:

‎.github/workflows/build-public-image.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v3
12+
with:
13+
ref: ${{ github.event.pull_request.head.sha }}
1214
- name: get branch name
1315
id: extract_branch
1416
run: |
@@ -40,7 +42,7 @@ jobs:
4042
restore-keys: |
4143
${{ runner.os }}-buildx-
4244
- name: Configure AWS credentials for Kafka-UI account
43-
uses: aws-actions/configure-aws-credentials@v1
45+
uses: aws-actions/configure-aws-credentials@v1-node16
4446
with:
4547
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4648
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -52,7 +54,7 @@ jobs:
5254
registry-type: 'public'
5355
- name: Build and push
5456
id: docker_build_and_push
55-
uses: docker/build-push-action@v3
57+
uses: docker/build-push-action@v4
5658
with:
5759
builder: ${{ steps.buildx.outputs.name }}
5860
context: kafka-ui-api

‎.github/workflows/build-template.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Maven build template
2+
on:
3+
workflow_call:
4+
inputs:
5+
APP_VERSION:
6+
required: true
7+
type: string
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
version: ${{steps.build.outputs.version}}
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
ref: ${{ github.event.pull_request.head.sha }}
17+
- run: |
18+
git config user.name github-actions
19+
git config user.email [email protected]
20+
- name: Set up JDK
21+
uses: actions/setup-java@v3
22+
with:
23+
java-version: '17'
24+
distribution: 'zulu'
25+
cache: 'maven'
26+
- name: Build
27+
id: build
28+
run: |
29+
./mvnw -B -ntp versions:set -DnewVersion=${{ inputs.APP_VERSION }}
30+
./mvnw -B -V -ntp clean package -Pprod -DskipTests
31+
export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
32+
echo "version=${VERSION}" >> $GITHUB_OUTPUT

‎.github/workflows/create-branch-for-helm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: prepare-helm-release
1+
name: Prepare helm release
22
on:
33
repository_dispatch:
44
types: [prepare-helm-release]

‎.github/workflows/cve.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
${{ runner.os }}-buildx-
4141
4242
- name: Build docker image
43-
uses: docker/build-push-action@v3
43+
uses: docker/build-push-action@v4
4444
with:
4545
builder: ${{ steps.buildx.outputs.name }}
4646
context: kafka-ui-api
@@ -55,7 +55,7 @@ jobs:
5555
cache-to: type=local,dest=/tmp/.buildx-cache
5656

5757
- name: Run CVE checks
58-
uses: aquasecurity/trivy-action@0.8.0
58+
uses: aquasecurity/trivy-action@0.9.2
5959
with:
6060
image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
6161
format: "table"

‎.github/workflows/delete-public-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
tag='${{ github.event.pull_request.number }}'
1616
echo "tag=${tag}" >> $GITHUB_OUTPUT
1717
- name: Configure AWS credentials for Kafka-UI account
18-
uses: aws-actions/configure-aws-credentials@v1
18+
uses: aws-actions/configure-aws-credentials@v1-node16
1919
with:
2020
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
2121
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

‎.github/workflows/documentation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Documentation
1+
name: Documentation URLs linter
22
on:
33
pull_request:
44
types:

‎.github/workflows/e2e-automation.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: E2E Automation suite
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
test_suite:
6+
description: 'Select test suite to run'
7+
default: 'regression'
8+
required: true
9+
type: choice
10+
options:
11+
- regression
12+
- sanity
13+
- smoke
14+
qase_token:
15+
description: 'Set Qase token to enable integration'
16+
required: false
17+
type: string
18+
19+
jobs:
20+
build-and-test:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v3
24+
with:
25+
ref: ${{ github.sha }}
26+
- name: Set up environment
27+
id: set_env_values
28+
run: |
29+
cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
30+
- name: Pull with Docker
31+
id: pull_chrome
32+
run: |
33+
docker pull selenium/standalone-chrome:103.0
34+
- name: Set up JDK
35+
uses: actions/setup-java@v3
36+
with:
37+
java-version: '17'
38+
distribution: 'zulu'
39+
cache: 'maven'
40+
- name: Build with Maven
41+
id: build_app
42+
run: |
43+
./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
44+
./mvnw -B -V -ntp clean install -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
45+
- name: Compose with Docker
46+
id: compose_app
47+
# use the following command until #819 will be fixed
48+
run: |
49+
docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
50+
- name: Run test suite
51+
run: |
52+
./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
53+
./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ github.event.inputs.qase_token }} -Dsurefire.suiteXmlFiles='src/test/resources/${{ github.event.inputs.test_suite }}.xml' -Dsuite=${{ github.event.inputs.test_suite }} -f 'kafka-ui-e2e-checks' test -Pprod
54+
- name: Generate Allure report
55+
uses: simple-elf/allure-report-action@master
56+
if: always()
57+
id: allure-report
58+
with:
59+
allure_results: ./kafka-ui-e2e-checks/allure-results
60+
gh_pages: allure-results
61+
allure_report: allure-report
62+
subfolder: allure-results
63+
report_url: "http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com"
64+
- uses: jakejarvis/s3-sync-action@master
65+
if: always()
66+
env:
67+
AWS_S3_BUCKET: 'kafkaui-allure-reports'
68+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
69+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
70+
AWS_REGION: 'eu-central-1'
71+
SOURCE_DIR: 'allure-history/allure-results'
72+
- name: Deploy report to Amazon S3
73+
if: always()
74+
uses: Sibz/[email protected]
75+
with:
76+
authToken: ${{secrets.GITHUB_TOKEN}}
77+
context: "Test report"
78+
state: "success"
79+
sha: ${{ github.sha }}
80+
target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
81+
- name: Dump Docker logs on failure
82+
if: failure()
83+
uses: jwalton/[email protected]

0 commit comments

Comments
 (0)