fix(conftest): ensure policy path is valid POSIX on Windows

garden-io · Mar 30, 2020 · ee12c80 · ee12c80
1 parent 9939014
commit ee12c80
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 34 deletions.
diff --git a/garden-service/package-lock.json b/garden-service/package-lock.json
diff --git a/garden-service/package.json b/garden-service/package.json
@@ -107,6 +107,7 @@
     "recursive-readdir": "^2.2.2",
     "request": "^2.88.2",
     "request-promise": "^4.2.5",
+    "slash": "^3.0.0",
     "source-map-support": "^0.5.16",
     "split": "^1.0.1",
     "split2": "^3.1.1",

diff --git a/garden-service/src/plugins/conftest/conftest-kubernetes.ts b/garden-service/src/plugins/conftest/conftest-kubernetes.ts
@@ -7,6 +7,7 @@
  */
 
 import Bluebird from "bluebird"
+import slash from "slash"
 import { createGardenPlugin } from "../../types/plugin/plugin"
 import { ConftestProvider } from "./conftest"
 import { relative, resolve } from "path"
@@ -65,7 +66,8 @@ export const gardenPlugin = createGardenPlugin({
             ? [".rendered.yaml"]
             : module.include || ["*.yaml", "**/*.yaml", "*.yml", "**/*.yml"]
 
-          const policyPath = relative(module.path, resolve(ctx.projectRoot, provider.config.policyPath))
+          // Make sure the policy path is valid POSIX on Windows
+          const policyPath = slash(relative(module.path, resolve(ctx.projectRoot, provider.config.policyPath)))
 
           return {
             kind: "Module",

diff --git a/garden-service/src/plugins/conftest/conftest.ts b/garden-service/src/plugins/conftest/conftest.ts
@@ -19,6 +19,7 @@ import { baseBuildSpecSchema } from "../../config/module"
 import { matchGlobs, listDirectory } from "../../util/fs"
 import { PluginError } from "../../exceptions"
 import { getModuleTypeUrl, getGitHubUrl, getProviderUrl } from "../../docs/common"
+import slash from "slash"
 
 export interface ConftestProviderConfig extends ProviderConfig {
   policyPath: string
@@ -135,7 +136,8 @@ export const gardenPlugin = createGardenPlugin({
           const provider = ctx.provider as ConftestProvider
 
           const defaultPolicyPath = relative(module.path, resolve(ctx.projectRoot, provider.config.policyPath))
-          const policyPath = resolve(module.path, module.spec.policyPath || defaultPolicyPath)
+          // Make sure the policy path is valid POSIX on Windows
+          const policyPath = slash(resolve(module.path, module.spec.policyPath || defaultPolicyPath))
           const namespace = module.spec.namespace || provider.config.namespace
 
           const buildPath = module.spec.sourceModule