-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix (kubernetes-model-generator) : Handle deserialization of `default…
…Mode` field in custom deserializers for VolumeSource types Add custom deserializers to handle correct octal deserialization for these types: - ConfigMapVolumeSource - SecretVolumeSource - DownwardAPIVolumeSource - ProjectedVolumeSource Signed-off-by: Rohan Kumar <[email protected]>
- Loading branch information
1 parent
202b625
commit 250638e
Showing
24 changed files
with
662 additions
and
12 deletions.
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
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
44 changes: 44 additions & 0 deletions
44
kubernetes-client-api/src/test/resources/serialization/cronjob-octal.yml
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,44 @@ | ||
| # | ||
| # Copyright (C) 2015 Red Hat, Inc. | ||
| # | ||
| # Licensed 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. | ||
| # | ||
|
|
||
| apiVersion: batch/v1beta1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: update-db | ||
| spec: | ||
| schedule: "*/1 * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: update-fingerprints | ||
| image: python:3.6.2-slim | ||
| command: ["/bin/bash"] | ||
| args: ["-c", "python /client/test.py"] | ||
| volumeMounts: | ||
| - name: application-code | ||
| mountPath: /where/ever | ||
| restartPolicy: OnFailure | ||
| volumes: | ||
| - name: application-code | ||
| configMap: | ||
| name: conf | ||
| defaultMode: 0555 | ||
| items: | ||
| - key: key1 | ||
| path: target | ||
| mode: 0555 |
39 changes: 39 additions & 0 deletions
39
...del-common/src/main/java/io/fabric8/kubernetes/model/jackson/IntegerOctalHandlerUtil.java
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,39 @@ | ||
| /* | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * Licensed 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.fabric8.kubernetes.model.jackson; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
|
|
||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| public class IntegerOctalHandlerUtil { | ||
| private static final Pattern OCTAL_NUMBER = Pattern.compile("(0[oO]?)[0-7]+"); | ||
|
|
||
| private IntegerOctalHandlerUtil() { | ||
| } | ||
|
|
||
| public static Integer createIntegerValue(JsonNode node) { | ||
| String textValue = node.textValue(); | ||
| if (textValue != null) { | ||
| Matcher octalNumberMatcher = OCTAL_NUMBER.matcher(textValue); | ||
| if (octalNumberMatcher.matches()) { | ||
| return Integer.valueOf(textValue.substring(octalNumberMatcher.group(1).length()), 8); | ||
| } | ||
| } | ||
| return node.intValue(); | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
...common/src/test/java/io/fabric8/kubernetes/model/jackson/IntegerOctalHandlerUtilTest.java
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,44 @@ | ||
| /* | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * Licensed 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.fabric8.kubernetes.model.jackson; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
|
|
||
| import java.util.stream.Stream; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| class IntegerOctalHandlerUtilTest { | ||
| private final ObjectMapper objectMapper = new ObjectMapper(); | ||
|
|
||
| private static Stream<Arguments> shouldParseOctalNumbersCorrectly() { | ||
| return Stream.of( | ||
| Arguments.of("\"012\"", Integer.valueOf("012", 8)), | ||
| Arguments.of("\"0o12\"", Integer.valueOf("012", 8)), | ||
| Arguments.of("\"0O12\"", Integer.valueOf("012", 8))); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource | ||
| void shouldParseOctalNumbersCorrectly(String input, Integer expectedValue) throws JsonProcessingException { | ||
| assertThat(IntegerOctalHandlerUtil.createIntegerValue(objectMapper.readTree(input))) | ||
| .isEqualTo(expectedValue); | ||
| } | ||
| } |
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
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
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
60 changes: 60 additions & 0 deletions
60
...core/src/main/java/io/fabric8/kubernetes/api/model/ConfigMapVolumeSourceDeserializer.java
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 (C) 2015 Red Hat, Inc. | ||
| * | ||
| * Licensed 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.fabric8.kubernetes.api.model; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JsonDeserializer; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static io.fabric8.kubernetes.model.jackson.IntegerOctalHandlerUtil.createIntegerValue; | ||
|
|
||
| public class ConfigMapVolumeSourceDeserializer extends JsonDeserializer<ConfigMapVolumeSource> { | ||
|
|
||
| @Override | ||
| public ConfigMapVolumeSource deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) | ||
| throws IOException { | ||
| JsonNode node = jsonParser.getCodec().readTree(jsonParser); | ||
| ConfigMapVolumeSourceBuilder builder = new ConfigMapVolumeSourceBuilder(); | ||
| if (node.get("items") != null) { | ||
| for (final JsonNode keyToPathNode : node.get("items")) { | ||
| builder.addToItems(createKeyToPath(keyToPathNode, jsonParser)); | ||
| } | ||
| } | ||
| if (node.get("name") != null) { | ||
| builder.withName(node.get("name").textValue()); | ||
| } | ||
| if (node.get("optional") != null) { | ||
| builder.withOptional(node.get("optional").booleanValue()); | ||
| } | ||
| if (node.get("defaultMode") != null) { | ||
| builder.withDefaultMode(createIntegerValue(node.get("defaultMode"))); | ||
| } | ||
| return builder.build(); | ||
| } | ||
|
|
||
| private KeyToPath createKeyToPath(JsonNode node, JsonParser jsonParser) throws JsonProcessingException { | ||
| KeyToPath keyToPath = jsonParser.getCodec().treeToValue(node, KeyToPath.class); | ||
| KeyToPathBuilder keyToPathBuilder = new KeyToPathBuilder(keyToPath); | ||
| if (node.get("mode") != null) { | ||
| keyToPathBuilder.withMode(createIntegerValue(node.get("mode"))); | ||
| } | ||
| return keyToPathBuilder.build(); | ||
| } | ||
| } |
55 changes: 55 additions & 0 deletions
55
...re/src/main/java/io/fabric8/kubernetes/api/model/DownwardAPIVolumeSourceDeserializer.java
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,55 @@ | ||
| /* | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * Licensed 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.fabric8.kubernetes.api.model; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JsonDeserializer; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static io.fabric8.kubernetes.model.jackson.IntegerOctalHandlerUtil.createIntegerValue; | ||
|
|
||
| public class DownwardAPIVolumeSourceDeserializer extends JsonDeserializer<DownwardAPIVolumeSource> { | ||
|
|
||
| @Override | ||
| public DownwardAPIVolumeSource deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) | ||
| throws IOException { | ||
| JsonNode node = jsonParser.getCodec().readTree(jsonParser); | ||
| DownwardAPIVolumeSourceBuilder builder = new DownwardAPIVolumeSourceBuilder(); | ||
| if (node.get("items") != null) { | ||
| for (final JsonNode keyToPathNode : node.get("items")) { | ||
| builder.addToItems(createDownwardAPIVolumeFile(keyToPathNode, jsonParser)); | ||
| } | ||
| } | ||
| if (node.get("defaultMode") != null) { | ||
| builder.withDefaultMode(createIntegerValue(node.get("defaultMode"))); | ||
| } | ||
| return builder.build(); | ||
| } | ||
|
|
||
| private DownwardAPIVolumeFile createDownwardAPIVolumeFile(JsonNode node, JsonParser jsonParser) | ||
| throws JsonProcessingException { | ||
| DownwardAPIVolumeFile downwardAPIVolumeFile = jsonParser.getCodec().treeToValue(node, DownwardAPIVolumeFile.class); | ||
| DownwardAPIVolumeFileBuilder downwardAPIVolumeFileBuilder = new DownwardAPIVolumeFileBuilder(downwardAPIVolumeFile); | ||
| if (node.get("mode") != null) { | ||
| downwardAPIVolumeFileBuilder.withMode(createIntegerValue(node.get("mode"))); | ||
| } | ||
| return downwardAPIVolumeFileBuilder.build(); | ||
| } | ||
| } |
Oops, something went wrong.