From de9b879133e4fb446decf200d9e6467666c9ea65 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 19 Feb 2021 08:36:33 +0100 Subject: nodeArchiveUrl -> nodeArchiveUri --- .../vespa/hosted/provision/restapi/NodesResponse.java | 4 ++-- .../hosted/provision/restapi/NodesResponseTest.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 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 086a476e4b6..52625fe113a 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)); - nodeArchiveUrl(nodeRepository.flagSource(), node).ifPresent(url -> object.setString("nodeArchiveUrl", url)); + nodeArchiveUri(nodeRepository.flagSource(), node).ifPresent(url -> object.setString("nodeArchiveUri", url)); } private void toSlime(ApplicationId id, Cursor object) { @@ -233,7 +233,7 @@ class NodesResponse extends SlimeJsonResponse { return path.substring(lastSlash+1); } - static Optional nodeArchiveUrl(FlagSource flagSource, Node node) { + static Optional nodeArchiveUri(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 508f8cd4c48..aec62ce70d2 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 @@ -28,20 +28,20 @@ public class NodesResponseTest { public void node_archive_url() { ApplicationId app = ApplicationId.from("vespa", "music", "main"); // Flag not set, no archive url - assertNodeArchiveUrl(null, "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, app); - assertNodeArchiveUrl(null, "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, app); + 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); 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 - assertNodeArchiveUrl(null, "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, null); - assertNodeArchiveUrl("s3://vespa-data-bucket/hosted-vespa/cfg1/", "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, null); + 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); // Flag is set and node is allocated - assertNodeArchiveUrl("s3://vespa-data-bucket/vespa/music/main/h432a/", "h432a.prod.us-south-1.vespa.domain.tld", NodeType.tenant, app); - assertNodeArchiveUrl("s3://vespa-data-bucket/hosted-vespa/cfg1/", "cfg1.prod.us-south-1.vespa.domain.tld", NodeType.config, app); + 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); } - private void assertNodeArchiveUrl(String archiveUrl, String hostname, NodeType type, ApplicationId appId) { + private void assertNodeArchiveUri(String archiveUrl, 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.nodeArchiveUrl(flagSource, nodeBuilder.build()).orElse(null)); + assertEquals(archiveUrl, NodesResponse.nodeArchiveUri(flagSource, nodeBuilder.build()).orElse(null)); } } \ No newline at end of file -- cgit v1.2.3