Merge branch 'main' into feat/v4-review-level-1

Author: vbakke

.github/workflows/main.yml

@@ -53,15 +53,21 @@ jobs:
           file: Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: wurstbrot/dsomm-yaml-generation:${{ steps.get-version.outputs.version }},wurstbrot/dsomm-yaml-generation:latest
-      - name: Extract generated.yaml
+          build-args: |
+            DSOMM_VERSION=${{ steps.get-version.outputs.version }}
+            GITHUB_REPOSITORY=${{ github.repository }}
+      - name: Extract generated files from docker image
         run: |
           docker run -d --name=yaml --entrypoint="/bin/sleep" wurstbrot/dsomm-yaml-generation:${{ steps.get-version.outputs.version }} 60 
-          docker cp yaml:/var/www/html/src/assets/YAML/generated/generated.yaml src/assets/YAML/generated/generated.yaml
-      # Commit all changed files back to the repository
-      - uses: planetscale/ghcommit-action@v0.1.6
+          docker cp yaml:/var/www/html/generated/model.yaml generated/model.yaml
+          docker cp yaml:/var/www/html/generated/dependency-tree.md generated/dependency-tree.md
+      - name: Force add ignored file
+        run: git add -f generated/model.yaml generated/dependency-tree.md
+      - name: Commit all changed files back to the repository
+        uses: planetscale/ghcommit-action@v0.1.6
         with:
-          commit_message: "🤖 fmt"
+          commit_message: "🤖 push ${{ steps.get-version.outputs.version }}"
           repo: ${{ github.repository }}
           branch: ${{ github.head_ref || github.ref_name }}
         env:
-          GITHUB_TOKEN: ${{secrets.ACCESS_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.ACCESS_TOKEN}}

.gitignore

@@ -43,5 +43,10 @@ testem.log
 .DS_Store  
 Thumbs.db 
 /yaml-generation/vendor/
-# Generated YAML
+
+
+# Generated
 /src/assets/YAML/generated/generated.yaml
+/generated/model.yaml
+/generated/dependency-tree.md
+url-test-results.txt

CHANGELOG.md

@@ -1,3 +1,27 @@
+# [1.25.0](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.24.0...v1.25.0) (2025-12-15)
+
+
+* feat!: new structure ([2766a0a](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/commit/2766a0ac2ced849735e5d63f351bc85d5137a0af))
+
+
+### BREAKING CHANGES
+
+* generated moved to root with model.yaml instead of generated.yaml
+
+# [1.24.0](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.23.1...v1.24.0) (2025-12-15)
+
+
+* feat!: new structure ([4fc201f](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/commit/4fc201f9e7e6c8210670cad65d37d8b3d82b9c9c))
+
+
+### BREAKING CHANGES
+
+* generated moved to root with model.yaml instead of generated.yaml
+
+### Bug Fixes
+
+* Modify YAML generation to include version placeholder ([37958b5](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/commit/37958b54e20b80b4401980a28b07616c964f35d5))
+
 ## [1.20.1](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.20.0...v1.20.1) (2025-11-24)
 
 

Dockerfile

@@ -1,6 +1,11 @@
 FROM php:apache-bullseye
+
+ARG DSOMM_VERSION=dev
+ARG GITHUB_REPOSITORY=DevSecOpsMaturityModel-data
+
 RUN  apt-get update && apt-get -y install apt-utils libyaml-dev wget unzip && wget -O composer-setup.php https://getcomposer.org/installer && php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 COPY yaml-generation /var/www/html/yaml-generation
+COPY generated /var/www/html/generated
 COPY src /var/www/html/src
 RUN cd /var/www/html/yaml-generation && composer install \
 --ignore-platform-reqs \
@@ -10,8 +15,7 @@ RUN cd /var/www/html/yaml-generation && composer install \
 --prefer-dist
 
 RUN pecl channel-update pecl.php.net && pecl install yaml && docker-php-ext-enable yaml
-RUN curl https://raw.githubusercontent.com/devsecopsmaturitymodel/DevSecOps-MaturityModel/refs/heads/main/src/assets/YAML/meta.yaml -o /var/www/html/src/assets/YAML/meta.yaml
-RUN echo "test" ; cat /var/www/html/src/assets/YAML/meta.yaml 
-RUN cd /var/www/html && php yaml-generation/generateDimensions.php
+RUN cd /var/www/html && GITHUB_REPOSITORY="${GITHUB_REPOSITORY}" php yaml-generation/generateDimensions.php && sed -i "s/__VERSION_PLACEHOLDER__/${DSOMM_VERSION}/g" /var/www/html/generated/model.yaml
 workdir /var/www/html
-CMD php yaml-generation/generateDimensions.php
+CMD php yaml-generation/generateDimensions.ph
+

README.md

@@ -1,6 +1,6 @@
 # OWASP DevSecOps Maturity Model Data
 
-This GitHub project ([DevSecOps-MaturityModel-data](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data)) contains the source for the model itself, used by the DSOMM applciation [DevSecOps-MaturityModel](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel). 
+This GitHub project ([DevSecOps-MaturityModel-data](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data)) contains the source for the DSOMM *model*. The model is used by the DSOMM applciation [DevSecOps-MaturityModel](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel). 
 
 The source files include dimensions, activities, descriptions, measures, and other model data used by the application.
 
@@ -12,7 +12,7 @@ Contributions that improve the DSOMM model are welcome. Please edit the source f
 
 ### Testing
 
-After making changes, generate a new `activities.yaml` and use it in a local DSOMM application to verify there are no technical issues.
+After making changes, generate a new `model.yaml` and start a local DSOMM application to verify there are no technical issues. (See below.)
 
 
 ## Usage
@@ -28,11 +28,7 @@ Depending on your platform use either `generateDimensions.bash` (Linux) or `gene
 
    `cd yaml-generation`
 
-3. Install dependencies:
-
-   `./generateDimensions.bash --install`
-
-4. Generate `activities.yaml`:
+3. Generate `model.yaml`:
 
    `./generateDimensions.bash`
 
@@ -42,14 +38,16 @@ Depending on your platform use either `generateDimensions.bash` (Linux) or `gene
 
 To start a local DSOMM instance on http://localhost:8080, run:
 
-   `./generateDimensions.bash --start-dsomm`
+  - `./generateDimensions.bash --start-dsomm`
+
+  This will down the latest DSOMM docker image and spin it up as a docker container.
 
 
 ### Test referenced URLs
 
 To test all URLs referenced by `implementations.yaml` and save results to `url-test-results.txt`, run:
 
-   `./generateDimensions.bash --test-urls`
+  - `./generateDimensions.bash --test-urls`
 
 
 ### Using Podman instead of Docker

generated/README.md

@@ -0,0 +1 @@
+GitHub Actions will update these generated files.