Skip to content

update to appropriately write lists out to the vault secret object #8

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update to appropriately write lists out to the vault secret object #8

Show file tree
Hide file tree
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
77 changes: 54 additions & 23 deletions src/main/java/io/ianferguson/vault/api/Logical.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.ianferguson.vault.VaultConfig;
import io.ianferguson.vault.VaultException;
import io.ianferguson.vault.json.Json;
import io.ianferguson.vault.json.JsonArray;
import io.ianferguson.vault.json.JsonObject;
import io.ianferguson.vault.json.JsonValue;
import io.ianferguson.vault.response.LogicalResponse;
Expand All @@ -11,6 +12,7 @@
import io.ianferguson.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

import static io.ianferguson.vault.api.LogicalUtilities.adjustPathForDelete;
Expand Down Expand Up @@ -225,34 +227,63 @@ public LogicalResponse write(final String path, final Map<String, Object> nameVa
} else return write(path, nameValuePairs, logicalOperations.writeV1);
}

private void addToArrayJson(JsonArray requestJson, Object value) {
if (value == null) {
requestJson = requestJson.add((String) null);
} else if (value instanceof Boolean) {
requestJson = requestJson.add((Boolean) value);
} else if (value instanceof Integer) {
requestJson = requestJson.add((Integer) value);
} else if (value instanceof Long) {
requestJson = requestJson.add((Long) value);
} else if (value instanceof Float) {
requestJson = requestJson.add((Float) value);
} else if (value instanceof Double) {
requestJson = requestJson.add((Double) value);
} else {
requestJson = requestJson.add(value.toString());
}
}

protected JsonObject mapToJsonObject(Map<String, Object> nameValuePairs) {
JsonObject requestJson = Json.object();
if (nameValuePairs != null) {
for (final Map.Entry<String, Object> pair : nameValuePairs.entrySet()) {
final Object value = pair.getValue();
if (value == null) {
requestJson = requestJson.add(pair.getKey(), (String) null);
} else if (value instanceof Boolean) {
requestJson = requestJson.add(pair.getKey(), (Boolean) pair.getValue());
} else if (value instanceof Integer) {
requestJson = requestJson.add(pair.getKey(), (Integer) pair.getValue());
} else if (value instanceof Long) {
requestJson = requestJson.add(pair.getKey(), (Long) pair.getValue());
} else if (value instanceof Float) {
requestJson = requestJson.add(pair.getKey(), (Float) pair.getValue());
} else if (value instanceof Double) {
requestJson = requestJson.add(pair.getKey(), (Double) pair.getValue());
} else if (value instanceof List) {
JsonArray jsonArray = new JsonArray();
for (Object v: (List<Object>) value) {
addToArrayJson(jsonArray, v);
}
requestJson.add(pair.getKey(), jsonArray);
} else if (value instanceof JsonValue) {
requestJson = requestJson.add(pair.getKey(), (JsonValue) pair.getValue());
} else {
requestJson = requestJson.add(pair.getKey(), pair.getValue().toString());
}
}
}
return requestJson;
}

private LogicalResponse write(final String path, final Map<String, Object> nameValuePairs,
final logicalOperations operation) throws VaultException {
int retryCount = 0;
while (true) {
try {
JsonObject requestJson = Json.object();
if (nameValuePairs != null) {
for (final Map.Entry<String, Object> pair : nameValuePairs.entrySet()) {
final Object value = pair.getValue();
if (value == null) {
requestJson = requestJson.add(pair.getKey(), (String) null);
} else if (value instanceof Boolean) {
requestJson = requestJson.add(pair.getKey(), (Boolean) pair.getValue());
} else if (value instanceof Integer) {
requestJson = requestJson.add(pair.getKey(), (Integer) pair.getValue());
} else if (value instanceof Long) {
requestJson = requestJson.add(pair.getKey(), (Long) pair.getValue());
} else if (value instanceof Float) {
requestJson = requestJson.add(pair.getKey(), (Float) pair.getValue());
} else if (value instanceof Double) {
requestJson = requestJson.add(pair.getKey(), (Double) pair.getValue());
} else if (value instanceof JsonValue) {
requestJson = requestJson.add(pair.getKey(), (JsonValue) pair.getValue());
} else {
requestJson = requestJson.add(pair.getKey(), pair.getValue().toString());
}
}
}
JsonObject requestJson = mapToJsonObject(nameValuePairs);
// Make an HTTP request to Vault
final RestResponse restResponse = new Rest()//NOPMD
.url(config.getAddress() + "/v1/" + adjustPathForReadOrWrite(path, config.getPrefixPathDepth(), operation))
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/io/ianferguson/vault/api/LogicalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package io.ianferguson.vault.api;

import io.ianferguson.vault.VaultConfig;
import io.ianferguson.vault.json.JsonObject;
import junit.framework.TestCase;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

public class LogicalTest extends TestCase {

public void testMapToJsonObject() {
Logical logical = new Logical(new VaultConfig());
Map<String, Object> data = new HashMap<>();
ArrayList testList = new ArrayList<>();
testList.add("value1");
testList.add(2);
testList.add(true);
data.put("ArrayValue", testList);
data.put("IntValue", 1);
data.put("BoolValue", false);
JsonObject jsonObject = logical.mapToJsonObject(data);

String expectedValue = "{\"BoolValue\":false,\"ArrayValue\":[\"value1\",2,true],\"IntValue\":1}";
assertTrue(jsonObject.toString().equals(expectedValue));
}
}