Update component/espejote-templates/upgrade-notification.jsonnet

Co-authored-by: Simon Gerber <[email protected]>

Author: haasad

component/espejote-templates/upgrade-notification.jsonnet

@@ -29,13 +29,17 @@ local upgradeWindow = if nextChannelOverlay != null then
 local formatDate(date) =
   local lastChange = std.reverse([t for t in std.objectFields(dst) if t < date])[0];
   local UTCOffset = dst[lastChange];
-  local YMD = std.split(date, 'T')[0];
-  local Y = std.split(YMD, '-')[0];
-  local M = std.split(YMD, '-')[1];
-  local D = std.split(YMD, '-')[2];
-  local hms = std.split(date, 'T')[1];
-  local h = std.toString(std.parseInt(std.split(hms, ':')[0]) + UTCOffset);
-  local m = std.split(hms, ':')[1];
+  local parts = std.split(date, 'T');
+  assert std.length(parts) == 2 : 'Expected RFC-3339 datetime to have exactly one "T"';
+  local YMD = std.split(parts[0], '-');
+  assert std.length(YMD) == 3 : 'Expected RFC-3339 date to have exactly two "-"';
+  local Y = YMD[0];
+  local M = YMD[1];
+  local D = YMD[2];
+  local hms = std.split(parts[1], ':');
+  assert std.length(hms) == 3 : 'Expected RFC-3339 time to have exactly two ":"';
+  local h = std.toString(std.parseInt(hms[0]) + UTCOffset);
+  local m = hms[1];
   '%s.%s.%s %s:%s' % [D, M, Y, h, m];
 
 local replacementValues = {
@@ -69,4 +73,5 @@ local makeConsoleNotification(name, args, repl) =
     ),
   };
 
-if upgradeWindow != null then makeConsoleNotification('upgrade-%s' % replacementValues['$OVERLAY_VERSION'], config.notification, replacementValues)
+#if upgradeWindow != null then makeConsoleNotification('upgrade-%s' % replacementValues['$OVERLAY_VERSION'], config.notification, replacementValues)
+std.reverse(std.sort(std.objectFields(replacementValues), keyF=function(it) std.length(it)))

tests/golden/upgrade-notification/openshift4-console/openshift4-console/31_upgrade_notification.yaml

@@ -68,13 +68,17 @@ spec:
     local formatDate(date) =
       local lastChange = std.reverse([t for t in std.objectFields(dst) if t < date])[0];
       local UTCOffset = dst[lastChange];
-      local YMD = std.split(date, 'T')[0];
-      local Y = std.split(YMD, '-')[0];
-      local M = std.split(YMD, '-')[1];
-      local D = std.split(YMD, '-')[2];
-      local hms = std.split(date, 'T')[1];
-      local h = std.toString(std.parseInt(std.split(hms, ':')[0]) + UTCOffset);
-      local m = std.split(hms, ':')[1];
+      local parts = std.split(date, 'T');
+      assert std.length(parts) == 2 : 'Expected RFC-3339 datetime to have exactly one "T"';
+      local YMD = std.split(parts[0], '-');
+      assert std.length(YMD) == 3 : 'Expected RFC-3339 date to have exactly two "-"';
+      local Y = YMD[0];
+      local M = YMD[1];
+      local D = YMD[2];
+      local hms = std.split(parts[1], ':');
+      assert std.length(hms) == 3 : 'Expected RFC-3339 time to have exactly two ":"';
+      local h = std.toString(std.parseInt(hms[0]) + UTCOffset);
+      local m = hms[1];
       '%s.%s.%s %s:%s' % [D, M, Y, h, m];
 
     local replacementValues = {
@@ -108,7 +112,8 @@ spec:
         ),
       };
 
-    if upgradeWindow != null then makeConsoleNotification('upgrade-%s' % replacementValues['$OVERLAY_VERSION'], config.notification, replacementValues)
+    #if upgradeWindow != null then makeConsoleNotification('upgrade-%s' % replacementValues['$OVERLAY_VERSION'], config.notification, replacementValues)
+    std.reverse(std.sort(std.objectFields(replacementValues), keyF=function(it) std.length(it)))
   triggers:
     - name: clusterversion_appuio
       watchContextResource: