From 1c034eed5c8e5e06c7cb7d0fda4d9405eaabce4f Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 7 May 2018 10:44:25 +0200 Subject: Don't lookup configserver nodes in NodeIdentifier --- .../vespa/hosted/provision/restapi/v2/filter/NodeIdentifier.java | 2 +- .../vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifier.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifier.java index e1dcefbcf4b..b07c2adafc2 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifier.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifier.java @@ -45,10 +45,10 @@ class NodeIdentifier { switch (subjectCommonName) { case TENANT_DOCKER_HOST_IDENTITY: case PROXY_HOST_IDENTITY: - case CONFIGSERVER_HOST_IDENTITY: return NodePrincipal.withAthenzIdentity(subjectCommonName, getHostFromCalypsoOrAwsCertificate(sans), certificateChain); case TENANT_DOCKER_CONTAINER_IDENTITY: return NodePrincipal.withAthenzIdentity(subjectCommonName, getHostFromVespaCertificate(sans), certificateChain); + case CONFIGSERVER_HOST_IDENTITY: default: return NodePrincipal.withAthenzIdentity(subjectCommonName, certificateChain); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java index 3e49404d386..c0cead74f5f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java @@ -51,7 +51,6 @@ public class NodeIdentifierTest { private static final String HOSTNAME = "myhostname"; private static final String PROXY_HOSTNAME = "myproxyhostname"; - private static final String CONFIGSERVER_HOSTNAME = "myconfigserverhostname"; private static final String OPENSTACK_ID = "OPENSTACK-ID"; private static final String AWS_INSTANCE_ID = "i-abcdef123456"; @@ -136,8 +135,6 @@ public class NodeIdentifierTest { @Test public void accepts_aws_configserver_host_certificate() { NodeRepositoryTester nodeRepositoryDummy = new NodeRepositoryTester(); - nodeRepositoryDummy.addNode(AWS_INSTANCE_ID, CONFIGSERVER_HOSTNAME, INSTANCE_ID, NodeType.confighost); - nodeRepositoryDummy.setNodeState(CONFIGSERVER_HOSTNAME, Node.State.active); Pkcs10Csr csr = Pkcs10CsrBuilder .fromKeypair(new X500Principal("CN=" + CONFIGSERVER_HOST_IDENTITY), KEYPAIR, SHA256_WITH_RSA) .build(); @@ -147,8 +144,6 @@ public class NodeIdentifierTest { .build(); NodeIdentifier identifier = new NodeIdentifier(ZONE, nodeRepositoryDummy.nodeRepository()); NodePrincipal identity = identifier.resolveNode(singletonList(certificate)); - assertTrue(identity.getHostname().isPresent()); - assertEquals(CONFIGSERVER_HOSTNAME, identity.getHostname().get()); assertEquals(CONFIGSERVER_HOST_IDENTITY, identity.getHostIdentityName()); } -- cgit v1.2.3