Skip to content
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

(fix): Handle lowercase storage types in JSON payload for create cata… #1022

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

(fix): Handle lowercase storage types in JSON payload for create cata… #1022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f9ac51
(fix): Handle lowercase storage types in JSON payload for create cata…
kameshsampath Feb 18, 2025
51b6653
(fix): cover `type` field and locale
kameshsampath Feb 19, 2025
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
17 changes: 16 additions & 1 deletion service/common/src/main/java/org/apache/polaris/service/config/Serializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.util.List;
import java.util.Locale;

import org.apache.polaris.core.admin.model.AddGrantRequest;
import org.apache.polaris.core.admin.model.Catalog;
import org.apache.polaris.core.admin.model.CatalogRole;
Expand Down Expand Up @@ -73,8 +76,20 @@ public CreateCatalogRequest deserialize(JsonParser p, DeserializationContext ctx
throws IOException, JacksonException {
TreeNode treeNode = p.readValueAsTree();
if (treeNode.isObject() && ((ObjectNode) treeNode).has("catalog")) {
ObjectNode catalogTreeNode = (ObjectNode) treeNode;
JsonNode catalogNode = catalogTreeNode.get("catalog");
if (catalogNode.has("storageConfigInfo")) {
ObjectNode storageConfigNode = (ObjectNode) catalogNode.get("storageConfigInfo");
List.of("type","storageType").forEach( fieldName -> {
if (storageConfigNode.has(fieldName)) {
String type = storageConfigNode.get(fieldName).asText();
// ensure the field value is always serialized as upper case text
storageConfigNode.put(fieldName, type.toUpperCase(Locale.ROOT));
}
});
}
return CreateCatalogRequest.builder()
.setCatalog(ctxt.readTreeAsValue((JsonNode) treeNode.get("catalog"), Catalog.class))
.setCatalog(ctxt.readTreeAsValue(catalogNode, Catalog.class))
.build();
} else {
return CreateCatalogRequest.builder()
Expand Down