Move identity configuration services.xml -> deployment.xml

7 files changed, 63 insertions, 58 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 91d5b7fe267..1e9dc569ff5 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
@@ -13,8 +13,10 @@ import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.docproc.DocprocConfig;
 import com.yahoo.config.docproc.SchemamappingConfig;
 import com.yahoo.config.model.ApplicationConfigProducerRoot;
+import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
+import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.BundlesConfig;
@@ -232,6 +234,7 @@ public final class ContainerCluster
         addSimpleComponent("com.yahoo.container.core.slobrok.SlobrokConfigurator");
         addSimpleComponent("com.yahoo.container.handler.VipStatus");
         addJaxProviders();
+        addIdentity();
     }
 
     public void setZone(Zone zone) {
@@ -304,6 +307,36 @@ public final class ContainerCluster
         addSimpleComponent(XPathFactoryProvider.class);
     }
 
+    public void addIdentity() {
+        getDeploymentSpec().ifPresent(deploymentSpec -> {
+            deploymentSpec.athenzDomain().ifPresent(domain -> {
+
+                String service = deploymentSpec.athenzService(zone.environment(), zone.region())
+                        .orElseThrow(() -> new RuntimeException("Missing Athenz service configuration"));
+
+                Identity identity = new Identity(domain.trim(), service.trim(), getLoadBalancerName());
+                addComponent(identity);
+
+                getContainers().forEach(container -> {
+                    container.setProp("identity.domain", domain);
+                    container.setProp("identity.service", service);
+                });
+            });
+        });
+    }
+
+    private HostName getLoadBalancerName() {
+        // Set lbaddress, or use first hostname if not specified.
+        // TODO: Remove the orElseGet part when this is set up in all zones
+        return Optional.ofNullable(getRoot().getDeployState().getProperties().loadBalancerName())
+                .orElseGet(
+                        () -> HostName.from(getRoot().getDeployState().getProperties().configServerSpecs().stream()
+                                                    .findFirst()
+                                                    .map(ConfigServerSpec::getHostName)
+                                                    .orElse("unknown") // Currently unable to test this, hence the unknown
+                        ));
+    }
+
     public final void addComponent(Component<?, ?> component) {
         if (clusterVerifier.acceptComponent(component)) {
             componentGroup.addComponent(component);
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 d59846cd5e2..121039a248d 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
@@ -7,7 +7,6 @@ import com.yahoo.config.application.Xml;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.ConfigModelContext;
-import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.application.provider.IncludeDirs;
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.config.model.builder.xml.ConfigModelId;
@@ -16,7 +15,6 @@ import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
-import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.container.jdisc.config.MetricDefaultsConfig;
 import com.yahoo.search.rendering.RendererRegistry;
@@ -39,7 +37,6 @@ import com.yahoo.vespa.model.clients.ContainerDocumentApi;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.ContainerModel;
-import com.yahoo.vespa.model.container.Identity;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.FileStatusHandlerComponent;
 import com.yahoo.vespa.model.container.component.chain.ProcessingHandler;
@@ -165,13 +162,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         addServerProviders(spec, cluster);
         addLegacyFilters(spec, cluster);  // TODO: Remove for Vespa 7
 
-        // Athenz copper argos
-        // NOTE: Must be done after addNodes()
-        addIdentity(spec,
-                    cluster,
-                    context.getDeployState().getProperties().configServerSpecs(),
-                    context.getDeployState().getProperties().loadBalancerName());
-
         //TODO: overview handler, see DomQrserverClusterBuilder
     }
 
@@ -698,31 +688,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         }
     }
 
-    private void addIdentity(Element element, ContainerCluster cluster, List<ConfigServerSpec> configServerSpecs, HostName loadBalancerName) {
-        Element identityElement = XML.getChild(element, "identity");
-        if(identityElement != null) {
-            String domain = XML.getValue(XML.getChild(identityElement, "domain"));
-            String service = XML.getValue(XML.getChild(identityElement, "service"));
-
-            // Set lbaddress, or use first hostname if not specified.
-            HostName lbName = Optional.ofNullable(loadBalancerName)
-                    .orElseGet(
-                            () -> HostName.from(configServerSpecs.stream()
-                                    .findFirst()
-                                    .map(ConfigServerSpec::getHostName)
-                                    .orElse("unknown") // Currently unable to test this, hence the unknown
-                            ));
-
-            Identity identity = new Identity(domain.trim(), service.trim(), lbName);
-            cluster.addComponent(identity);
-
-            cluster.getContainers().forEach(container -> {
-                container.setProp("identity.domain", domain);
-                container.setProp("identity.service", service);
-            });
-        }
-    }
-
     /**
      * Disallow renderers named "DefaultRenderer" or "JsonRenderer"
      */
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 47cf0638d72..6a90bef7bb2 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -7,8 +7,7 @@ ContainerCluster = element container | jdisc {
     ContainerServices &    
     DocumentBinding* &
     Aliases? &
-    NodesOfContainerCluster? &
-    Identity?
+    NodesOfContainerCluster?
 }
 
 ContainerServices =
@@ -226,8 +225,3 @@ DocumentBinding = element document {
     attribute class { xsd:NCName } &
     attribute bundle { xsd:NCName }
 }
-
-Identity = element identity {
-   element domain { xsd:NCName } &
-   element service { xsd:NCName }
-}
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 90bff8e31b3..2ecfa781876 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -4,6 +4,8 @@
 
 start = element deployment {
    attribute version { "1.0" } &
+   attribute athenz-domain { xsd:string }? &
+   attribute athenz-service { xsd:string }? &
    Upgrade? &
    BlockChange* &
    Test? &
@@ -31,15 +33,18 @@ BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7
 }
 
 Test = element test {
-    text
+   attribute athenz-service { xsd:string }? &
+   text
 }
 
 Staging = element staging {
-    text
+   attribute athenz-service { xsd:string }? &
+   text
 }
 
 Prod = element prod {
    attribute global-service-id { text }? &
+   attribute athenz-service { xsd:string }? &
    Region* &
    Delay* &
    Parallel*
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 df118b0e349..c8a245e68b0 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
@@ -1,7 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.xml;
 
+import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.test.MockApplicationPackage;
+import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.container.core.identity.IdentityConfig;
 import com.yahoo.vespa.model.container.Identity;
 import org.junit.Test;
@@ -17,16 +21,24 @@ import static org.junit.Assert.assertEquals;
  */
 public class IdentityBuilderTest extends ContainerModelBuilderTestBase {
     @Test
-    public void identity_config_produced() throws IOException, SAXException {
+    public void identity_config_produced_from_deployment_spec() throws IOException, SAXException {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
-                "  <identity>",
-                "    <domain>domain</domain>",
-                "    <service>service</service>",
-                "  </identity>",
-                "</jdisc>");
+                "<jdisc id='default' version='1.0'/>");
+        String deploymentXml = "<deployment version='1.0' athenz-domain='domain' athenz-service='service'>\n" +
+                               "    <test/>\n" +
+                               "    <prod>\n" +
+                               "        <region active='true'>default</region>\n" +
+                               "    </prod>\n" +
+                               "</deployment>\n";
+
+        ApplicationPackage applicationPackage = new MockApplicationPackage.Builder()
+                .withDeploymentSpec(deploymentXml)
+                .build();
+
+        // Override root
+        root = new MockRoot("root", applicationPackage);
+        createModel(root, DeployState.createTestState(applicationPackage), clusterElem);
 
-        createModel(root, clusterElem);
         IdentityConfig identityConfig = root.getConfig(IdentityConfig.class, "default/component/" + Identity.CLASS);
         assertEquals("domain", identityConfig.domain());
         assertEquals("service", identityConfig.service());
diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml
index f469d22b6f0..f9a62eb648f 100644
--- a/config-model/src/test/schema-test-files/deployment.xml
+++ b/config-model/src/test/schema-test-files/deployment.xml
@@ -1,12 +1,12 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<deployment version='1.0'>
+<deployment version='1.0' athenz-domain='vespa' athenz-service='service'>
     <upgrade policy='canary'/>
     <test/>
     <staging/>
     <block-change revision='true' version='false' days="mon,tue" hours="14,15"/>
     <block-change days="mon,tue" hours="14,15" time-zone="CET"/>
     <block-upgrade days="wed" hours="16" time-zone="CET"/><!-- Tests legacy name. Remove in Vespa 7 -->
-    <prod global-service-id='qrs'>
+    <prod global-service-id='qrs' athenz-service='other-service'>
         <region active='true'>us-west-1</region>
         <delay hours='3'/>
         <region active='true'>us-central-1</region>
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 98637c03020..a02346193cc 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -35,10 +35,6 @@
   </config>
 
   <jdisc id='qrsCluster_1' version='1.0'>
-    <identity>
-      <domain>mydomain</domain>
-      <service>myservice</service>
-    </identity>
     <rest-api path="jersey1">
       <components bundle="my-bundle" />
       <components bundle="other-bundle">