Merge branch '887-manifest-docker' into 2.x

Author: twoseat

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java

@@ -135,6 +135,19 @@ private static void asBoolean(Map<String, Object> payload, String key, Consumer<
         as(payload, key, Boolean.class::cast, consumer);
     }
 
+    @SuppressWarnings("unchecked")
+    private static void asDocker(Map<String, Object> payload, String key, Consumer<Docker> consumer) {
+        as(payload, key, value -> {
+            Map<String, String> docker = ((Map<String, String>) value);
+
+            return Docker.builder()
+                .image(docker.get("image"))
+                .password(docker.get("password"))
+                .username(docker.get("username"))
+                .build();
+        }, consumer);
+    }
+
     private static void asInteger(Map<String, Object> payload, String key, Consumer<Integer> consumer) {
         as(payload, key, Integer.class::cast, consumer);
     }
@@ -292,6 +305,14 @@ private static void merge(List<Object> first, List<Object> second) {
             });
     }
 
+    private static Function<Path, Object> pathToString() {
+        return path -> Optional.ofNullable(path).map(Path::toString).orElse(null);
+    }
+
+    private static Function<ApplicationHealthCheck, Object> protectApplicationHealthCheck() {
+        return applicationHealthCheck -> Optional.ofNullable(applicationHealthCheck).map(ApplicationHealthCheck::getValue).orElse(null);
+    }
+
     private static void putIfPresent(Map<String, Object> yaml, String key, Object value) {
         putIfPresent(yaml, key, value, Function.identity());
     }
@@ -305,6 +326,7 @@ private static ApplicationManifest.Builder toApplicationManifest(Map<String, Obj
         asString(application, "buildpack", builder::buildpack);
         asString(application, "command", builder::command);
         asMemoryInteger(application, "disk_quota", builder::disk);
+        asDocker(application, "docker", builder::docker);
         asString(application, "domain", builder::domain);
         asListOfString(application, "domains", builder::domain);
         asMapOfStringString(application, "env", builder::environmentVariable);
@@ -343,14 +365,14 @@ private static Map<String, Object> toYaml(ApplicationManifest applicationManifes
         putIfPresent(yaml, "domains", applicationManifest.getDomains());
         putIfPresent(yaml, "env", applicationManifest.getEnvironmentVariables());
         putIfPresent(yaml, "health-check-http-endpoint", applicationManifest.getHealthCheckHttpEndpoint());
-        putIfPresent(yaml, "health-check-type", applicationManifest.getHealthCheckType() != null ? applicationManifest.getHealthCheckType().getValue() : null);
+        putIfPresent(yaml, "health-check-type", applicationManifest.getHealthCheckType(), protectApplicationHealthCheck());
         putIfPresent(yaml, "hosts", applicationManifest.getHosts());
         putIfPresent(yaml, "instances", applicationManifest.getInstances());
         putIfPresent(yaml, "memory", applicationManifest.getMemory());
         putIfPresent(yaml, "name", applicationManifest.getName());
         putIfPresent(yaml, "no-hostname", applicationManifest.getNoHostname());
         putIfPresent(yaml, "no-route", applicationManifest.getNoRoute());
-        putIfPresent(yaml, "path", applicationManifest.getPath() != null ? applicationManifest.getPath().toString() : null);
+        putIfPresent(yaml, "path", applicationManifest.getPath(), pathToString());
         putIfPresent(yaml, "random-route", applicationManifest.getRandomRoute());
         putIfPresent(yaml, "route-path", applicationManifest.getRoutePath());
         putIfPresent(yaml, "routes", applicationManifest.getRoutes(), ApplicationManifestUtils::toRoutesYaml);

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_ApplicationManifest.java

@@ -60,6 +60,14 @@ void check() {
             if (getDocker().getImage() == null && (getDocker().getUsername() != null || getDocker().getPassword() != null)) {
                 throw new IllegalStateException("docker credentials require docker image to be set");
             }
+
+            if (getDocker().getPassword() != null && getDocker().getUsername() == null) {
+                throw new IllegalStateException("Docker password requires username");
+            }
+
+            if (getDocker().getPassword() == null && getDocker().getUsername() != null) {
+                throw new IllegalStateException("Docker username requires password");
+            }
         }
     }
 

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java

@@ -46,6 +46,26 @@ public void anchorsAndReferences() throws IOException {
         assertThat(actual).isEqualTo(expected);
     }
 
+    @Test
+    public void readDocker() throws IOException {
+        List<ApplicationManifest> expected = Collections.singletonList(
+            ApplicationManifest.builder()
+                .name("lima-application-1")
+                .docker(Docker.builder()
+                    .image("lima-docker-image")
+                    .password("lima-docker-password")
+                    .username("lima-docker-username")
+                    .build())
+                .healthCheckHttpEndpoint("lima-health-check-http-endpoint")
+                .healthCheckType(NONE)
+                .noRoute(false)
+                .build());
+
+        List<ApplicationManifest> actual = ApplicationManifestUtils.read(new ClassPathResource("fixtures/manifest-lima.yml").getFile().toPath());
+
+        assertThat(actual).isEqualTo(expected);
+    }
+
     @Test
     public void read() throws IOException {
         List<ApplicationManifest> expected = Arrays.asList(

cloudfoundry-operations/src/test/resources/fixtures/manifest-alpha.yml

@@ -8,8 +8,8 @@ applications:
   health-check-type: none
   instances: -1
   memory: 1M
-  no-route: true
   path: /alpha-path
+  no-route: true
   random-route: true
   routes:
   - route: alpha-route-1

cloudfoundry-operations/src/test/resources/fixtures/manifest-lima.yml

@@ -0,0 +1,10 @@
+---
+applications:
+- name: lima-application-1
+  docker:
+    image: lima-docker-image
+    password: lima-docker-password
+    username: lima-docker-username
+  health-check-http-endpoint: lima-health-check-http-endpoint
+  health-check-type: none
+  no-route: false