Merge branch 'main' into feat/refactor-operator-introduction

community/cloud-resources/cloud-resources.md

@@ -55,7 +55,7 @@ Service users will have their default_project_id set to a specific project and w
 | b97d38bf128b4479981c4dbe2ef70cd5 | p500924-SIG-IAM             | fkr               | SIG IAM and VP08                      | ∞            |
 | 9de7d8dc2d674e52be44904d6b338b0b | p500924-cloudmon            | costelter         | CloudMon Test Project                 | 31.12.2023   |
 | 2c9e0e4ef8d44c36807df50b06b3c81d | p500924-cloudmon-target     | costelter         | Target project for CloudMon tests     | 31.12.2023   |
-| 3501db829014406884990a1016f3e25d | p500924-sig-monitoring1     | fkr               | SIG Monitoring - cloudmon target      | 31.12.2023   |
+| 3501db829014406884990a1016f3e25d | p500924-sig-monitoring1     | fkr               | SIG Monitoring - cloudmon target      | ∞            |
 | 602778bad3d3470cbe58c4f7611e8eb7 | p500924-dnation             | chess-knight      | dNation dev for VP06c                 | ∞            |
 | 91091d4039a6457db27d48d58bb1b4e4 | p500924-jschoone            | jschoone          | KaaS dev and evaluation               | ∞            |
 | 93956190702b4a7d8a8886806d57713f | p500924-metering            | cah-link          | Dev Environment for VP13              | 31.12.2023   |

populateStds.js

@@ -34,10 +34,14 @@ filenames.forEach((filename) => {
         id: filename.substring(0, filename.length - 3),
         adrId: components[1],
         version: components[2],
+        status: {},
     }
-    obj.isStable = obj.stabilized_at !== undefined && obj.stabilized_at <= today
-    obj.isObsolete = obj.obsoleted_at !== undefined && obj.obsoleted_at <= today
-    obj.isEffective = obj.isStable && !obj.isObsolete
+    // now calculate the properties for the columns (plus stable0 as a helper)
+    obj.status.draft = obj.stabilized_at === undefined
+    obj.status.stable0 = !obj.status.draft && obj.stabilized_at <= today
+    obj.status.deprecated = obj.obsoleted_at !== undefined && obj.obsoleted_at < today
+    obj.status.stable = !obj.status.draft && !obj.status.stable0 && !obj.status.deprecated
+    obj.status.effective = obj.status.stable0 && !obj.status.deprecated
     var track = obj.track
     if (track === undefined) return
     if (tracks[track] === undefined) tracks[track] = {}
@@ -100,12 +104,8 @@ ${headerLegend}
     tlines.push('| --------- | ------------ | ----- | ------- | --------- | ----------- |')
     Object.entries(trackEntry[1]).forEach((standardEntry) => {
         var versions = standardEntry[1].versions
-        // unfortunately, some standards are obsolete without being stable
-        var draftVersions = versions.filter((v) => v.stabilized_at === undefined && v.obsoleted_at === undefined)
-        var stableVersions = versions.filter((v) => v.stabilized_at !== undefined && !v.isEffective)
-        var effectiveVersions = versions.filter((v) => v.isEffective)
-        var deprecatedVersions = versions.filter((v) => v.isObsolete)
         var ref = versions[versions.length - 1]
+        var effectiveVersions = versions.filter((v) => v.status.effective)
         if (effectiveVersions.length) {
             ref = effectiveVersions[effectiveVersions.length - 1]
         }
@@ -130,7 +130,9 @@ ${headerLegend}
         slines.push('| Version  | Type  | State   | stabilized | obsoleted |')
         slines.push('| -------- | ----- | ------- | ---------- | --------- |')
         var link = `[scs-${adrId}](/standards/${track.toLowerCase()}/scs-${adrId})`
-        var versionList = `${mkLinkList(draftVersions) || '-'} | ${mkLinkList(stableVersions) || '-'} | ${mkLinkList(effectiveVersions) || '-'} | ${mkLinkList(deprecatedVersions) || '-'}`
+        var versionList = ['draft', 'stable', 'effective', 'deprecated'].map(
+            (column) => mkLinkList(versions.filter((v) => v.status[column])) || '-'
+        ).join(' | ')
         lines.push(`| ${link}  | ${track}  | ${ref.title}  | ${versionList}  |`)
         tlines.push(`| ${link}  | ${ref.title}  | ${versionList}  |`)
         standardEntry[1].versions.forEach((obj) => {