Netflix · codefromthecrypt · Mar 22, 2015 · Mar 22, 2015 · Mar 22, 2015
diff --git a/clouddns/src/main/java/denominator/clouddns/CloudDNSProvider.java b/clouddns/src/main/java/denominator/clouddns/CloudDNSProvider.java
@@ -15,7 +15,6 @@
 import denominator.DNSApiManager;
 import denominator.ResourceRecordSetApi;
 import denominator.ZoneApi;
-import denominator.clouddns.RackspaceAdapters.DomainIdListAdapter;
 import denominator.clouddns.RackspaceAdapters.DomainListAdapter;
 import denominator.clouddns.RackspaceAdapters.JobIdAndStatusAdapter;
 import denominator.clouddns.RackspaceAdapters.RecordListAdapter;
@@ -142,7 +141,6 @@ Feign feign(Logger logger, Logger.Level logLevel) {
                        new KeystoneAccessAdapter("rax:dns"),
                        new JobIdAndStatusAdapter(),
                        new DomainListAdapter(),
-                       new DomainIdListAdapter(),
                        new RecordListAdapter()))
           )
           .build();

diff --git a/clouddns/src/main/java/denominator/clouddns/CloudDNSResourceRecordSetApi.java b/clouddns/src/main/java/denominator/clouddns/CloudDNSResourceRecordSetApi.java
@@ -181,10 +181,8 @@ static final class Factory implements denominator.ResourceRecordSetApi.Factory {
     }
 
     @Override
-    public ResourceRecordSetApi create(String name) {
-      ListWithNext<Integer> matching = api.domainIdsByName(name);
-      checkArgument(!matching.isEmpty(), "zone %s does not exist", name);
-      return new CloudDNSResourceRecordSetApi(api, matching.get(0));
+    public ResourceRecordSetApi create(String id) {
+      return new CloudDNSResourceRecordSetApi(api, Integer.parseInt(id));
     }
   }
 }
diff --git a/clouddns/src/main/java/denominator/clouddns/RackspaceAdapters.java b/clouddns/src/main/java/denominator/clouddns/RackspaceAdapters.java
@@ -58,30 +58,6 @@ public Job read(JsonReader reader) throws IOException {
     }
   }
 
-  static class DomainIdListAdapter extends ListWithNextAdapter<Integer> {
-
-    @Override
-    protected String jsonKey() {
-      return "domains";
-    }
-
-    protected Integer build(JsonReader reader) throws IOException {
-      Integer id = null;
-      while (reader.hasNext()) {
-        if (reader.nextName().equals("id")) {
-          id = reader.nextInt();
-        } else {
-          reader.skipValue();
-        }
-      }
-      return id;
-    }
-  }
-
-  /**
-   * Note that we do not expose the ID back to the user as ID isn't semantic when the API doesn't
-   * support multiple zones
-   */
   static class DomainListAdapter extends ListWithNextAdapter<Zone> {
 
     @Override
@@ -93,8 +69,11 @@ protected Zone build(JsonReader reader) throws IOException {
       String name = null;
       String id = null;
       while (reader.hasNext()) {
-        if (reader.nextName().equals("name")) {
+        String nextName = reader.nextName();
+        if (nextName.equals("name")) {
           name = reader.nextString();
+        } else if (nextName.equals("id")) {
+          id = reader.nextString();
         } else {
           reader.skipValue();
         }

diff --git a/clouddns/src/main/java/denominator/clouddns/RackspaceApis.java b/clouddns/src/main/java/denominator/clouddns/RackspaceApis.java
@@ -51,7 +51,7 @@ static interface CloudDNS {
      * aren't permitted in the create api.
      */
     @RequestLine("GET /domains?name={name}")
-    ListWithNext<Integer> domainIdsByName(@Param("name") String name);
+    ListWithNext<Zone> domainsByName(@Param("name") String name);
 
     @RequestLine("GET")
     ListWithNext<Zone> domains(URI href);

diff --git a/clouddns/src/test/java/denominator/clouddns/CloudDNSResourceRecordSetApiMockTest.java b/clouddns/src/test/java/denominator/clouddns/CloudDNSResourceRecordSetApiMockTest.java
@@ -12,7 +12,7 @@
 import denominator.model.rdata.AData;
 
 import static denominator.assertj.ModelAssertions.assertThat;
-import static denominator.clouddns.RackspaceApisTest.domainsResponse;
+import static denominator.clouddns.RackspaceApisTest.domainId;
 import static junit.framework.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 
@@ -40,10 +40,9 @@ public class CloudDNSResourceRecordSetApiMockTest {
   @Test
   public void listWhenPresent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setBody(records));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
     Iterator<ResourceRecordSet<?>> records = api.iterator();
 
     while (records.hasNext()) {
@@ -53,9 +52,6 @@ public void listWhenPresent() throws Exception {
     }
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records");
@@ -64,18 +60,14 @@ public void listWhenPresent() throws Exception {
   @Test
   public void listWhenAbsent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setResponseCode(404).setBody(
         "{\"message\":\"Not Found\",\"code\":404,\"details\":\"\"}"));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
 
     assertFalse(api.iterator().hasNext());
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records");
@@ -84,11 +76,10 @@ public void listWhenAbsent() throws Exception {
   @Test
   public void listPagesWhenPresent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setBody(recordsPage1.replace("URL", server.url())));
     server.enqueue(new MockResponse().setBody(recordsPage2.replace("URL", server.url())));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
     Iterator<ResourceRecordSet<?>> records = api.iterator();
 
     while (records.hasNext()) {
@@ -98,9 +89,6 @@ public void listPagesWhenPresent() throws Exception {
     }
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records");
@@ -112,10 +100,9 @@ public void listPagesWhenPresent() throws Exception {
   @Test
   public void iterateByNameWhenPresent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setBody(recordsByName));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
     Iterator<ResourceRecordSet<?>> records = api.iterateByName("www.denominator.io");
 
     while (records.hasNext()) {
@@ -125,9 +112,6 @@ public void iterateByNameWhenPresent() throws Exception {
     }
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records");
@@ -136,17 +120,13 @@ public void iterateByNameWhenPresent() throws Exception {
   @Test
   public void iterateByNameWhenAbsent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setResponseCode(404).setBody(
         "{\"message\":\"Not Found\",\"code\":404,\"details\":\"\"}"));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
     assertFalse(api.iterateByName("www.denominator.io").hasNext());
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records");
@@ -155,10 +135,9 @@ public void iterateByNameWhenAbsent() throws Exception {
   @Test
   public void getByNameAndTypeWhenPresent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setBody(recordsByNameAndType));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
 
     assertThat(api.getByNameAndType("www.denominator.io", "A"))
         .hasName("www.denominator.io")
@@ -167,9 +146,6 @@ public void getByNameAndTypeWhenPresent() throws Exception {
         .containsExactlyRecords(AData.create("1.2.3.4"), AData.create("5.6.7.8"));
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records?name=www.denominator.io&type=A");
@@ -178,17 +154,13 @@ public void getByNameAndTypeWhenPresent() throws Exception {
   @Test
   public void getByNameAndTypeWhenAbsent() throws Exception {
     server.enqueueAuthResponse();
-    server.enqueue(new MockResponse().setBody(domainsResponse));
     server.enqueue(new MockResponse().setResponseCode(404).setBody(
         "{\"message\":\"Not Found\",\"code\":404,\"details\":\"\"}"));
 
-    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone("denominator.io");
+    ResourceRecordSetApi api = server.connect().api().basicRecordSetsInZone(domainId + "");
     assertNull(api.getByNameAndType("www.denominator.io", "A"));
 
     server.assertAuthRequest();
-    server.assertRequest()
-        .hasMethod("GET")
-        .hasPath("/v1.0/123123/domains?name=denominator.io");
     server.assertRequest()
         .hasMethod("GET")
         .hasPath("/v1.0/123123/domains/1234/records?name=www.denominator.io&type=A");

diff --git a/clouddns/src/test/java/denominator/clouddns/CloudDNSZoneApiMockTest.java b/clouddns/src/test/java/denominator/clouddns/CloudDNSZoneApiMockTest.java
@@ -11,6 +11,7 @@
 import denominator.model.Zone;
 
 import static denominator.assertj.ModelAssertions.assertThat;
+import static denominator.clouddns.RackspaceApisTest.domainId;
 import static denominator.clouddns.RackspaceApisTest.domainsResponse;
 import static org.junit.Assert.assertFalse;
 
@@ -28,7 +29,8 @@ public void iteratorWhenPresent() throws Exception {
     Iterator<Zone> domains = api.iterator();
 
     assertThat(domains.next())
-        .hasName("denominator.io");
+        .hasName("denominator.io")
+        .hasId(String.valueOf(domainId));
 
     server.assertAuthRequest();
     server.assertRequest().hasPath("/v1.0/123123/domains");

diff --git a/clouddns/src/test/java/denominator/clouddns/RackspaceApisTest.java b/clouddns/src/test/java/denominator/clouddns/RackspaceApisTest.java
@@ -13,6 +13,7 @@
 import denominator.clouddns.RackspaceApis.CloudIdentity;
 import denominator.clouddns.RackspaceApis.Job;
 import denominator.clouddns.RackspaceApis.TokenIdAndPublicURL;
+import denominator.model.Zone;
 import feign.Feign;
 
 import static denominator.assertj.ModelAssertions.assertThat;
@@ -74,12 +75,12 @@ public void domainsPresent() throws Exception {
   }
 
   @Test
-  public void domainIdsByNamePresent() throws Exception {
+  public void domainsByNamePresent() throws Exception {
     server.enqueueAuthResponse();
     server.enqueue(new MockResponse().setBody(domainsResponse));
 
-    assertThat(mockApi().domainIdsByName("denominator.io"))
-        .containsOnly(1234);
+    assertThat(mockApi().domainsByName("denominator.io"))
+        .containsOnly(Zone.create("denominator.io", "1234"));
 
     server.assertAuthRequest();
     server.assertRequest()

diff --git a/designate/src/main/java/denominator/designate/Designate.java b/designate/src/main/java/denominator/designate/Designate.java
@@ -17,9 +17,6 @@ public interface Designate {
   @RequestLine("GET /domains")
   List<Zone> domains();
 
-  @RequestLine("GET /domains")
-  Map<String, String> domainIdsByName();
-
   @RequestLine("GET /domains/{domainId}/records")
   List<Record> records(@Param("domainId") String domainId);
 

diff --git a/designate/src/main/java/denominator/designate/DesignateAdapters.java b/designate/src/main/java/denominator/designate/DesignateAdapters.java
@@ -7,10 +7,8 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import denominator.designate.Designate.Record;
 import denominator.model.Zone;
@@ -80,48 +78,6 @@ public Record read(JsonReader reader) throws IOException {
     }
   }
 
-  static class DomainNameToIdAdapter extends TypeAdapter<Map<String, String>> {
-
-    @Override
-    public Map<String, String> read(JsonReader reader) throws IOException {
-      Map<String, String> result = new LinkedHashMap<String, String>();
-      reader.beginObject();
-      while (reader.hasNext()) {
-        String nextName = reader.nextName();
-        if ("domains".equals(nextName)) {
-          reader.beginArray();
-          while (reader.hasNext()) {
-            reader.beginObject();
-            String name = null;
-            String id = null;
-            while (reader.hasNext()) {
-              nextName = reader.nextName();
-              if (nextName.equals("name")) {
-                name = reader.nextString();
-              } else if (nextName.equals("id")) {
-                id = reader.nextString();
-              } else {
-                reader.skipValue();
-              }
-            }
-            result.put(name, id);
-            reader.endObject();
-          }
-          reader.endArray();
-        } else {
-          reader.skipValue();
-        }
-      }
-      reader.endObject();
-      return result;
-    }
-
-    @Override
-    public void write(JsonWriter out, Map<String, String> value) throws IOException {
-      throw new UnsupportedOperationException();
-    }
-  }
-
   static class DomainListAdapter extends ListAdapter<Zone> {
 
     @Override
@@ -131,14 +87,18 @@ protected String jsonKey() {
 
     protected Zone build(JsonReader reader) throws IOException {
       String name = null;
+      String id = null;
       while (reader.hasNext()) {
-        if (reader.nextName().equals("name")) {
+        String key = reader.nextName();
+        if (key.equals("name")) {
           name = reader.nextString();
+        } else if (key.equals("id")) {
+          id = reader.nextString();
         } else {
           reader.skipValue();
         }
       }
-      return Zone.create(name);
+      return Zone.create(name, id);
     }
   }
 

diff --git a/designate/src/main/java/denominator/designate/DesignateProvider.java b/designate/src/main/java/denominator/designate/DesignateProvider.java
@@ -23,7 +23,6 @@
 import denominator.config.OnlyBasicResourceRecordSets;
 import denominator.config.WeightedUnsupported;
 import denominator.designate.DesignateAdapters.DomainListAdapter;
-import denominator.designate.DesignateAdapters.DomainNameToIdAdapter;
 import denominator.designate.DesignateAdapters.RecordAdapter;
 import denominator.designate.DesignateAdapters.RecordListAdapter;
 import feign.Feign;
@@ -140,7 +139,6 @@ Feign feign(Logger logger, Logger.Level logLevel) {
                        new KeystoneV2AccessAdapter(),
                        recordAdapter,
                        new DomainListAdapter(),
-                       new DomainNameToIdAdapter(),
                        new RecordListAdapter()))
           )
           .build();