Support legacy API with instance and global test/staging

2 files changed, 73 insertions, 9 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index b5bf2725b09..df042004420 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -60,8 +60,8 @@ public class DeploymentSpec {
                           Optional<AthenzDomain> athenzDomain,
                           Optional<AthenzService> athenzService,
                           String xmlForm) {
-        if (singleInstance(steps)) { // TODO: Remove this clause after November 2019
-            var singleInstance = (DeploymentInstanceSpec)steps.get(0);
+        if (hasSingleInstance(steps)) { // TODO: Remove this clause after November 2019
+            var singleInstance = singleInstance(steps);
             this.steps = List.of(singleInstance.withSteps(completeSteps(singleInstance.steps())));
         }
         else {
@@ -149,10 +149,16 @@ public class DeploymentSpec {
 
     // TODO: Remove after October 2019
     private DeploymentInstanceSpec singleInstance() {
-        if (singleInstance(steps)) return (DeploymentInstanceSpec)steps.get(0);
+        return singleInstance(steps);
+    }
+
+    // TODO: Remove after October 2019
+    private static DeploymentInstanceSpec singleInstance(List<DeploymentSpec.Step> steps) {
+        List<DeploymentInstanceSpec> instances = instances(steps);
+        if (instances.size() == 1) return instances.get(0);
         throw new IllegalArgumentException("This deployment spec does not support the legacy API " +
                                            "as it has multiple instances: " +
-                                           instances().stream().map(Step::toString).collect(Collectors.joining(",")));
+                                           instances.stream().map(Step::toString).collect(Collectors.joining(",")));
     }
 
     // TODO: Remove after October 2019
@@ -175,7 +181,7 @@ public class DeploymentSpec {
 
     /** Returns the deployment steps of this in the order they will be performed */
     public List<Step> steps() {
-        if (singleInstance(steps)) return singleInstance().steps(); // TODO: Remove line after November 2019
+        if (hasSingleInstance(steps)) return singleInstance().steps(); // TODO: Remove line after November 2019
         return steps;
     }
 
@@ -193,7 +199,7 @@ public class DeploymentSpec {
     // TODO: Remove after November 2019
     public Optional<AthenzService> athenzService(Environment environment, RegionName region) {
         Optional<AthenzService> service = Optional.empty();
-        if (singleInstance(steps))
+        if (hasSingleInstance(steps))
             service = singleInstance().athenzService(environment, region);
         if (service.isPresent())
             return service;
@@ -227,8 +233,8 @@ public class DeploymentSpec {
     }
 
     // TODO: Remove after November 2019
-    private static boolean singleInstance(List<DeploymentSpec.Step> steps) {
-        return steps.size() == 1 && steps.get(0) instanceof DeploymentInstanceSpec;
+    private static boolean hasSingleInstance(List<DeploymentSpec.Step> steps) {
+        return instances(steps).size() == 1;
     }
 
     /** Returns the instance step containing the given instance name */
@@ -254,6 +260,10 @@ public class DeploymentSpec {
 
     /** Returns the step descendants of this which are instances */
     public List<DeploymentInstanceSpec> instances() {
+        return instances(steps);
+    }
+
+    private static List<DeploymentInstanceSpec> instances(List<DeploymentSpec.Step> steps) {
         return steps.stream()
                     .flatMap(step -> step instanceof ParallelZones ? ((ParallelZones)step).steps.stream() : List.of(step).stream())
                     .filter(step -> step instanceof DeploymentInstanceSpec).map(DeploymentInstanceSpec.class::cast)
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java
index 4ab287ab5c0..5a8358e65c3 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java
@@ -3,7 +3,6 @@ package com.yahoo.config.application.api;
 
 import com.google.common.collect.ImmutableSet;
 import com.yahoo.config.provision.Environment;
-import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
 import org.junit.Test;
 
@@ -118,6 +117,61 @@ public class DeploymentSpecDeprecatedAPITest {
     }
 
     @Test
+    public void deploymentSpecWithTest() {
+        StringReader r = new StringReader(
+                "<deployment version='1.0'>" +
+                "   <test/>" +
+                "   <staging/>" +
+                "   <prod>" +
+                "      <region active='false'>us-east1</region>" +
+                "      <region active='true'>us-west1</region>" +
+                "   </prod>" +
+                "</deployment>"
+        );
+
+        DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals("[test, staging, prod.us-east1, prod.us-west1]", spec.steps().toString());
+    }
+
+    @Test
+    public void deploymentSpecWithTestInsideInstance() {
+        StringReader r = new StringReader(
+                "<deployment version='1.0'>" +
+                "   <instance id='instance1'>" +
+                "      <test/>" +
+                "      <staging/>" +
+                "      <prod>" +
+                "         <region active='false'>us-east1</region>" +
+                "         <region active='true'>us-west1</region>" +
+                "      </prod>" +
+                "   </instance>" +
+                "</deployment>"
+        );
+
+        DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals("[test, staging, prod.us-east1, prod.us-west1]", spec.steps().toString());
+    }
+
+    @Test
+    public void deploymentSpecWithTestOutsideInstance() {
+        StringReader r = new StringReader(
+                "<deployment version='1.0'>" +
+                "   <test/>" +
+                "   <staging/>" +
+                "   <instance id='instance1'>" +
+                "      <prod>" +
+                "         <region active='false'>us-east1</region>" +
+                "         <region active='true'>us-west1</region>" +
+                "      </prod>" +
+                "   </instance>" +
+                "</deployment>"
+        );
+
+        DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals("[test, staging, prod.us-east1, prod.us-west1]", spec.steps().toString());
+    }
+
+    @Test
     public void maximalProductionSpec() {
         StringReader r = new StringReader(
         "<deployment version='1.0'>" +