Zilla is validating env vars before replacing them #797
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| /* | ||
| * Copyright 2021-2023 Aklivity Inc. | ||
| * | ||
| * Aklivity licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package io.aklivity.zilla.runtime.engine.config; | ||
|
|
||
| import java.util.LinkedList; | ||
|
|
||
| import jakarta.json.Json; | ||
| import jakarta.json.JsonArray; | ||
| import jakarta.json.JsonArrayBuilder; | ||
| import jakarta.json.JsonObject; | ||
| import jakarta.json.JsonObjectBuilder; | ||
| import jakarta.json.JsonValue; | ||
|
|
||
| import org.agrona.collections.MutableInteger; | ||
|
|
||
| public final class EngineConfigAnnotator | ||
| { | ||
| private final LinkedList<String> schemaKeys; | ||
| private final LinkedList<Integer> schemaIndexes; | ||
|
|
||
|
There was a problem hiding this comment. Used implementation because I need an interface from both the deque and the list. Let me know if this is wrong |
||
| public EngineConfigAnnotator() | ||
| { | ||
| this.schemaKeys = new LinkedList<>(); | ||
| this.schemaIndexes = new LinkedList<>(); | ||
| } | ||
|
|
||
| public JsonObject annotate( | ||
| JsonObject jsonObject) | ||
| { | ||
| schemaKeys.clear(); | ||
| schemaIndexes.clear(); | ||
|
|
||
| return (JsonObject) annotateJsonObject(jsonObject); | ||
| } | ||
|
|
||
| private JsonValue annotateJsonObject( | ||
| JsonObject jsonObject) | ||
| { | ||
| JsonObjectBuilder builder = Json.createObjectBuilder(); | ||
|
|
||
| jsonObject.forEach((key, value) -> | ||
| { | ||
| schemaKeys.push(key); | ||
|
|
||
| parse: | ||
| if ("expression".equals(key)) | ||
| { | ||
| builder.add(key, value); | ||
| } | ||
| else if (value.getValueType() == JsonValue.ValueType.OBJECT) | ||
| { | ||
| builder.add(key, annotateJsonObject(value.asJsonObject())); | ||
| } | ||
| else if (value.getValueType() == JsonValue.ValueType.ARRAY) | ||
| { | ||
| if (jsonObject.containsKey("type") && key.equals("enum")) | ||
| { | ||
| break parse; | ||
| } | ||
| builder.add(key, annotateJsonArray(value.asJsonArray())); | ||
| } | ||
| else if (key.equals("type") && isPrimitiveType(value)) | ||
| { | ||
| builder.add("anyOf", createAnyOfTypes(jsonObject)); | ||
| } | ||
| else if (jsonObject.containsKey("type") && | ||
| isPrimitiveType(jsonObject.get("type"))) | ||
| { | ||
| if (key.equals("title") || key.equals("description")) | ||
| { | ||
| builder.add(key, value); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| builder.add(key, value); | ||
| } | ||
|
|
||
| schemaKeys.pop(); | ||
| }); | ||
|
|
||
| return builder.build(); | ||
| } | ||
|
|
||
| private JsonValue annotateJsonArray( | ||
| JsonArray jsonArray) | ||
| { | ||
| JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); | ||
|
|
||
| MutableInteger index = new MutableInteger(); | ||
|
|
||
| jsonArray.forEach(item -> | ||
| { | ||
| schemaIndexes.push(index.value++); | ||
| if (item.getValueType() == JsonValue.ValueType.OBJECT) | ||
| { | ||
| arrayBuilder.add(annotateJsonObject(item.asJsonObject())); | ||
| } | ||
| else | ||
| { | ||
| arrayBuilder.add(item); | ||
| } | ||
| schemaIndexes.pop(); | ||
| }); | ||
|
|
||
| return arrayBuilder.build(); | ||
| } | ||
|
|
||
| private boolean isPrimitiveType( | ||
| JsonValue type) | ||
| { | ||
| String typeText = type.toString().replaceAll("\"", ""); | ||
| return "string".equals(typeText) || | ||
| "integer".equals(typeText) || | ||
| "boolean".equals(typeText) || | ||
| "number".equals(typeText); | ||
| } | ||
|
|
||
| private JsonArray createAnyOfTypes( | ||
| JsonObject properties) | ||
| { | ||
| JsonArrayBuilder anyOfArrayBuilder = Json.createArrayBuilder(); | ||
| JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); | ||
|
|
||
| properties.forEach((key, value) -> | ||
| { | ||
| if (!"title".equals(key) && !"description".equals(key)) | ||
| { | ||
| objectBuilder.add(key, value); | ||
| } | ||
| }); | ||
|
|
||
| anyOfArrayBuilder.add(objectBuilder); | ||
|
|
||
| if (!(!schemaKeys.isEmpty() && | ||
| schemaKeys.size() > 1 && | ||
| "oneOf".equals(schemaKeys.get(1))) || | ||
| schemaIndexes.peek() == 0) | ||
| { | ||
| anyOfArrayBuilder.add(Json.createObjectBuilder() | ||
| .add("$ref", "#/$defs/expression") | ||
| ); | ||
| } | ||
|
|
||
| return anyOfArrayBuilder.build(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright 2021-2023 Aklivity Inc. | ||
| * | ||
| * Aklivity licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package io.aklivity.zilla.runtime.engine.config; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.io.StringReader; | ||
|
|
||
| import jakarta.json.Json; | ||
| import jakarta.json.JsonArray; | ||
| import jakarta.json.JsonObject; | ||
| import jakarta.json.JsonReader; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class EngineConfigAnnotatorTest | ||
| { | ||
| @Test | ||
| public void shouldAnnotateJsonSchema() | ||
| { | ||
| final String json = new String("{" + | ||
| " \"title\": \"Port\"," + | ||
| " \"oneOf\":" + | ||
| " [" + | ||
| " {" + | ||
| " \"type\": \"integer\"" + | ||
| " }," + | ||
| " {" + | ||
| " \"type\": \"string\"," + | ||
| " \"pattern\": \"^\\\\d+(-\\\\d+)?$\"" + | ||
| " }" + | ||
| " ]" + | ||
| "}"); | ||
| try (JsonReader jsonReader = Json.createReader(new StringReader(json))) | ||
| { | ||
| JsonObject jsonObject = jsonReader.readObject(); | ||
| EngineConfigAnnotator annotator = new EngineConfigAnnotator(); | ||
| final JsonObject annotated = annotator.annotate(jsonObject); | ||
|
|
||
| JsonArray jsonArray = annotator.annotate(annotated).getJsonArray("oneOf"); | ||
|
|
||
| assertTrue(jsonArray.get(0).asJsonObject().asJsonObject().getJsonArray("anyOf").size() == 2); | ||
| assertTrue(jsonArray.get(1).asJsonObject().asJsonObject().getJsonArray("anyOf").size() == 1); | ||
|
|
||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,7 @@ | |
| "scheme": | ||
| { | ||
| "title": "Scheme", | ||
| "type": "string", | ||
| "enum": | ||
| [ | ||
| "http" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add
EngineConfigAnnotatorTestto verify some of the important scenarios.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good just wanted to check if that what you mean