No more deprecated athenz domain or service usages

3 files changed, 21 insertions, 123 deletions

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 b0ebc98e12b..2724cecec6a 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
@@ -384,83 +384,6 @@ public class DeploymentSpecDeprecatedAPITest {
     }
 
     @Test
-    public void athenz_config_is_read_from_deployment() {
-        StringReader r = new StringReader(
-                "<deployment athenz-domain='domain' athenz-service='service'>\n" +
-                "  <prod>\n" +
-                "    <region active='true'>us-west-1</region>\n" +
-                "  </prod>\n" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals(spec.athenzDomain().get().value(), "domain");
-        assertEquals(spec.athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "service");
-    }
-
-    @Test
-    public void athenz_config_is_propagated_through_parallel_zones() {
-        StringReader r = new StringReader(
-                "<deployment athenz-domain='domain' athenz-service='service'>" +
-                "   <prod athenz-service='prod-service'>" +
-                "      <region active='true'>us-central-1</region>" +
-                "      <parallel>" +
-                "         <region active='true'>us-west-1</region>" +
-                "         <region active='true'>us-east-3</region>" +
-                "      </parallel>" +
-                "   </prod>" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals("domain", spec.athenzDomain().get().value());
-        assertEquals("prod-service", spec.athenzService(Environment.prod,
-                                                            RegionName.from("us-central-1")).get().value());
-        assertEquals("prod-service", spec.athenzService(Environment.prod,
-                                                            RegionName.from("us-west-1")).get().value());
-        assertEquals("prod-service", spec.athenzService(Environment.prod,
-                                                            RegionName.from("us-east-3")).get().value());
-        assertEquals("domain", spec.athenzDomain().get().value());
-    }
-
-    @Test
-    public void athenz_service_is_overridden_from_environment() {
-        StringReader r = new StringReader(
-                "<deployment athenz-domain='domain' athenz-service='service'>\n" +
-                "  <test/>\n" +
-                "  <prod athenz-service='prod-service'>\n" +
-                "    <region active='true'>us-west-1</region>\n" +
-                "  </prod>\n" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals(spec.athenzDomain().get().value(), "domain");
-        assertEquals(spec.athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "prod-service");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void it_fails_when_athenz_service_is_not_defined() {
-        StringReader r = new StringReader(
-                "<deployment athenz-domain='domain'>\n" +
-                "  <prod>\n" +
-                "    <region active='true'>us-west-1</region>\n" +
-                "  </prod>\n" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void it_fails_when_athenz_service_is_configured_but_not_athenz_domain() {
-        StringReader r = new StringReader(
-                "<deployment>\n" +
-                "  <prod athenz-service='service'>\n" +
-                "    <region active='true'>us-west-1</region>\n" +
-                "  </prod>\n" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-    }
-
-    @Test
     public void noNotifications() {
         assertEquals(Notifications.none(),
                      DeploymentSpec.fromXml("<deployment />").notifications());
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index 7b571417ef8..ff51c336658 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -605,15 +605,10 @@ public class DeploymentSpecTest {
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         assertEquals("domain", spec.athenzDomain().get().value());
-        assertEquals("service", spec.athenzService(InstanceName.from("instance1"),
-                                                            Environment.prod,
-                                                            RegionName.from("us-west-1")).get().value());
-        assertEquals("service", spec.athenzService(InstanceName.from("non-existent"),
-                                                   Environment.prod,
-                                                   RegionName.from("us-west-1")).get().value());
         assertEquals("domain", spec.requireInstance("instance1").athenzDomain().get().value());
+        assertEquals("service", spec.athenzService().get().value());
         assertEquals("service", spec.requireInstance("instance1").athenzService(Environment.prod,
-                                                                                         RegionName.from("us-west-1")).get().value());
+                                                                                RegionName.from("us-west-1")).get().value());
     }
 
     @Test
@@ -633,19 +628,15 @@ public class DeploymentSpecTest {
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         assertEquals("domain", spec.athenzDomain().get().value());
-        assertEquals("prod-service", spec.athenzService(InstanceName.from("instance1"),
-                                                                 Environment.prod,
-                                                                 RegionName.from("us-west-1")).get().value());
-        assertEquals("service", spec.athenzService(InstanceName.from("non-existent"),
-                                                            Environment.prod,
-                                                            RegionName.from("us-west-1")).get().value());
+        assertEquals("service", spec.athenzService().get().value());
+
         assertEquals("domain", spec.requireInstance("instance1").athenzDomain().get().value());
         assertEquals("prod-service", spec.requireInstance("instance1").athenzService(Environment.prod,
-                                                                                                     RegionName.from("us-central-1")).get().value());
+                                                                                     RegionName.from("us-central-1")).get().value());
         assertEquals("prod-service", spec.requireInstance("instance1").athenzService(Environment.prod,
-                                                                                                     RegionName.from("us-west-1")).get().value());
+                                                                                     RegionName.from("us-west-1")).get().value());
         assertEquals("prod-service", spec.requireInstance("instance1").athenzService(Environment.prod,
-                                                                                                     RegionName.from("us-east-3")).get().value());
+                                                                                     RegionName.from("us-east-3")).get().value());
     }
 
     @Test
@@ -674,12 +665,6 @@ public class DeploymentSpecTest {
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         assertEquals("domain", spec.athenzDomain().get().value());
-        assertEquals("service", spec.athenzService(InstanceName.from("instance1"),
-                                                   Environment.prod,
-                                                   RegionName.from("us-west-1")).get().value());
-        assertEquals("service", spec.athenzService(InstanceName.from("non-existent"),
-                                                   Environment.prod,
-                                                   RegionName.from("us-west-1")).get().value());
         assertEquals("domain", spec.requireInstance("instance1").athenzDomain().get().value());
         assertEquals("service", spec.requireInstance("instance1").athenzService(Environment.prod,
                                                                                 RegionName.from("us-west-1")).get().value());
@@ -701,11 +686,10 @@ public class DeploymentSpecTest {
                 "</deployment>"
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals(Optional.empty(), spec.athenzDomain());
+        assertEquals(Optional.empty(), spec.athenzService());
         assertEquals(spec.requireInstance("default").athenzDomain().get().value(), "domain");
         assertEquals(spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "service");
-        assertEquals(Optional.empty(), spec.athenzService(InstanceName.from("non-existent"),
-                                                          Environment.prod,
-                                                          RegionName.from("us-west-1")));
     }
 
     @Test
@@ -722,17 +706,9 @@ public class DeploymentSpecTest {
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         assertEquals(spec.requireInstance("default").athenzDomain().get().value(), "domain");
-        assertEquals(spec.athenzService(InstanceName.from("default"),
-                                        Environment.prod,
-                                        RegionName.from("us-west-1")).get().value(),
-                     "prod-service");
-        assertEquals(spec.requireInstance("default").athenzService(Environment.prod,
-                                                                   RegionName.from("us-west-1")).get().value(),
-                     "prod-service");
-        assertEquals(spec.athenzService(InstanceName.from("non-existent"),
-                                        Environment.prod,
-                                        RegionName.from("us-west-1")).get().value(),
-                     "service");
+        assertEquals("prod-service",
+                     spec.requireInstance("default").athenzService(Environment.prod,
+                                                                   RegionName.from("us-west-1")).get().value());
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
index 7805b73cc6a..b5af354aead 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
@@ -388,16 +388,14 @@ public class DeploymentSpecWithoutInstanceTest {
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         assertEquals("domain", spec.athenzDomain().get().value());
-        assertEquals("prod-service", spec.athenzService(InstanceName.from("default"),
-                                                                 Environment.prod,
-                                                                 RegionName.from("us-central-1")).get().value());
-        assertEquals("prod-service", spec.athenzService(InstanceName.from("default"),
-                                                                 Environment.prod,
-                                                                 RegionName.from("us-west-1")).get().value());
-        assertEquals("prod-service", spec.athenzService(InstanceName.from("default"),
-                                                                 Environment.prod,
-                                                                 RegionName.from("us-east-3")).get().value());
-        assertEquals("domain", spec.athenzDomain().get().value());
+        assertEquals("domain", spec.requireInstance("default").athenzDomain().get().value());
+        assertEquals("service", spec.athenzService().get().value());
+        assertEquals("prod-service", spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-central-1"))
+                                         .get().value());
+        assertEquals("prod-service", spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-west-1"))
+                                         .get().value());
+        assertEquals("prod-service", spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-east-3"))
+                                         .get().value());
     }
 
     @Test
@@ -411,6 +409,7 @@ public class DeploymentSpecWithoutInstanceTest {
                 "</deployment>"
         );
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals("service", spec.athenzService().get().value());
         assertEquals(spec.requireInstance("default").athenzDomain().get().value(), "domain");
         assertEquals(spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "prod-service");
     }