diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-03-02 16:37:28 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-03-06 09:46:02 +0100 |
commit | 59e0b059917f59fcd38fda0f555c7590f91588eb (patch) | |
tree | 282fdce5fdcb4992223004d603024180c755dfbc /node-repository/src/main/java/com/yahoo | |
parent | e22467e6500b212a611827659d79b680f1b7f805 (diff) |
Fix archive URI TODOs
Diffstat (limited to 'node-repository/src/main/java/com/yahoo')
3 files changed, 2 insertions, 9 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java index faa360bbcb1..ed4cab5137c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java @@ -46,12 +46,6 @@ public class ArchiveUriManager { archiveUris.get().accountArchiveUris().get(node.cloudAccount()) : archiveUris.get().tenantArchiveUris().get(app.tenant())) .map(uri -> { - // TODO (freva): Remove when all URIs dont have tenant name in them anymore - String tenantSuffix = "/" + app.tenant().value() + "/"; - if (uri.endsWith(tenantSuffix)) return uri.substring(0, uri.length() - tenantSuffix.length() + 1); - return uri; - }) - .map(uri -> { StringBuilder sb = new StringBuilder(100).append(uri) .append(app.tenant().value()).append('/') .append(app.application().value()).append('/') diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java index 5aea6858f60..c1ab8489f40 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java @@ -102,7 +102,6 @@ public class CuratorDb { db.create(archiveUrisPath); db.create(loadBalancersPath); provisionIndexCounter.initialize(100); - CuratorOperations.delete(root.append("archiveUris").toString()); // TODO (freva): March 2023 } /** Adds a set of nodes. Rollbacks/fails transaction if any node is not in the expected state. */ diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java index 0fbe912812e..d0eb95e2d72 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java @@ -186,7 +186,7 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler { return new MessageResponse("Updated " + patcher.application()); } } - else if (path.matches("/nodes/v2/archive/account/{key}") || path.matches("/nodes/v2/archive/tenant/{key}") || path.matches("/nodes/v2/archive/{key}") /* TODO (freva): Remove March 2023 */) { + else if (path.matches("/nodes/v2/archive/account/{key}") || path.matches("/nodes/v2/archive/tenant/{key}")) { String uri = requiredField(toSlime(request), "uri", Inspector::asString); return setArchiveUri(path.get("key"), Optional.of(uri), !path.getPath().segments().get(3).equals("account")); } @@ -229,7 +229,7 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler { private HttpResponse handleDELETE(HttpRequest request) { Path path = new Path(request.getUri()); if (path.matches("/nodes/v2/node/{hostname}")) return deleteNode(path.get("hostname")); - if (path.matches("/nodes/v2/archive/account/{key}") || path.matches("/nodes/v2/archive/tenant/{key}") || path.matches("/nodes/v2/archive/{key}") /* TODO (freva): Remove March 2023) */) + if (path.matches("/nodes/v2/archive/account/{key}") || path.matches("/nodes/v2/archive/tenant/{key}")) return setArchiveUri(path.get("key"), Optional.empty(), !path.getPath().segments().get(3).equals("account")); if (path.matches("/nodes/v2/upgrade/firmware")) return cancelFirmwareCheckResponse(); |