Skip to content

DGS-21546 Follow up PR to handle old CP versions (#3902) #3906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karan-singh-99 merged 1 commit into from
Sep 24, 2025
Merged

DGS-21546 Follow up PR to handle old CP versions (#3902) #3906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions ...try-client/src/main/java/io/confluent/dekregistry/client/rest/DekRegistryRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
public List<String> listDeks(Map<String, String> requestProperties,
String kekName, boolean lookupDeleted)
throws IOException, RestClientException {
UriBuilder builder = UriBuilder.fromPath("/dek-registry/v1/keks/{name}/deks")

Check failure on line 134 in dek-registry-client/src/main/java/io/confluent/dekregistry/client/rest/DekRegistryRestService.java

View check run for this annotation

SonarQube-Confluent / schema-registry Sonarqube Results

dek-registry-client/src/main/java/io/confluent/dekregistry/client/rest/DekRegistryRestService.java#L134 

Define a constant instead of duplicating this literal "/dek-registry/v1/keks/{name}/deks" 3 times.
.queryParam("deleted", lookupDeleted);
String path = builder.build(kekName).toString();

Expand Down Expand Up @@ -264,14 +264,30 @@
String kekName,
CreateDekRequest request)
throws IOException, RestClientException {
UriBuilder builder = UriBuilder.fromPath("/dek-registry/v1/keks/{name}/deks/{subject}");
String path = builder.build(kekName, request.getSubject()).toString();

return httpRequest(
path, "POST",
request.toJson().getBytes(StandardCharsets.UTF_8),
requestProperties,
DEK_TYPE);
try {
UriBuilder builder = UriBuilder.fromPath("/dek-registry/v1/keks/{name}/deks/{subject}");
String path = builder.build(kekName, request.getSubject()).toString();

return httpRequest(
path, "POST",
request.toJson().getBytes(StandardCharsets.UTF_8),
requestProperties,
DEK_TYPE);
} catch (RestClientException e) {
if (e.getErrorCode() == 405) {
// Try fallback to older API that does not have subject in the path
UriBuilder builder = UriBuilder.fromPath("/dek-registry/v1/keks/{name}/deks");
String path = builder.build(kekName).toString();

return httpRequest(
path, "POST",
request.toJson().getBytes(StandardCharsets.UTF_8),
requestProperties,
DEK_TYPE);
} else {
throw e;
}
}
}

public Kek updateKek(String name, UpdateKekRequest request)
Expand Down
Loading