refactor: changed build dependency copy specs config format

src/build-dir.ts

@@ -21,7 +21,10 @@ import {
 import * as Rsync from "rsync"
 import { GARDEN_DIR_NAME } from "./constants"
 import { execRsyncCmd } from "./util"
-import { Module } from "./types/module"
+import {
+  BuildCopySpec,
+  Module,
+} from "./types/module"
 
 // Lazily construct a directory of modules inside which all build steps are performed.
 
@@ -56,11 +59,9 @@ export class BuildDir {
       }
 
       // Sync to the module's top-level dir by default.
-      const destinationDir = depConfig.copyDestination || ""
-
-      return bluebirdMap(depConfig.copy, (relSourcePath) => {
-        const sourcePath = resolve(this.buildDirPath, depConfig.name, relSourcePath)
-        const destinationPath = dirname(resolve(buildPath, destinationDir, relSourcePath)) + sep
+      return bluebirdMap(depConfig.copy, (copy: BuildCopySpec) => {
+        const sourcePath = resolve(this.buildDirPath, depConfig.name, copy.source)
+        const destinationPath = dirname(resolve(buildPath, copy.target, copy.source)) + sep
         return this.sync(sourcePath, destinationPath)
       })
     })

src/types/module.ts

@@ -17,10 +17,21 @@ import { resolveTemplateStrings, TemplateStringContext } from "../template-strin
 import { Memoize } from "typescript-memoize"
 import { TreeVersion } from "../vcs/base"
 
+export interface BuildCopySpec {
+  source: string
+  target: string
+}
+
+// TODO: allow : delimited string (e.g. some.file:some-dir/)
+const copySchema = Joi.object().keys({
+  // TODO: allow array of strings here
+  source: Joi.string().required(),
+  target: Joi.string().default(""),
+})
+
 export interface BuildDependencyConfig {
-  name: string,
-  copy?: string[],
-  copyDestination?: string // TODO: if we stick with this format, make mandatory if copy is provided
+  name: string
+  copy: BuildCopySpec[]
 }
 
 export interface BuildConfig {
@@ -151,8 +162,7 @@ export const baseTestSpecSchema = Joi.object().keys({
 
 export const baseDependencySchema = Joi.object().keys({
   name: joiIdentifier().required(),
-  copy: Joi.array(),
-  copyDestination: Joi.string(),
+  copy: Joi.array().items(copySchema).default(() => [], "[]"),
 })
 
 export const baseModuleSchema = Joi.object().keys({

test/data/test-project-build-products/module-d/garden.yml

@@ -6,10 +6,11 @@ module:
     dependencies:
       - name: module-a
         copy:
-          - a.txt
-        copyDestination: a
+          - source: a.txt
+            target: a
       - name: module-b
         copy:
-          - build/b1.txt
-          - build/build_subdir
-        copyDestination: b
+          - source: build/b1.txt
+            target: b
+          - source: build/build_subdir
+            target: b

test/data/test-project-build-products/module-e/garden.yml

@@ -6,5 +6,5 @@ module:
     dependencies:
       - name: module-d
         copy:
-          - "build/d.txt"
-        copyDestination: d
+          - source: build/d.txt
+            target: d