From 28d86634a6e5c6729551c91e31d72f01ca74b2c5 Mon Sep 17 00:00:00 2001 From: Robert Yokota Date: Mon, 5 Feb 2024 15:01:02 -0800 Subject: [PATCH] Don't prefix KEK names with the context in the ContextFilter --- .../kafka/schemaregistry/rest/filters/ContextFilter.java | 1 - .../schemaregistry/rest/filters/ContextFilterTest.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilter.java b/core/src/main/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilter.java index 31b3a552c7c..1dcb5c21adc 100644 --- a/core/src/main/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilter.java +++ b/core/src/main/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilter.java @@ -108,7 +108,6 @@ ContextAndPath modifyUriPath(String path) { boolean isRootConfigOrMode = isRootConfigOrMode(isFirst, uriPathStr); if (uriPathStr.equals("subjects") - || uriPathStr.equals("keks") || uriPathStr.equals("deks") || isRootConfigOrMode) { subjectPathFound = true; diff --git a/core/src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java b/core/src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java index 97a834fb210..c9dbc71b39d 100644 --- a/core/src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java +++ b/core/src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java @@ -186,8 +186,8 @@ public void testModeUriWithoutSubjectDefaultContext() { public void testKekPartOfUri() { String path = "/contexts/.test-ctx/dek-registry/v1/keks/test-kek"; Assert.assertEquals( - "Dek must be prefixed", - "/dek-registry/v1/keks/:.test-ctx:test-kek/", + "Kek must not be prefixed", + "/dek-registry/v1/keks/test-kek/", contextFilter.modifyUri(UriBuilder.fromPath(path), path, new MultivaluedHashMap<>()).getPath() ); } @@ -197,7 +197,7 @@ public void testDekPartOfUri() { String path = "/contexts/.test-ctx/dek-registry/v1/keks/test-kek/deks/test-subject"; Assert.assertEquals( "Dek must be prefixed", - "/dek-registry/v1/keks/:.test-ctx:test-kek/deks/:.test-ctx:test-subject/", + "/dek-registry/v1/keks/test-kek/deks/:.test-ctx:test-subject/", contextFilter.modifyUri(UriBuilder.fromPath(path), path, new MultivaluedHashMap<>()).getPath() ); }