Merge branch 'finos:main' into architecture-only-validation

finos · Jan 10, 2025 · fcbf1f1 · fcbf1f1
2 parents 593833d + 0826268
commit fcbf1f1
Show file tree

Hide file tree

Showing 164 changed files with 14,289 additions and 17,971 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,14 @@
+cli:
+  - "cli/**"
+shared:
+  - "shared/**"
+docs:
+  - "docs/**"
+calm-hub:
+  - "calm-hub/**"
+calm:
+  - "calm/**"
+config:
+  - "pom.xml"
+  - "**/package.json"
+  - "**/package-lock.json"
diff --git a/.github/maven-cve-ignore-list.xml b/.github/maven-cve-ignore-list.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-</suppressions>
+    <!-- Suppress quarkus-run.jar -->
+    <suppress>
+        <filePath regex="true">.*quarkus-run\.jar</filePath>
+        <cvssBelow>10.0</cvssBelow>
+    </suppress>
+</suppressions>
diff --git a/.github/workflows/build-calm-hub.yml b/.github/workflows/build-calm-hub.yml
@@ -31,7 +31,7 @@ jobs:
 
       # Step 3: Cache Maven Dependencies
       - name: Cache Maven Dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('calm-hub/pom.xml') }}

diff --git a/.github/workflows/cve-scanning-maven.yml b/.github/workflows/cve-scanning-maven.yml
@@ -1,4 +1,4 @@
-name: CVE Scanning for Maven
+name: CVE Scanning for Maven Projects
 
 on:
   workflow_dispatch:
@@ -22,20 +22,24 @@ jobs:
       matrix:
         java-version: [ '21' ]
         module-folder: [
-          'translator'
+          'translator',
+          'calm-hub'
         ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java-version }}
           cache: maven
           distribution: 'adopt'
+
       - name: Build with Maven
-        run: mvn clean install -Dmaven.test.skip=true
+        run: mvn -DskipTests verify
         working-directory: ${{ matrix.module-folder }}
+
       - name: Depcheck
         uses: dependency-check/Dependency-Check_Action@main
         id: Depcheck
@@ -45,15 +49,20 @@ jobs:
           project: '${{ matrix.module-folder }}'
           path: '${{ matrix.module-folder }}'
           format: 'HTML'
-          out: '${{ matrix.module-folder }}-reports' # this is the default, no need to specify unless you wish to override it
+          out: '${{ matrix.module-folder }}-reports'
           args: >
-            --suppression .github/maven-cve-ignore-list.xml
-            --failOnCVSS 5
-            --enableRetired
+              --suppression .github/maven-cve-ignore-list.xml
+              --failOnCVSS 5
+              --enableRetired
+              --exclude "**/package.json"
+              --exclude "**/package-lock.json"
+              --disableNodeAudit
+              --disableYarnAudit
+              --disableRetireJS
 
       - name: Upload Test results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
           name: Depcheck report ${{ github.job }} ${{ matrix.module-folder }}
-          path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
+          path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
diff --git a/.github/workflows/pr-labelling.yml b/.github/workflows/pr-labelling.yml
@@ -0,0 +1,18 @@
+name: PR Labeler
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Label PR based on changes
+      uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/validate-spectral.yml b/.github/workflows/validate-spectral.yml
@@ -37,8 +37,8 @@ jobs:
       - name: Build workspace
         run: npm run build
 
-      - name: Install Spectral-CLI
-        run: npm install @stoplight/spectral-cli
+      - name: Install dependencies for Spectral
+        run: npm install @stoplight/spectral-cli rollup
 
       - name: Run Example Spectral Linting
         run: npx spectral lint --ruleset ./shared/dist/spectral/rules-architecture.js 'calm/samples/api-gateway-architecture(*.json|*.yaml)'

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,10 +1,16 @@
 {
-    "testing.openTesting": "neverOpen",
-    "jest.outputConfig": {
-        "revealOn": "run",
-        "revealWithFocus": "none",
-        "clearOnRun": "none"
-    },
-    "java.compile.nullAnalysis.mode": "automatic",
-    "java.configuration.updateBuildConfiguration": "automatic"
-}
+  "testing.openTesting": "neverOpen",
+  "jest.outputConfig": {
+    "revealOn": "run",
+    "revealWithFocus": "none",
+    "clearOnRun": "none"
+  },
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "java.compile.nullAnalysis.mode": "automatic",
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnPaste": false
+}
diff --git a/README.md b/README.md
@@ -24,12 +24,12 @@ your project.
 
 ## Projects
 
-| Project                                      | Lead Maintainers                                                                                                                                                                                     | Builds                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| -------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Common Architecture Language Model](./calm) | [@rocketstack-matt](https://github.com/rocketstack-matt), [@jpgough-ms](https://github.com/jpgough-ms)                                                                                               | [![Validation of CALM Samples](https://github.com/finos/architecture-as-code/actions/workflows/spectral-validation.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/validate-spectral.yml)                                                                                                                                                                                                   |
-| [Docs](./docs)                               | [@rocketstack-matt](https://github.com/rocketstack-matt)                                                                                                                                             | [![Sync Docs to S3](https://github.com/finos/architecture-as-code/actions/workflows/s3-docs-sync.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/s3-docs-sync.yml) [![Build Docs](https://github.com/finos/architecture-as-code/actions/workflows/build-docs.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-docs.yml) |
-| [CLI](./cli) & [Shared](./shared)                                | [@aidanm3341](https://github.com/aidanm3341), [@lbulanti-ms](https://github.com/lbulanti-ms), [@willosborne](https://github.com/willosborne), [@grahampacker-ms](https://github.com/grahampacker-ms) [@Thels](https://github.com/Thels) | [![Build CLI](https://github.com/finos/architecture-as-code/actions/workflows/build-cli/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-cli.yml) [![Build Shared Module](https://github.com/finos/architecture-as-code/actions/workflows/build-shared.yml/badge.svg?branch=main)](https://github.com/finos/architecture-as-code/actions/workflows/build-shared.yml)                                                                                                                                                                                                                                                   |                                                                                                                                                                                               |
-| [Translators](./translator)                  | [@Budlee](https://github.com/Budlee) [@matthewgardner](https://github.com/matthewgardner) [@jpgough-ms](https://github.com/jpgough-ms)                                                               | [![Build Translator](https://github.com/finos/architecture-as-code/actions/workflows/build-translator.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-translator.yml)                                                                                                                                                                                                                              |
+| Project                                      | Lead Maintainers                                                                                                                                                                                                                        | Builds                                                                                                                                                                                                                                                                                                                                                                                               |
+|----------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Common Architecture Language Model](./calm) | [@rocketstack-matt](https://github.com/rocketstack-matt), [@jpgough-ms](https://github.com/jpgough-ms)                                                                                                                                  | [![Validation of CALM Samples](https://github.com/finos/architecture-as-code/actions/workflows/validate-spectral.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/validate-spectral.yml)    |
+| [Docs](./docs)                               | [@rocketstack-matt](https://github.com/rocketstack-matt)                                                                                                                                                                                | [![Sync Docs to S3](https://github.com/finos/architecture-as-code/actions/workflows/s3-docs-sync.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/s3-docs-sync.yml) [![Build Docs](https://github.com/finos/architecture-as-code/actions/workflows/build-docs.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-docs.yml)         |
+| [CLI](./cli) & [Shared](./shared)            | [@aidanm3341](https://github.com/aidanm3341), [@lbulanti-ms](https://github.com/lbulanti-ms), [@willosborne](https://github.com/willosborne), [@grahampacker-ms](https://github.com/grahampacker-ms) [@Thels](https://github.com/Thels) | [![Build CLI](https://github.com/finos/architecture-as-code/actions/workflows/build-cli.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-cli.yml)|
+| [Translators](./translator)                  | [@Budlee](https://github.com/Budlee) [@matthewgardner](https://github.com/matthewgardner) [@jpgough-ms](https://github.com/jpgough-ms)                                                                                                  | [![Build Translator](https://github.com/finos/architecture-as-code/actions/workflows/build-translator.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-translator.yml)                                                                                                                                                                                          |
 
 ## Getting Involved
 
@@ -67,7 +67,7 @@ There aren't many standards to follow when it comes to Github actions - but some
 - Ensure that any obscure actions are documented so that others can follow and maintain them.
 
 
-## Language Dependencies  
+## Language Dependencies
 
 ### TypeScript Packages
 

diff --git a/calm-hub/.gitignore b/calm-hub/.gitignore
@@ -116,6 +116,9 @@ fabric.properties
 .idea/**/azureSettings.xml
 
 ### Java ###
+# META-INF
+META-INF/
+
 # Compiled class file
 *.class