|
4 | 4 |
|
5 | 5 | $errorMsg = array(); |
6 | 6 | $implementationReferenceFile = "src/assets/YAML/default/implementations.yaml"; |
7 | | -$metadata = readYaml("src/assets/YAML/meta.yaml"); |
8 | | - |
9 | | -$teams = $metadata["teams"]; |
10 | | -if (sizeof($teams) == 0) { |
11 | | - echo "Warning: No teams defined"; |
12 | | -} |
13 | | -$teamsImplemented = array(); |
14 | | -foreach ($teams as $team) { |
15 | | - $teamsImplemented[$team] = false; |
16 | | -} |
17 | 7 |
|
18 | 8 | $files = glob("src/assets/YAML/default/*/*.yaml"); |
19 | 9 | $dimensions = array(); |
|
67 | 57 |
|
68 | 58 | foreach ($elements as $activityName => $activity) { |
69 | 59 | if (!array_key_exists("level", $activity)) { |
70 | | - array_push($errorMsg,"Missing 'level' attribute in activity: $activityName"); |
| 60 | + array_push($errorMsg,"Missing 'level' attribute in activity: '$activityName'"); |
71 | 61 | } |
72 | 62 |
|
73 | 63 | // echo "$subdimension | $activityName\n"; |
74 | 64 | if (!array_key_exists("uuid", $activity)) { |
75 | | - array_push($errorMsg, "$activityName is missing an uuid in $dimension"); |
| 65 | + array_push($errorMsg, "'$activityName' is missing an uuid in '$dimension'"); |
76 | 66 | } else { |
77 | 67 | $uuid = $dimensionsAggregated[$dimension][$subdimension][$activityName]["uuid"]; |
78 | 68 | $tmp_activityName = getActivityNameByUuid($uuid, $dimensionsAggregated); |
|
89 | 79 | if (!array_key_exists("tags", $activity)) { |
90 | 80 | $dimensionsAggregated[$dimension][$subdimension][$activityName]["tags"] = ["none"]; |
91 | 81 | } |
92 | | - if (!array_key_exists("teamsImplemented", $activity)) { |
93 | | - $dimensionsAggregated[$dimension][$subdimension][$activityName]["teamsImplemented"] = array(); |
94 | | - } |
95 | | - $evidenceImplemented = array(); |
96 | | - if (array_key_exists("teamsEvidence", $activity) && is_array($activity["teamsEvidence"]) && IS_IMPLEMENTED_WHEN_EVIDENCE) { |
97 | | - foreach ($activity["teamsEvidence"] as $team => $evidenceForTeam) { |
98 | | - if(!is_string($activity["teamsEvidence"][$team])) { |
99 | | - echo "teamsEvidence for team $team in $activityName is not a string, ignoring"; |
100 | | - continue; |
101 | | - } |
102 | | - if (strlen($activity["teamsEvidence"][$team]) > 0) { |
103 | | - $evidenceImplemented[$team] = true; |
104 | | - } else { |
105 | | - echo "Warning: '$activityName -> evidence -> $team' has no evidence set but should have"; |
106 | | - } |
107 | | - } |
108 | | - } |
109 | | - $dimensionsAggregated[$dimension][$subdimension][$activityName]["teamsImplemented"] = |
110 | | - array_merge( |
111 | | - $teamsImplemented, |
112 | | - $dimensionsAggregated[$dimension][$subdimension][$activityName]["teamsImplemented"], |
113 | | - $evidenceImplemented |
114 | | - ); |
115 | | - if (!array_key_exists("openCRE", $activity["references"])) { |
116 | | - $dimensionsAggregated[$dimension][$subdimension][$activityName]["references"]["openCRE"] = array(); |
117 | | - $dimensionsAggregated[$dimension][$subdimension][$activityName]["references"]["openCRE"][] = "https://www.opencre.org/rest/v1/standard/DevSecOps+Maturity+Model+(DSOMM)/" . $subdimension . "/" . $dimensionsAggregated[$dimension][$subdimension][$activityName]["uuid"]; |
118 | | - } |
119 | | - // can be removed in 2025 |
120 | 82 | if (array_key_exists("isImplemented", $activity)) { |
121 | 83 | unset($dimensionsAggregated[$dimension][$subdimension][$activityName]["isImplemented"]); |
122 | 84 | } |
123 | 85 | if (array_key_exists("evidence", $activity)) { |
124 | 86 | unset($dimensionsAggregated[$dimension][$subdimension][$activityName]["evidence"]); |
125 | 87 | } |
126 | 88 | if (array_key_exists("dependsOn", $activity)) { |
127 | | - foreach($activity['dependsOn'] as $index => $dependsOn) { |
128 | | - if(!is_string($dependsOn)) { |
129 | | - array_push($errorMsg, "The 'dependsOn' is not a string '" . json_encode($dependsOn) . "' (in $activityName)"); |
| 89 | + foreach($activity['dependsOn'] as $index => $dependsOnName) { |
| 90 | + if(!is_string($dependsOnName)) { |
| 91 | + array_push($errorMsg, "The 'dependsOn' is not a string '" . json_encode($dependsOnName) . "' (in $activityName)"); |
130 | 92 | continue; |
131 | 93 | } |
132 | 94 |
|
133 | | - // Swap uuids with activity name |
| 95 | + // Load dependsOnName and dependsOnUuid, depending on actual content |
134 | 96 | $uuidRegExp = "/(uuid:)?\s*([0-9a-f]{6,}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{6,})/"; |
135 | | - if (preg_match($uuidRegExp, $dependsOn, $matches)) { |
| 97 | + if (preg_match($uuidRegExp, $dependsOnName, $matches)) { |
136 | 98 | $dependsOnUuid = $matches[2]; |
137 | | - $dependsOn = getActivityNameByUuid($dependsOnUuid, $dimensionsAggregated); |
138 | | - if (is_null($dependsOn)) { |
139 | | - array_push($errorMsg,"DependsOn non-existing activity uuid: $dependsOnUuid (in activity: $activityName)"); |
140 | | - } else if ($matches[1] == "") { |
141 | | - echo "WARNING: DependsOn is not prefixed by 'uuid:' for $dependsOnUuid (in activity: $activityName)\n"; |
142 | | - } |
143 | | - |
144 | | - // echo "exchanged $dependsOnUuid with name $dependsOnActivityName\n"; |
145 | | - $dimensionsAggregated[$dimension][$subdimension][$activityName]["dependsOn"][$index] = $dependsOn; |
146 | | - |
| 99 | + $dependsOnName = getActivityNameByUuid($dependsOnUuid, $dimensionsAggregated); |
| 100 | + if (is_null($dependsOnName)) { |
| 101 | + array_push($errorMsg,"DependsOn non-existing activity uuid: $dependsOnUuid (in activity: '$activityName')"); |
| 102 | + } else if ($matches[1] != "") { |
| 103 | + echo "WARNING: DependsOn is prefixed by deprecated 'uuid:' for $dependsOnUuid (in activity: '$activityName'). Use activity name, or the uuid only\n"; |
| 104 | + } |
147 | 105 | } else { |
148 | | - if (is_null(getUuidByActivityName($dependsOn, $dimensionsAggregated))) { |
149 | | - array_push($errorMsg,"DependsOn non-existing activity: '$dependsOn' (in activity: $activityName)"); |
| 106 | + $dependsOnUuid = getUuidByActivityName($dependsOnName, $dimensionsAggregated); |
| 107 | + if (is_null(getUuidByActivityName($dependsOnName, $dimensionsAggregated))) { |
| 108 | + array_push($errorMsg,"DependsOn non-existing activity: '$dependsOnName' (in activity: $activityName)"); |
150 | 109 | } |
151 | 110 | } |
| 111 | + // Trick emit_yaml() to have uuid plus a comment in a string. Removed in post-processing below. |
| 112 | + $dimensionsAggregated[$dimension][$subdimension][$activityName]["dependsOn"][$index] = "{ $dependsOnUuid # $dependsOnName }"; |
| 113 | + |
152 | 114 |
|
153 | 115 | // Build dependency graph |
154 | 116 | if (!array_key_exists($activityName, $activityIndex)) { |
155 | 117 | $activityIndex[$activityName] = count($activityIndex); |
156 | 118 | } |
157 | | - if (!array_key_exists($dependsOn, $activityIndex)) { |
158 | | - $activityIndex[$dependsOn] = count($activityIndex); |
| 119 | + if (!array_key_exists($dependsOnName, $activityIndex)) { |
| 120 | + $activityIndex[$dependsOnName] = count($activityIndex); |
159 | 121 | } |
160 | | - array_push_item_to($dependencies, $activityIndex[$dependsOn], $activityIndex[$activityName]); |
| 122 | + array_push_item_to($dependencies, $activityIndex[$dependsOnName], $activityIndex[$activityName]); |
161 | 123 |
|
162 | 124 | } |
163 | 125 | } |
|
195 | 157 |
|
196 | 158 | // Store generated data |
197 | 159 | $dimensionsString = yaml_emit($dimensionsAggregated); |
| 160 | + |
| 161 | +// Post-process to convert quoted UUID comments to inline comments |
| 162 | +// Pattern: `- '{ uuid #comment }'` becomes: `- uuid #comment` |
| 163 | +$dimensionsString = preg_replace( |
| 164 | + "/^(\s+- )'{\s*([0-9a-f-]+)\s+(#[^'}]*)\s*}'$/m", |
| 165 | + "$1$2 $3", |
| 166 | + $dimensionsString |
| 167 | +); |
| 168 | + |
198 | 169 | $targetGeneratedFile = getcwd() . "/src/assets/YAML/generated/generated.yaml"; |
199 | 170 | echo "\nStoring to $targetGeneratedFile\n"; |
200 | 171 | file_put_contents($targetGeneratedFile, $dimensionsString); |
|
0 commit comments