ugly fix for failure with latest docker client on mac

kdwodc · kdwodc · commit 68ff59926b05 · 2018-08-20T15:45:51.000-06:00
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -48,6 +48,12 @@ public class AuthConfig implements Serializable {
     @JsonProperty("identitytoken")
     private String identitytoken;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("stackOrchestrator")
+    private String stackOrchestrator;
+
     public String getUsername() {
         return username;
     }
@@ -123,6 +129,20 @@ public AuthConfig withRegistrytoken(String registrytoken) {
         return this;
     }
 
+    /**
+     * @see #stackOrchestrator
+     */
+    public String getStackOrchestrator() {
+        return stackOrchestrator;
+    }
+
+    /**
+     * @see #stackOrchestrator
+     */
+    public void setStackOrchestrator(String stackOrchestrator) {
+        this.stackOrchestrator = stackOrchestrator;
+    }
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -10,6 +10,7 @@
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
@@ -78,4 +79,18 @@ public void compatibleWithIdentitytoken() throws IOException {
         final AuthConfig authConfig1 = new AuthConfig().withAuth(auth).withIdentityToken(identitytoken);
         assertThat(authConfig1, equalTo(authConfig));
     }
+
+    @Test
+    public void shouldNotFailWithStackOrchestratorInConfig() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_25,
+                "/other/AuthConfig/orchestrators.json",
+                type
+        );
+        assertThat(authConfig, notNullValue());
+        assertThat(authConfig.getAuth(), is(nullValue()));
+        assertThat(authConfig.getStackOrchestrator(), is("kubernetes"));
+    }
+
 }
diff --git a/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json b/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json
@@ -0,0 +1,3 @@
+{
+  "stackOrchestrator" : "kubernetes"
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "stackOrchestrator" : "kubernetes"`
	`3`	`+}`