Fixes #580 - support identityToken based repositories

src/main/java/com/spotify/docker/client/messages/RegistryAuth.java

@@ -77,12 +77,16 @@ public abstract class RegistryAuth {
   @JsonProperty("ServerAddress")
   public abstract String serverAddress();
 
-  @Override
+  @Nullable
+  @JsonProperty("IdentityToken")
+  public abstract String identityToken();
+
   public final String toString() {
     return MoreObjects.toStringHelper(this)
         .add("username", username())
         // don't log the password or email
         .add("serverAddress", serverAddress())
+        .add("identityToken", identityToken())
         .toString();
   }
 
@@ -187,6 +191,9 @@ private static RegistryAuth.Builder parseDockerConfig(final Path configPath, Str
       if (authParams.length == 2) {
         authBuilder.username(authParams[0].trim());
         authBuilder.password(authParams[1].trim());
+      } else if (serverAuth.has("identityToken")) {
+        authBuilder.identityToken(serverAuth.get("identityToken").asText());
+        return authBuilder;
       } else {
         LOG.warn("Failed to parse auth string for {}", serverAddress);
         return authBuilder;
@@ -230,6 +237,8 @@ public abstract static class Builder {
 
     public abstract Builder serverAddress(final String serverAddress);
 
+    public abstract Builder identityToken(final String token);
+
     public abstract RegistryAuth build();
   }
 }

src/test/java/com/spotify/docker/client/messages/RegistryAuthTest.java

@@ -44,12 +44,19 @@ public class RegistryAuthTest {
       .password("sw4gy0lo")
       .email("[email protected]")
       .build();
+
   private static final RegistryAuth MY_AUTH_CONFIG = RegistryAuth.builder()
       .serverAddress("https://narnia.mydock.io/v1/")
       .username("megaman")
       .password("riffraff")
       .email("[email protected]")
       .build();
+
+  private static final RegistryAuth IDENTITY_TOKEN_AUTH_CONFIG = RegistryAuth.builder()
+      .serverAddress("docker.customdomain.com")
+      .identityToken("52ce5fd5-eb60-42bf-931f-5eeec128211a")
+      .build();
+
   private static final RegistryAuth EMPTY_AUTH_CONFIG = RegistryAuth.builder().build();
 
   @Rule
@@ -69,6 +76,13 @@ public void testFromDockerConfig_FullDockerCfg() throws Exception {
     assertThat(registryAuth, equalTo(DOCKER_AUTH_CONFIG));
   }
 
+  @Test
+  public void testFromDockerConfig_IdentityToken() throws Exception {
+    final RegistryAuth authConfig = RegistryAuth.fromDockerConfig(getTestFilePath(
+            "dockerConfig/identityTokenConfig.json")).build();
+    assertThat(authConfig, equalTo(IDENTITY_TOKEN_AUTH_CONFIG));
+  }
+
   @Test
   public void testFromDockerConfig_IncompleteConfig() throws Exception {
     final RegistryAuth registryAuth = RegistryAuth.fromDockerConfig(getTestFilePath(

src/test/resources/dockerConfig/identityTokenConfig.json

@@ -0,0 +1,9 @@
+{
+  "auths": {
+    "docker.customdomain.com": {
+      "auth": "ZG9ja2VybWFuOg==",
+      "email": "[email protected]",
+      "identityToken": "52ce5fd5-eb60-42bf-931f-5eeec128211a"
+    }
+  }
+}