From 5f26c3f9e61ba5d03d3f397f78033fae7261775f Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerij92@gmail.com>
Date: Fri, 19 Feb 2021 09:13:53 +0100
Subject: nodeArchiveUri -> archiveUri

---
 .../hosted/provision/restapi/NodesResponse.java      |  5 +++--
 .../hosted/provision/restapi/NodesResponseTest.java  | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'node-repository')

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 52625fe113a..58e0e31d2bb 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
@@ -178,7 +178,7 @@ class NodesResponse extends SlimeJsonResponse {
         node.reports().toSlime(object, "reports");
         node.modelName().ifPresent(modelName -> object.setString("modelName", modelName));
         node.switchHostname().ifPresent(switchHostname -> object.setString("switchHostname", switchHostname));
-        nodeArchiveUri(nodeRepository.flagSource(), node).ifPresent(url -> object.setString("nodeArchiveUri", url));
+        archiveUri(nodeRepository.flagSource(), node).ifPresent(uri -> object.setString("archiveUri", uri));
     }
 
     private void toSlime(ApplicationId id, Cursor object) {
@@ -233,7 +233,8 @@ class NodesResponse extends SlimeJsonResponse {
         return path.substring(lastSlash+1);
     }
 
-    static Optional<String> nodeArchiveUri(FlagSource flagSource, Node node) {
+    // TODO (freva): Store this in Application or Node
+    static Optional<String> archiveUri(FlagSource flagSource, Node node) {
         String bucket = Flags.SYNC_HOST_LOGS_TO_S3_BUCKET.bindTo(flagSource)
                 .with(FetchVector.Dimension.NODE_TYPE, node.type().name())
                 .with(FetchVector.Dimension.APPLICATION_ID, node.allocation().map(alloc -> alloc.owner().serializedForm()).orElse(null))
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponseTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponseTest.java
index aec62ce70d2..021afd0df7c 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponseTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponseTest.java
@@ -25,23 +25,23 @@ public class NodesResponseTest {
     private final InMemoryFlagSource flagSource = new InMemoryFlagSource();
 
     @Test
-    public void node_archive_url() {
+    public void archive_uri() {
         ApplicationId app = ApplicationId.from("vespa", "music", "main");
-        // Flag not set, no archive url
-        assertNodeArchiveUri(null, "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, app);
-        assertNodeArchiveUri(null, "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, app);
+        // Flag not set, no archive uri
+        assertArchiveUri(null, "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, app);
+        assertArchiveUri(null, "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, app);
 
         flagSource.withStringFlag(Flags.SYNC_HOST_LOGS_TO_S3_BUCKET.id(), "vespa-data-bucket");
         // Flag is set, but node not allocated, only sync non-tenant nodes
-        assertNodeArchiveUri(null, "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, null);
-        assertNodeArchiveUri("s3://vespa-data-bucket/hosted-vespa/cfg1/", "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, null);
+        assertArchiveUri(null, "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, null);
+        assertArchiveUri("s3://vespa-data-bucket/hosted-vespa/cfg1/", "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, null);
 
         // Flag is set and node is allocated
-        assertNodeArchiveUri("s3://vespa-data-bucket/vespa/music/main/h432a/", "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, app);
-        assertNodeArchiveUri("s3://vespa-data-bucket/hosted-vespa/cfg1/", "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, app);
+        assertArchiveUri("s3://vespa-data-bucket/vespa/music/main/h432a/", "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, app);
+        assertArchiveUri("s3://vespa-data-bucket/hosted-vespa/cfg1/", "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, app);
     }
 
-    private void assertNodeArchiveUri(String archiveUrl, String hostname, NodeType type, ApplicationId appId) {
+    private void assertArchiveUri(String archiveUri, String hostname, NodeType type, ApplicationId appId) {
         Node.Builder nodeBuilder = Node.create("id", hostname, new Flavor(NodeResources.unspecified()), Node.State.parked, type);
         Optional.ofNullable(appId)
                 .map(app -> new Allocation(app,
@@ -51,6 +51,6 @@ public class NodesResponseTest {
                         false))
                 .ifPresent(nodeBuilder::allocation);
 
-        assertEquals(archiveUrl, NodesResponse.nodeArchiveUri(flagSource, nodeBuilder.build()).orElse(null));
+        assertEquals(archiveUri, NodesResponse.archiveUri(flagSource, nodeBuilder.build()).orElse(null));
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3