Simplify identity configuration

4 files changed, 10 insertions, 20 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index b7482a3646d..91d5b7fe267 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -23,7 +23,6 @@ import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.container.core.document.ContainerDocumentConfig;
-import com.yahoo.container.core.identity.IdentityConfig;
 import com.yahoo.container.handler.ThreadPoolProvider;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.container.jdisc.ContainerMbusConfig;
@@ -135,8 +134,7 @@ public final class ContainerCluster
         ServletPathsConfig.Producer,
         RoutingProviderConfig.Producer,
         ConfigserverConfig.Producer,
-        ThreadpoolConfig.Producer,
-        IdentityConfig.Producer
+        ThreadpoolConfig.Producer
 {
 
     /**
@@ -188,8 +186,6 @@ public final class ContainerCluster
     private Optional<String> hostClusterId = Optional.empty();
     private Optional<Integer> memoryPercentage = Optional.empty();
 
-    private Identity identity;
-
     private static class AcceptAllVerifier implements ContainerClusterVerifier {
         @Override
         public boolean acceptComponent(Component component) { return true; }
@@ -863,16 +859,4 @@ public final class ContainerCluster
             this.containerCoreMemory = containerCoreMemory;
         }
     }
-
-    public void setIdentity(Identity identity) {
-        this.identity = identity;
-        addComponent(identity);
-    }
-
-    @Override
-    public void getConfig(IdentityConfig.Builder builder) {
-        if (identity != null) {
-            identity.getConfig(builder);
-        }
-    }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Identity.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Identity.java
index ffa2bbb9c7b..81762f95a90 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Identity.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Identity.java
@@ -2,18 +2,21 @@
 package com.yahoo.vespa.model.container;
 
 import com.yahoo.container.core.identity.IdentityConfig;
+import com.yahoo.container.jdisc.athenz.impl.AthenzIdentityProviderImpl;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
 
 /**
  * @author mortent
  */
 public class Identity extends SimpleComponent implements IdentityConfig.Producer {
+    public static final String CLASS = AthenzIdentityProviderImpl.class.getName();
+
     private final String domain;
     private final String service;
     private final String loadBalancerAddress;
 
     public Identity(String domain, String service, String loadBalancerAddress) {
-        super("com.yahoo.container.jdisc.athenz.impl.AthenzIdentityProviderImpl");
+        super(CLASS);
         this.domain = domain;
         this.service = service;
         this.loadBalancerAddress = loadBalancerAddress;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index f00e6e5e271..fb7ad137c22 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -701,7 +701,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                     .orElse(""); // How to test this?
 
             Identity identity = new Identity(domain.trim(), service.trim(), cfgHostName);
-            cluster.setIdentity(identity);
+            cluster.addComponent(identity);
+
+
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
index 2f7b7f35b91..df118b0e349 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.container.xml;
 
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.container.core.identity.IdentityConfig;
+import com.yahoo.vespa.model.container.Identity;
 import org.junit.Test;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -26,7 +27,7 @@ public class IdentityBuilderTest extends ContainerModelBuilderTestBase {
                 "</jdisc>");
 
         createModel(root, clusterElem);
-        IdentityConfig identityConfig = root.getConfig(IdentityConfig.class, "default");
+        IdentityConfig identityConfig = root.getConfig(IdentityConfig.class, "default/component/" + Identity.CLASS);
         assertEquals("domain", identityConfig.domain());
         assertEquals("service", identityConfig.service());
     }