fix(cf): Use moniker/frigga utils to build moniker (#3955)

spinnaker · Oct 7, 2020 · c7cc265 · c7cc265
1 parent fe3248e
commit c7cc265
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/...netflix/spinnaker/orca/clouddriver/tasks/providers/cf/CloudFoundryServerGroupCreator.java b/...netflix/spinnaker/orca/clouddriver/tasks/providers/cf/CloudFoundryServerGroupCreator.java
@@ -119,19 +119,25 @@ private Artifact resolveManifestArtifact(StageExecution stage, Object input) {
     return artifact;
   }
 
+  @SuppressWarnings("unchecked")
   private Moniker buildMoniker(Map<String, Object> context) {
-    String app = context.get("application").toString();
-    String stack = (String) context.getOrDefault("stack", "");
-    String detail = (String) context.getOrDefault("freeFormDetails", "");
+    Map<String, String> source = (Map<String, String>) context.get("source");
+    String friggaName = null;
 
-    String cluster = app;
-    if (!stack.isEmpty()) {
-      cluster = cluster + "-" + stack;
+    if (source != null) {
+      String asgName = source.get("asgName");
+      String serverGroupName = source.get("serverGroupName");
+      friggaName = asgName != null ? asgName : serverGroupName;
     }
-    if (!detail.isEmpty()) {
-      cluster = cluster + "-" + detail;
+
+    if (friggaName != null && !friggaName.isEmpty()) {
+      return MonikerHelper.friggaToMoniker(friggaName);
     }
-    return MonikerHelper.friggaToMoniker(cluster);
+
+    String app = context.get("application").toString();
+    String stack = (String) context.getOrDefault("stack", "");
+    String detail = (String) context.getOrDefault("freeFormDetails", "");
+    return Moniker.builder().app(app).stack(stack).detail(detail).build();
   }
 
   @Override