Skip to content

Commit 2c15651

Browse files
zambrinfzambrinf
authored
Merge branch 'main' into issues/729
2 parents 6d3a9fc + d8cc886 commit 2c15651

File tree

18 files changed

+35
-55
lines changed

18 files changed

+35
-55
lines changed

‎.dev/dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ services:
2727

2828
kafka0:
2929
image: confluentinc/cp-kafka:7.8.0
30-
user: "0:0"
3130
hostname: kafka0
3231
container_name: kafka0
3332
ports:

‎.github/workflows/docker_publish.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
registry: [ 'docker.io', 'ghcr.io', 'ecr' ]
23+
registry: [ 'docker.io', 'ghcr.io', 'public.ecr.aws' ]
2424

2525
runs-on: ubuntu-latest
2626
steps:
@@ -31,7 +31,8 @@ jobs:
3131
name: image
3232
path: /tmp
3333

34-
# setup containerd to preserve provenance attestations :https://docs.docker.com/build/attestations/#creating-attestations
34+
# setup containerd to preserve provenance attestations:
35+
# https://docs.docker.com/build/attestations/#creating-attestations
3536
- name: Setup docker with containerd
3637
uses: crazy-max/ghaction-setup-docker@v3
3738
with:
@@ -63,33 +64,33 @@ jobs:
6364
password: ${{ secrets.GITHUB_TOKEN }}
6465

6566
- name: Configure AWS credentials
66-
if: matrix.registry == 'ecr'
67+
if: matrix.registry == 'public.ecr.aws'
6768
uses: aws-actions/configure-aws-credentials@v4
6869
with:
6970
aws-region: us-east-1 # This region only for public ECR
7071
role-to-assume: ${{ secrets.AWS_ROLE }}
7172

7273
- name: Login to public ECR
73-
if: matrix.registry == 'ecr'
74+
if: matrix.registry == 'public.ecr.aws'
7475
id: login-ecr-public
7576
uses: aws-actions/amazon-ecr-login@v2
7677
with:
7778
registry-type: public
7879

79-
- name: define env vars
80+
- name: Define env vars for container registry URL
8081
run: |
81-
if [ ${{matrix.registry }} == 'docker.io' ]; then
82-
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
83-
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
84-
elif [ ${{ matrix.registry }} == 'ghcr.io' ]; then
85-
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
86-
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
87-
elif [ ${{ matrix.registry }} == 'ecr' ]; then
82+
if [ ${{ matrix.registry }} == 'public.ecr.aws' ]; then
83+
# vars.ECR_REGISTRY value is expected to be of the `public.ecr.aws/<public_ecr_id>` form
84+
# The `public_ecr_id` must be a *default* alias associated with public regsitry (rather
85+
# than a custom alias)
8886
echo "REGISTRY=${{ vars.ECR_REGISTRY }}" >> $GITHUB_ENV
87+
# Trim GH Org name so that resulting Public ECR URL has no duplicate org name
88+
# Public ECR default alias: public.ecr.aws/<public_ecr_id>/kafka-ui
89+
# Public ECR custom alias: public.ecr.aws/kafbat/kafka-ui
90+
echo "REPOSITORY=$(basename ${{ github.repository }})" >> $GITHUB_ENV
91+
else # this covers the case of docker.io and ghcr.io
92+
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
8993
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
90-
else
91-
echo "REGISTRY=" >> $GITHUB_ENV
92-
echo "REPOSITORY=notworking" >> $GITHUB_ENV
9394
fi
9495
9596
- name: Push images to ${{ matrix.registry }}

‎contract/src/main/resources/swagger/kafka-sr-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ paths:
165165
schema:
166166
$ref: '#/components/schemas/SubjectId'
167167

168-
/config/:
168+
/config:
169169
get:
170170
tags:
171171
- KafkaSrClient

‎documentation/compose/auth-context.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ services:
4242
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
4343
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
4444
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
45-
volumes:
46-
- ./scripts/update_run.sh:/tmp/update_run.sh
47-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
45+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'

‎documentation/compose/cluster-sr-auth.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ services:
2626
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
2727
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
2828
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
29-
volumes:
30-
- ./scripts/update_run.sh:/tmp/update_run.sh
31-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
29+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
3230

3331
schemaregistry1:
3432
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/e2e-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ services:
3030

3131
kafka0:
3232
image: confluentinc/cp-kafka:7.8.0
33-
user: "0:0"
3433
hostname: kafka0
3534
container_name: kafka0
3635
healthcheck:

‎documentation/compose/kafbat-ui.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ services:
5050
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5151
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
5252
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
53-
volumes:
54-
- ./scripts/update_run.sh:/tmp/update_run.sh
55-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
53+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5654

5755
kafka1:
5856
image: confluentinc/cp-kafka:7.8.0
@@ -78,9 +76,7 @@ services:
7876
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
7977
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
8078
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
81-
volumes:
82-
- ./scripts/update_run.sh:/tmp/update_run.sh
83-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
79+
CLUSTER_ID: 'zlFiTJelTOuhnklFwLWixw'
8480

8581
schemaregistry0:
8682
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/kafka-ssl-components.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@ services:
7272
#KAFKA_SSL_CLIENT_AUTH: 'required'
7373
KAFKA_SSL_CLIENT_AUTH: 'requested'
7474
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
75+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
7576
volumes:
76-
- ./scripts/update_run.sh:/tmp/update_run.sh
7777
- ./ssl/creds:/etc/kafka/secrets/creds
7878
- ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
7979
- ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
80-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
8180

8281
schemaregistry0:
8382
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/kafka-ssl.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ services:
5555
#KAFKA_SSL_CLIENT_AUTH: 'required'
5656
KAFKA_SSL_CLIENT_AUTH: 'requested'
5757
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
58+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5859
volumes:
59-
- ./scripts/update_run.sh:/tmp/update_run.sh
6060
- ./ssl/creds:/etc/kafka/secrets/creds
6161
- ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
6262
- ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
63-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-acl-with-zk.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ services:
5555
KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
5656
KAFKA_SUPER_USERS: 'User:admin'
5757
volumes:
58-
- ./scripts/update_run.sh:/tmp/update_run.sh
5958
- ./jaas:/etc/kafka/jaas

‎documentation/compose/ui-connectors-auth.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ services:
4545
KAFKA_INTER_BROKER_LISTENER_NAME: "PLAINTEXT"
4646
KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
4747
KAFKA_LOG_DIRS: "/tmp/kraft-combined-logs"
48-
volumes:
49-
- ./scripts/update_run.sh:/tmp/update_run.sh
50-
command: 'bash -c ''if [ ! -f /tmp/update_run.sh ]; then echo "ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'''
48+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5149

5250
schemaregistry0:
5351
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/ui-jmx-secured.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ services:
4949
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5050
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
5151
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
52+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5253
# CHMOD 700 FOR JMXREMOTE.* FILES
5354
KAFKA_JMX_OPTS: >-
5455
-Dcom.sun.management.jmxremote
@@ -69,5 +70,3 @@ services:
6970
- ./jmx/servertruststore:/jmx/servertruststore
7071
- ./jmx/jmxremote.password:/jmx/jmxremote.password
7172
- ./jmx/jmxremote.access:/jmx/jmxremote.access
72-
- ./scripts/update_run.sh:/tmp/update_run.sh
73-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-ldap.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ services:
5858
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5959
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
6060
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
61-
volumes:
62-
- ./scripts/update_run.sh:/tmp/update_run.sh
63-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
61+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
6462

6563
schemaregistry0:
6664
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/ui-sasl.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ services:
4646
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
4747
KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
4848
KAFKA_SUPER_USERS: 'User:admin,User:enzo'
49+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
4950
volumes:
50-
- ./scripts/update_run.sh:/tmp/update_run.sh
5151
- ./jaas:/etc/kafka/jaas
52-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-serdes.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ services:
9292
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
9393
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
9494
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
95-
volumes:
96-
- ./scripts/update_run.sh:/tmp/update_run.sh
97-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
95+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
9896

9997
schemaregistry0:
10098
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/ui-with-jmx-exporter.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ services:
2525
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
2626
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
2727
KAFKA_OPTS: -javaagent:/usr/share/jmx_exporter/jmx_prometheus_javaagent.jar=11001:/usr/share/jmx_exporter/kafka-broker.yml
28+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
2829
volumes:
2930
- ./jmx-exporter:/usr/share/jmx_exporter/
30-
- ./scripts/update_run.sh:/tmp/update_run.sh
31-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /usr/share/jmx_exporter/kafka-prepare-and-run ; fi'"
31+
command: "bash -c /usr/share/jmx_exporter/kafka-prepare-and-run"
3232

3333
kafbat-ui:
3434
container_name: kafbat-ui

‎e2e-tests/src/test/java/io/kafbat/ui/smokesuite/brokers/BrokersTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void brokersSourceInfoCheck() {
139139
Assert.assertEquals(sourceInfoTooltip, Common.BROKER_SOURCE_INFO_TOOLTIP, "getSourceInfoTooltipText()");
140140
}
141141

142-
@Test
142+
@Test(enabled = false) // flaky, TODO issues/322
143143
public void brokersConfigEditCheck() {
144144
navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
145145
brokersDetails

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@
3232
<!-- Dependency versions -->
3333
<antlr4-maven-plugin.version>4.12.0</antlr4-maven-plugin.version>
3434
<apache.commons.version>2.12.0</apache.commons.version>
35-
<assertj.version>3.25.3</assertj.version>
35+
<assertj.version>3.26.3</assertj.version>
3636
<avro.version>1.11.4</avro.version>
3737
<byte-buddy.version>1.15.11</byte-buddy.version>
3838
<confluent.version>7.8.0</confluent.version>
3939
<datasketches-java.version>3.1.0</datasketches-java.version>
4040
<groovy.version>3.0.13</groovy.version>
41-
<jackson.version>2.14.0</jackson.version>
41+
<jackson.version>2.18.2</jackson.version>
4242
<org.mapstruct.version>1.6.2</org.mapstruct.version>
4343
<org.projectlombok.version>1.18.34</org.projectlombok.version>
4444
<protobuf-java.version>3.25.5</protobuf-java.version>
4545
<scala-lang.library.version>2.13.9</scala-lang.library.version>
4646
<snakeyaml.version>2.3</snakeyaml.version>
47-
<spring-boot.version>3.4.1</spring-boot.version>
47+
<spring-boot.version>3.4.2</spring-boot.version>
4848
<serde-api.version>1.0.0</serde-api.version>
4949
<odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
5050
<odd-oddrn-client.version>0.1.39</odd-oddrn-client.version>
5151
<org.json.version>20240303</org.json.version>
5252
<dev.cel.version>0.3.0</dev.cel.version>
5353
<guava.version>33.3.1-jre</guava.version>
5454
<!-- Test dependency versions -->
55-
<junit.version>5.11.2</junit.version>
55+
<junit.version>5.11.4</junit.version>
5656
<mockito.version>5.14.2</mockito.version>
5757
<okhttp3.mockwebserver.version>4.12.0</okhttp3.mockwebserver.version>
5858
<testcontainers.version>1.20.4</testcontainers.version>

0 commit comments

Comments
 (0)