diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2021-09-23 09:01:17 +0200 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2021-09-23 09:01:17 +0200 |
commit | 1c1e88c71b4baea68f2d610a393d7a23f9f6b4ac (patch) | |
tree | 9e2cb298c81a8ee4f5d06a7eeb9de3ea5c34bac4 | |
parent | 91bda8b38e6ddf01ef1c05941692747c73a54349 (diff) |
Ignore empty truststore
2 files changed, 5 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index e5824680962..a0c2c57a710 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -183,7 +183,7 @@ class NodesResponse extends SlimeJsonResponse { node.modelName().ifPresent(modelName -> object.setString("modelName", modelName)); node.switchHostname().ifPresent(switchHostname -> object.setString("switchHostname", switchHostname)); nodeRepository.archiveUris().archiveUriFor(node).ifPresent(uri -> object.setString("archiveUri", uri)); - trustedCertsToSlime(node.trustedCertificates(), object.setArray("trustStore")); + trustedCertsToSlime(node.trustedCertificates(), object); } private void toSlime(ApplicationId id, Cursor object) { @@ -230,7 +230,9 @@ class NodesResponse extends SlimeJsonResponse { addresses.forEach(address -> addressesArray.addString(address.hostname())); } - private void trustedCertsToSlime(Set<TrustStoreItem> trustStoreItems, Cursor array) { + private void trustedCertsToSlime(Set<TrustStoreItem> trustStoreItems, Cursor object) { + if (trustStoreItems.isEmpty()) return; + Cursor array = object.setArray("trustStore"); trustStoreItems.forEach(cert -> cert.toSlime(array)); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java index 407dcce8acb..88a8a22913e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java @@ -1026,7 +1026,7 @@ public class NodesV2ApiTest { @Test public void trusted_certificates_patch() throws IOException { String url = "http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com"; - tester.assertPartialResponse(new Request(url), "\"trustStore\":[]", true); // initially empty list + tester.assertPartialResponse(new Request(url), "\"trustStore\":[]", false); // initially empty list String trustStore = "\"trustStore\":[" + "{" + |