Relative Paths in Manifest

In a previous change relative paths in manifests were lost.  This change
reinstates them.

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

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

@@ -28,7 +28,6 @@
 import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
 import java.util.Collections;
@@ -227,14 +226,14 @@ private static Map<String, Object> deserialize(Path path) {
     private static List<ApplicationManifest> doRead(Path path) {
         Map<String, Object> root = deserialize(path);
 
-        ApplicationManifest template = getTemplate(root);
+        ApplicationManifest template = getTemplate(path, root);
 
         return Optional.ofNullable(root.get("applications"))
             .map(value -> ((List<Map<String, Object>>) value).stream())
             .orElseGet(Stream::empty)
             .map(application -> {
                 String name = getName(application);
-                return toApplicationManifest(application, ApplicationManifest.builder().from(template))
+                return toApplicationManifest(application, ApplicationManifest.builder().from(template), path)
                     .name(name)
                     .build();
             })
@@ -266,8 +265,8 @@ private static Route getRoute(Map<String, Object> raw) {
         return Route.builder().route(route).build();
     }
 
-    private static ApplicationManifest getTemplate(Map<String, Object> root) {
-        return toApplicationManifest(root, ApplicationManifest.builder())
+    private static ApplicationManifest getTemplate(Path path, Map<String, Object> root) {
+        return toApplicationManifest(root, ApplicationManifest.builder(), path)
             .name("template")
             .build();
     }
@@ -323,7 +322,7 @@ private static <T> void putIfPresent(Map<String, Object> yaml, String key, T val
     }
 
     @SuppressWarnings("unchecked")
-    private static ApplicationManifest.Builder toApplicationManifest(Map<String, Object> application, ApplicationManifest.Builder builder) {
+    private static ApplicationManifest.Builder toApplicationManifest(Map<String, Object> application, ApplicationManifest.Builder builder, Path root) {
         asString(application, "buildpack", builder::buildpack);
         asString(application, "command", builder::command);
         asMemoryInteger(application, "disk_quota", builder::disk);
@@ -340,7 +339,7 @@ private static ApplicationManifest.Builder toApplicationManifest(Map<String, Obj
         asString(application, "name", builder::name);
         asBoolean(application, "no-hostname", builder::noHostname);
         asBoolean(application, "no-route", builder::noRoute);
-        asString(application, "path", path -> builder.path(Paths.get(path)));
+        asString(application, "path", path -> builder.path(root.getParent().resolve(path)));
         asBoolean(application, "random-route", builder::randomRoute);
         asList(application, "routes", raw -> getRoute((Map<String, Object>) raw), builder::route);
         asListOfString(application, "services", builder::service);

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

@@ -458,6 +458,21 @@ public void readNoRoute() throws IOException {
         ApplicationManifestUtils.read(new ClassPathResource("fixtures/manifest-golf.yml").getFile().toPath());
     }
 
+    @Test
+    public void relativePath() throws IOException {
+        Path root = new ClassPathResource("fixtures/manifest-mike.yml").getFile().toPath();
+
+        List<ApplicationManifest> expected = Collections.singletonList(
+            ApplicationManifest.builder()
+                .name("alpha-application-1")
+                .path(root.getParent().resolve("alpha-path"))
+                .build());
+
+        List<ApplicationManifest> actual = ApplicationManifestUtils.read(root);
+
+        assertThat(actual).isEqualTo(expected);
+    }
+
     @Test
     public void testDiskQuotaAndMemoryParsing() throws Exception {
         List<ApplicationManifest> expected = Arrays.asList(

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

@@ -0,0 +1,4 @@
+---
+applications:
+- name: alpha-application-1
+  path: alpha-path