Merge branch 'feat/teamAssessment' of github.com:wurstbrot/DevSecOps-MaturityModel into feat/teamAssessment

Author: ptechofficial

yaml-generation/bib.php

@@ -90,22 +90,6 @@ function elementIsShown($activityName) {
     return isElement( $csvFile, $activityName);
 }
 
-
-$csvFile = 'selectedData.csv';
-
-
-/**
- *
- * @return unknown
- */
-function getCsv() {
-    $csvFile = 'selectedData.csv';
-    $csv= readCSV($csvFile, ",");
-    return $csv;
-}
-
-
-
 /**
  *
  * @param unknown $array

yaml-generation/generateDimensions.bash

@@ -1,11 +1,13 @@
 #!/bin/bash
 
-docker run --rm --interactive --tty   --volume $PWD/:/app   --user $(id -u):$(id -g)   composer install \
-    --ignore-platform-reqs \
-    --no-interaction \
-    --no-plugins \
-    --no-scripts \
-    --prefer-dist
+docker run -e IS_IMPLEMENTED_WHEN_EVIDENCE=true -ti --rm --volume ${PWD}/../:/app wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php'
 
-cd ..
-docker run --rm --volume $PWD/:/app php:apache-buster bash -c 'apt-get update && apt-get -y dist-upgrade && apt-get -y install apt-utils libyaml-dev wget && pecl channel-update pecl.php.net && pecl install yaml && docker-php-ext-enable yaml && cd /app/ && php yaml-generation/generateDimensions.php'
+#docker run --rm --interactive --tty   --volume $PWD/:/app   --user $(id -u):$(id -g)   composer install \
+#    --ignore-platform-reqs \
+#    --no-interaction \
+#    --no-plugins \
+#    --no-scripts \
+#    --prefer-dist
+#
+#cd ..
+#docker run --rm --volume $PWD/:/app php:apache-buster bash -c 'apt-get update && apt-get -y dist-upgrade && apt-get -y install apt-utils libyaml-dev wget && pecl channel-update pecl.php.net && pecl install yaml && docker-php-ext-enable yaml && cd /app/ && php yaml-generation/generateDimensions.php'

yaml-generation/generateDimensions.php

@@ -2,6 +2,18 @@
 
 require_once "functions.php";
 
+$metadata = readYaml("src/assets/YAML/meta.yaml");
+$teams = $metadata["teams"];
+if(sizeof($teams)  == 0) {
+    echo "Warning: No teams defined";
+}
+$teamsImplemented = array();
+foreach($teams as $team) {
+    $teamsImplemented[$team] = false;
+}
+
+
+
 $files = glob("src/assets/YAML/default/*/*.yaml");
 $dimensions=array();
 foreach ($files as $filename) {
@@ -50,9 +62,6 @@
         }
 
         foreach ($elements as $activityName => $activity) {
-            if(array_key_exists("evidence", $activity) && $activity["evidence"] != "" && IS_IMPLEMENTED_WHEN_EVIDENCE) {
-                $dimensionsAggregated[$dimension][$subdimension][$activityName]["isImplemented"] = true;
-            }
             if (!array_key_exists("level", $activity)) {
                 echo "'$activityName' is not complete!";
                 echo "<pre>";
@@ -63,7 +72,25 @@
             if (!array_key_exists("tags", $activity)) {
                 $dimensionsAggregated[$dimension][$subdimension][$activityName]["tags"] = [ "none" ];
             }
-	}
+            if (!array_key_exists("teamsImplemented", $activity)) {
+                $dimensionsAggregated[$dimension][$subdimension][$activityName]["teamsImplemented"] = array();
+            }
+            $evidenceImplemented = array();
+            if(array_key_exists("evidence", $activity) && is_array($activity["evidence"]) && IS_IMPLEMENTED_WHEN_EVIDENCE) {
+                foreach($activity["evidence"] as $team => $evidenceForTeam) {
+                    if(strlen($activity["evidence"][$team]) > 0) {
+                        $evidenceImplemented[$team] = true;
+                    }else {
+                        echo "Warning: '$activityName -> evidence -> $team' has no evidence set but should have";
+                    }
+                }
+            }
+            $dimensionsAggregated[$dimension][$subdimension][$activityName]["teamsImplemented"] = array_merge($teamsImplemented, $dimensionsAggregated[$dimension][$subdimension][$activityName]["teamsImplemented"], $evidenceImplemented);
+            // can be removed in 2024
+            if (array_key_exists("isImplemented", $activity)) {
+                unset($dimensionsAggregated[$dimension][$subdimension][$activityName]["evidence"]);
+            }
+	    }
     }
 }
 foreach ($dimensionsAggregated as $dimension => $subdimensions) {