feat(local): omit halconfig dir in local profiles (#932)

spinnaker · May 7, 2018 · c5806c0 · c5806c0
1 parent 4db8515
commit c5806c0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/.../src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/LocalDiskProfileReader.java b/.../src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/LocalDiskProfileReader.java
@@ -106,7 +106,7 @@ public InputStream readArchiveProfile(String artifactName, String version, Strin
   }
 
   private String profilePath(String artifactName, String profileFileName) {
-      return Paths.get(localBomPath, artifactName, HALCONFIG_DIR, profileFileName).toString();
+      return Paths.get(localBomPath, artifactName, profileFileName).toString();
   }
 
   String bomPath(String version) {

diff --git a/...rtifact/halconfig/test-artifact-local.yml → ...les/test-artifact/test-artifact-local.yml b/...rtifact/halconfig/test-artifact-local.yml → ...les/test-artifact/test-artifact-local.yml
diff --git a/...t-artifact/halconfig/test-artifact.tar.gz → ...ofiles/test-artifact/test-artifact.tar.gz b/...t-artifact/halconfig/test-artifact.tar.gz → ...ofiles/test-artifact/test-artifact.tar.gz