fix(config): Expect TAR profile files to be flat (#472)

spinnaker · May 18, 2017 · 7733b0e · 7733b0e
1 parent f71f0f7
commit 7733b0e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ix/spinnaker/halyard/deploy/spinnaker/v1/profile/RegistryBackedArchiveProfileBuilder.java b/...ix/spinnaker/halyard/deploy/spinnaker/v1/profile/RegistryBackedArchiveProfileBuilder.java
@@ -49,7 +49,7 @@ public class RegistryBackedArchiveProfileBuilder {
 
   public List<Profile> build(DeploymentConfiguration deploymentConfiguration, String baseOutputPath, SpinnakerArtifact artifact, String archiveName) {
     String version = artifactService.getArtifactVersion(deploymentConfiguration.getName(), artifact);
-    String archiveObjectName = ProfileRegistry.profilePath(artifact.getName(), version, archiveName);
+    String archiveObjectName = ProfileRegistry.profilePath(artifact.getName(), version, archiveName + ".tar.gz");
 
     InputStream is;
     try {
@@ -75,8 +75,9 @@ public List<Profile> build(DeploymentConfiguration deploymentConfiguration, Stri
           continue;
         }
 
-        String name = String.join("/", artifact.getName(), profileEntry.getName());
-        String outputPath = Paths.get(baseOutputPath, name).toString();
+        String entryName = profileEntry.getName();
+        String profileName = String.join("/", artifact.getName(), archiveName, entryName);
+        String outputPath = Paths.get(baseOutputPath, archiveName, entryName).toString();
         String contents = IOUtils.toString(tis);
 
         result.add((new ProfileFactory() {
@@ -109,7 +110,7 @@ public SpinnakerArtifact getArtifact() {
           protected String commentPrefix() {
             return null;
           }
-        }).getProfile(name, outputPath, deploymentConfiguration, null));
+        }).getProfile(profileName, outputPath, deploymentConfiguration, null));
 
         profileEntry = tis.getNextEntry();
       }

diff --git a/...src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/RoscoService.java b/...src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/RoscoService.java
@@ -39,7 +39,7 @@
 @Data
 @Component
 abstract public class RoscoService extends SpringService<RoscoService.Rosco> {
-  private static String roscoPackerPath = "/opt/rosco/config/packer";
+  private static String roscoConfigPath = "/opt/rosco/config";
 
   @Autowired
   RoscoProfileFactory roscoProfileFactory;
@@ -71,7 +71,7 @@ public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration
     Profile profile = roscoProfileFactory.getProfile(filename, path, deploymentConfiguration, endpoints);
 
     profiles.add(profile);
-    profiles.addAll(prefixProfileBuilder.build(deploymentConfiguration, roscoPackerPath, getArtifact(), "packer.tar.gz"));
+    profiles.addAll(prefixProfileBuilder.build(deploymentConfiguration, roscoConfigPath, getArtifact(), "packer"));
     return profiles;
   }