fix(front50): Remove duplicate spinnaker key (#1662)

* feat(telemetry): code formatting * fix(plugins): removing extra spinnaker key * fix(front50): fix nesting of persistent storage configs Co-authored-by: Cristhian Castaneda <cristhian.castaneda@armory.io>
spinnaker · May 14, 2020 · 03c4d6f · 03c4d6f
1 parent e156622
commit 03c4d6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/...java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/Front50ProfileFactory.java b/...java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/Front50ProfileFactory.java
@@ -28,7 +28,6 @@
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.SpinnakerService.Type;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,10 +64,14 @@ public void setProfile(
       throw new HalException(Problem.Severity.FATAL, "No persistent storage type was configured.");
     }
 
-    Map<String, Object> spinnakerYaml =
-        spinnakerVersionSupportsPlugins(deploymentConfiguration.getVersion())
-            ? getSpinnakerYaml(deploymentConfiguration)
-            : new LinkedHashMap<>();
+    Map<String, Map<String, Object>> spinnakerYaml;
+    if (spinnakerVersionSupportsPlugins(deploymentConfiguration.getVersion())) {
+      spinnakerYaml = getSpinnakerYaml(deploymentConfiguration);
+    } else {
+      spinnakerYaml = new LinkedHashMap<>();
+      spinnakerYaml.put("spinnaker", new LinkedHashMap<>());
+    }
+
     List<String> files = backupRequiredFiles(persistentStorage, deploymentConfiguration.getName());
 
     NodeIterator children = persistentStorage.getChildren();
@@ -96,19 +99,15 @@ public void setProfile(
         persistentStoreMap.put(
             "enabled", persistentStoreType.equals(persistentStorage.getPersistentStoreType()));
 
-        spinnakerYaml.put(persistentStoreType.getId(), persistentStoreMap);
+        spinnakerYaml.get("spinnaker").put(persistentStoreType.getId(), persistentStoreMap);
       }
 
       child = children.getNext();
     }
 
-    Map<String, Object> spinnakerObjectMap = new HashMap<>();
-    spinnakerObjectMap.put("spinnaker", spinnakerYaml);
-
     super.setProfile(profile, deploymentConfiguration, endpoints);
     profile
-        .appendContents(
-            yamlToString(deploymentConfiguration.getName(), profile, spinnakerObjectMap))
+        .appendContents(yamlToString(deploymentConfiguration.getName(), profile, spinnakerYaml))
         .appendContents(profile.getBaseContents())
         .setRequiredFiles(files);
   }

diff --git a/.../java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/SpringProfileFactory.java b/.../java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/SpringProfileFactory.java
@@ -58,8 +58,9 @@ protected void setProfile(
     }
   }
 
-  protected Map<String, Object> getSpinnakerYaml(DeploymentConfiguration deploymentConfiguration) {
-    Map<String, Object> spinnakerYaml = new LinkedHashMap<>();
+  protected Map<String, Map<String, Object>> getSpinnakerYaml(
+      DeploymentConfiguration deploymentConfiguration) {
+    Map<String, Map<String, Object>> spinnakerYaml = new LinkedHashMap<>();
     Map<String, Object> extensibilityYaml = new LinkedHashMap<>();
     Map<String, Object> extensibilityContents =
         deploymentConfiguration.getSpinnaker().getExtensibility().toMap();