Skip to content

Commit 14b5d46

Browse files
authored
Merge branch 'main' into issues/620
2 parents 3188223 + 8f9c634 commit 14b5d46

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

.github/dependabot.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@ updates:
1414
- "type/dependencies"
1515
- "scope/backend"
1616

17+
- package-ecosystem: docker
18+
directory: "/api"
19+
schedule:
20+
interval: weekly
21+
time: "10:00"
22+
timezone: Europe/London
23+
reviewers:
24+
- "kafbat/backend"
25+
open-pull-requests-limit: 10
26+
ignore:
27+
- dependency-name: "azul/zulu-openjdk-alpine"
28+
# Limit dependabot pull requests to minor Java upgrades
29+
update-types: ["version-update:semver-major"]
30+
labels:
31+
- "type/dependencies"
32+
- "scope/backend"
33+
1734
- package-ecosystem: npm
1835
directory: "/frontend"
1936
schedule:

api/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM azul/zulu-openjdk-alpine:17.0.11-jre-headless
1+
# The tag is ignored when a sha is included but the reason to add it are:
2+
# 1. Self Documentation: It is difficult to find out what the expected tag is given a sha alone
3+
# 2. Helps dependabot during discovery of upgrades
4+
FROM azul/zulu-openjdk-alpine:17-jre-headless-latest@sha256:af4df00adaec356d092651af50d9e80fd179f96722d267e79acb564aede10fda
25

36
RUN apk add --no-cache \
47
# snappy codec

api/src/main/java/io/kafbat/ui/controller/MessagesController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessagesV2(Strin
118118
if (cursor != null) {
119119
messagesFlux = messagesService.loadMessages(getCluster(clusterName), topicName, cursor);
120120
} else {
121+
var pollingMode = mode == null ? PollingModeDTO.LATEST : mode;
121122
messagesFlux = messagesService.loadMessages(
122123
getCluster(clusterName),
123124
topicName,
124-
ConsumerPosition.create(checkNotNull(mode), checkNotNull(topicName), partitions, timestamp, offset),
125+
ConsumerPosition.create(pollingMode, checkNotNull(topicName), partitions, timestamp, offset),
125126
stringFilter,
126127
smartFilterId,
127128
limit,

0 commit comments

Comments
 (0)