Skip to content

Commit 3cc3a36

Browse files
LeighFinegoldLeighFinegold
authored
Merge pull request #2101 from finos/main
Merge main into release-1.2-revised
2 parents 1ffab96 + 442872e commit 3cc3a36

File tree

15 files changed

+8556
-16400
lines changed

15 files changed

+8556
-16400
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"image": "mcr.microsoft.com/devcontainers/universal:3",
33
"features": {
4+
"ghcr.io/devcontainers/features/node:1": {
5+
"version": "lts",
6+
"nodeGypDependencies": true
7+
},
48
"ghcr.io/devcontainers/features/java:1": {
59
"version": "21",
610
"installMaven": true,
@@ -10,7 +14,7 @@
1014
"containerEnv": {
1115
"JAVA_HOME": "/usr/local/sdkman/candidates/java/current"
1216
},
13-
"postCreateCommand": "echo 'Container setup completed'",
17+
"postCreateCommand": "npm install",
1418
"hostRequirements": {
1519
"cpus": 4,
1620
"memory": "16gb"

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
* @finos/architecture-as-code-maintainers
22

3-
/calm/ @finos/calm-schema-governance
3+
/calm/ @finos/calm-schema-governance @markscott-ms
44

5-
/calm-hub/ @jpgough-ms @rocketstack-matt @grahampacker-ms @Thels
5+
/calm-hub/ @jpgough-ms @rocketstack-matt @grahampacker-ms @Thels @markscott-ms
66

77
/cli/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms @rocketstack-matt @Thels @LeighFinegold @markscott-ms
88

9-
/calm-visualizer/ @oliviajanejohns @aidanm3341 @jpgough-ms @rocketstack-matt
10-
119
/shared/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms @rocketstack-matt @Thels @LeighFinegold @markscott-ms
1210

1311
# Ownership for dependency-related files at the root level

‎.github/workflows/build-calm-hub-coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
# Step 3: Cache Maven Dependencies
3434
- name: Cache Maven Dependencies
35-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
35+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
3636
with:
3737
path: ~/.m2
3838
key: ${{ runner.os }}-m2-${{ hashFiles('calm-hub/pom.xml') }}

‎.github/workflows/build-calm-hub.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
# Step 3: Cache Maven Dependencies
3434
- name: Cache Maven Dependencies
35-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
35+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
3636
with:
3737
path: ~/.m2
3838
key: ${{ runner.os }}-m2-${{ hashFiles('calm-hub/pom.xml') }}

‎.github/workflows/docker-publish-calm-hub.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
# Step 3: Cache Maven Dependencies
3333
- name: Cache Maven Dependencies
34-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
34+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
3535
with:
3636
path: ~/.m2
3737
key: ${{ runner.os }}-m2-${{ hashFiles('calm-hub/pom.xml') }}
@@ -49,7 +49,7 @@ jobs:
4949

5050
# Step 6: Login to Docker Hub
5151
- name: Login to Docker Hub
52-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
52+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
5353
with:
5454
username: ${{ secrets.DOCKER_USERNAME }}
5555
password: ${{ secrets.DOCKER_PASSWORD }}

‎.github/workflows/semgrep-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
2323
container:
24-
image: semgrep/semgrep@sha256:3baabc2ec3fc217903ea716aa21b9faec944879012774312807f68b029666285
24+
image: semgrep/semgrep@sha256:b6a1bae371d313a8bddf0418b3e094e7cda4f1d77afeeecaa6b08c7f400349ff
2525
if: (github.actor != 'dependabot[bot]')
2626
steps:
2727
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ Ready to get started? Read the [CALM quickstart guide](https://calm.finos.org/qu
2727

2828
## Projects
2929

30-
| Project | Lead Maintainers | Builds |
30+
| Project | Maintainers | Builds |
3131
|------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
32-
| [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) |
33-
| [CLI](./cli), [Shared](./shared), [Models](./calm-models) & [Widget Framework](./calm-widgets) | [@aidanm3341](https://github.com/aidanm3341), [@lbulanti-ms](https://github.com/lbulanti-ms), [@willosborne](https://github.com/willosborne), [@Thels](https://github.com/Thels), [@LeighFinegold](https://github.com/LeighFinegold) | [![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) |
32+
| [Common Architecture Language Model](./calm) | [@rocketstack-matt](https://github.com/rocketstack-matt), [@jpgough-ms](https://github.com/jpgough-ms), [@markscott-ms](https://github.com/markscott-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) |
33+
| [CLI](./cli), [Shared](./shared), [Models](./calm-models) & [Widget Framework](./calm-widgets) | [@aidanm3341](https://github.com/aidanm3341), [@lbulanti-ms](https://github.com/lbulanti-ms), [@willosborne](https://github.com/willosborne), [@Thels](https://github.com/Thels), [@LeighFinegold](https://github.com/LeighFinegold), [@markscott-ms](https://github.com/markscott-ms) | [![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) |
3434
| [CALM AI](./calm-ai) | [@rocketstack-matt](https://github.com/rocketstack-matt) | No build, prompt tools only, managed separately to CLI for easier maintenance and broader reuse. |
3535
| [CALM Hub](./calm-hub) | [@jpgough-ms](https://github.com/jpgough-ms), [@grahampacker-ms](https://github.com/grahampacker-ms) | [![Build Calm Hub](https://github.com/finos/architecture-as-code/actions/workflows/build-calm-hub.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-calm-hub.yml) |
3636
| [CALM Hub UI](./calm-hub-ui) | [@oliviajanejohns](https://github.com/oliviajanejohns), [@aidanm3341](https://github.com/aidanm3341), [@aamanrebello](https://github.com/aamanrebello), [@yoofitt96](https://github.com/YoofiTT96) | [![Build CALM Hub UI](https://github.com/finos/architecture-as-code/actions/workflows/build-calm-hub-ui.yml/badge.svg)](https://github.com/finos/architecture-as-code/actions/workflows/build-calm-hub-ui.yml) |
3737
| [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) |
38-
| [CALM VSCode Plugin](./calm-plugins/vscode) | [@LeighFinegold](https://github.com/LeighFinegold), [@rocketstack-matt](https://github.com/rocketstack-matt) | ![Build VS Code Extension](https://github.com/finos/architecture-as-code/workflows/Build%20VS%20Code%20Extension/badge.svg) |
38+
| [CALM VSCode Plugin](./calm-plugins/vscode) | [@LeighFinegold](https://github.com/LeighFinegold), [@rocketstack-matt](https://github.com/rocketstack-matt), [@markscott-ms](https://github.com/markscott-ms) | ![Build VS Code Extension](https://github.com/finos/architecture-as-code/workflows/Build%20VS%20Code%20Extension/badge.svg) |
3939

4040
## Getting Involved
4141

‎advent-of-calm/day-12.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Day 12: Custom Documentation with CALM Widgets
22

33
## Overview
4-
Learn about calm-widgets - a Handlebars-based widget framework for generating custom Markdown documentation from your CALM architecture data, using the VSCode CALM Preview.
4+
Learn about calm-widgets - a Handlebars-based widget framework for generating custom Markdown documentation from your CALM architecture data, using the VSCode CALM Tools extension.
55

66
## Objective and Rationale
77
- **Objective:** Understand how to use calm-widgets to create custom documentation templates
@@ -36,7 +36,7 @@ Review the available widgets in the [calm-widgets README](https://github.com/fin
3636

3737
### 3. Create a Custom Template Using Widgets
3838

39-
The easiest way to use calm-widgets is with the **VSCode CALM Preview**. Create a Markdown file with YAML front matter that specifies your architecture, and the preview will render the widgets live.
39+
The easiest way to use calm-widgets is with the **VSCode CALM Tools extension**. Create a Markdown file with YAML front matter that specifies your architecture, and the preview will render the widgets live.
4040

4141
Create a file called `docs/architecture-summary.md` with the following content:
4242

@@ -54,7 +54,7 @@ architecture: ../architectures/ecommerce-platform.json
5454

5555
**Understanding the Front Matter:**
5656

57-
The YAML front matter (between the `---` markers) tells the VSCode CALM Preview where to find your architecture data:
57+
The YAML front matter (between the `---` markers) tells the VSCode CALM Tools extension where to find your architecture data:
5858

5959
- `architecture:` - Path to your CALM architecture JSON file (relative to the template file)
6060
- `url-to-local-file-mapping:` (optional) - Path to a URL mapping file if your architecture references external schemas
@@ -156,7 +156,7 @@ git tag | grep -q "day-12"
156156

157157
- Start simple with `{{table nodes}}` and add options gradually
158158
- The `block-architecture` widget is powerful - experiment with `focus-flows` and `highlight-nodes`
159-
- Use the VSCode CALM Preview for instant feedback as you build templates
159+
- Use the VSCode CALM Tools extension for instant feedback as you build templates
160160
- Use `{{json-viewer data}}` to debug what data is available in your context
161161

162162
## Next Steps

‎advent-of-calm/day-13.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ architecture: ../architectures/ecommerce-platform.json
9595
Just like Day 12, you can preview this template in VSCode:
9696

9797
1. Open `templates/node-inventory.md` in VSCode
98-
2. Open the CALM Preview (Ctrl+Shift+C / Cmd+Shift+C) to see the rendered output
98+
2. Open the CALM preview pane (Ctrl+Shift+C / Cmd+Shift+C) to see the rendered output
9999

100100
### 6. Create a Relationship Details Template
101101

‎advent-of-calm/day-4.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The CALM VSCode extension gives you:
2222

2323
1. Open VSCode
2424
2. Go to Extensions (Ctrl+Shift+X / Cmd+Shift+X)
25-
3. Search for "CALM Preview & Tools"
25+
3. Search for "CALM Tools"
2626
4. Click **Install**
2727

2828
**Marketplace Link:** https://marketplace.visualstudio.com/items?itemName=FINOS.calm-vscode-plugin
@@ -202,7 +202,7 @@ git tag | grep -q "day-4"
202202
- Make sure you're in a CALM architecture file (has nodes/relationships)
203203
- Try the keyboard shortcut: `Ctrl+Shift+C` / `Cmd+Shift+C`
204204
- Look for the command in the Command Palette (`Ctrl+Shift+P` / `Cmd+Shift+P` , type "CALM")
205-
- If all else fails, you may need to restart the Extensions Host in VSCode (our CALM Preview is still in experimental mode and can be a little temperamental!) - (`Ctrl+Shift+P` / `Cmd+Shift+P` , type "Restart Extension Host")
205+
- If all else fails, you may need to restart the Extensions Host in VSCode (our CALM Tools extension is fairly new and can be a little temperamental!) - (`Ctrl+Shift+P` / `Cmd+Shift+P` , type "Restart Extension Host")
206206

207207
**"Changes aren't appearing in the preview"**
208208
- **Save the file** - preview updates on save, not on every keystroke

0 commit comments

Comments
 (0)