Skip to content

Commit a351da9

Browse files
Merge branch 'main' into docs/calm-arb-mcp-fixes
2 parents faca519 + e4b3335 commit a351da9

12 files changed

Lines changed: 105 additions & 18 deletions

File tree

.github/workflows/build-and-sync-advent.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
working-directory: "advent-of-calm/website"
3131

3232
- name: Configure AWS credentials
33-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
33+
uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59 # v6
3434
with:
3535
aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }}
3636
aws-secret-access-key: ${{ secrets.AWS_S3_SECRET_ACCESS_KEY }}

.github/workflows/s3-docs-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
working-directory: "docs"
3030

3131
- name: Configure AWS credentials
32-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
32+
uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59 # v6
3333
with:
3434
aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }}
3535
aws-secret-access-key: ${{ secrets.AWS_S3_SECRET_ACCESS_KEY }}

.github/workflows/s3-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2525
- name: Configure AWS credentials
26-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
26+
uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59 # v6
2727
with:
2828
aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }}
2929
aws-secret-access-key: ${{ secrets.AWS_S3_SECRET_ACCESS_KEY }}

.github/workflows/s3-video-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Checkout repository
2020
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2121
- name: Configure AWS credentials
22-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
22+
uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59 # v6
2323
with:
2424
aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }}
2525
aws-secret-access-key: ${{ secrets.AWS_S3_SECRET_ACCESS_KEY }}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# calm-suite — Deployment Reconciliation TODO
2+
3+
> **For the agent/owner wiring up calm-suite deployments.**
4+
>
5+
> Context: `calm-suite` (CALM Guard + CALM Studio) was contributed to FINOS and now
6+
> lives in `finos/architecture-as-code`. A separate pass
7+
> (`chore/reconcile-calm-suite-ownership`) corrected **ownership/repository
8+
> pointers** (package metadata, repo links, license links, CI badges, Docusaurus
9+
> `organizationName`/`projectName`) to `finos/architecture-as-code`.
10+
>
11+
> That pass deliberately **left deployment-specific values alone**, because new
12+
> deployment plans are in flight and those values are yours to set. They are
13+
> listed here so they don't get lost. Each still points at OpsFlow's old,
14+
> now-defunct infrastructure.
15+
16+
## Items left untouched (need a deployment decision)
17+
18+
### 1. CALM Guard docs site — Docusaurus deploy URL
19+
**File:** `calm-suite/calm-guard/docs/docusaurus.config.ts` (lines 17–18)
20+
21+
```ts
22+
url: 'https://finos-labs.github.io',
23+
baseUrl: '/dtcch-2026-opsflow-llc/',
24+
```
25+
26+
`organizationName`/`projectName` in the same file were already repointed to
27+
`finos`/`architecture-as-code`. These two URL fields define where the site
28+
actually publishes and were left for the deployment decision (GitHub Pages under
29+
`finos/architecture-as-code`, an S3/`calm.finos.org` sub-path, or elsewhere). Set
30+
them consistently with the corrected org/project.
31+
32+
### 2. CALM Studio VS Code extension — Marketplace publisher
33+
**File:** `calm-suite/calm-studio/packages/vscode-extension/package.json` (line 3)
34+
35+
```json
36+
"publisher": "opsflow",
37+
```
38+
39+
This is the VS Code Marketplace publisher identity — changing it requires an owned
40+
Marketplace publisher account, so it's a publishing decision, not a metadata
41+
rename. For reference, the other FINOS VS Code extension
42+
(`calm-plugins/vscode`) ships under publisher `"FINOS"`.
43+
44+
### 3. CALM Studio web app — hardcoded fallback URL
45+
**Files:**
46+
- `calm-suite/calm-studio/packages/vscode-extension/src/openInStudio.ts` (line 22)
47+
- `calm-suite/calm-studio/packages/vscode-extension/src/test/openInStudio.test.ts` (line 72)
48+
49+
`openInCalmStudio()` hardcodes `https://calmstudio.opsflow.io` as the web fallback
50+
when the desktop app isn't installed (no env-var override today). That deployment
51+
is OpsFlow's. Update the fallback URL — and the matching test assertion — to the
52+
new canonical Studio deployment URL once it exists.
53+
54+
## NOT stale — do NOT change
55+
56+
These reference a real, separate FINOS-Labs project (AIGF reference patterns), not
57+
the old hackathon repo:
58+
- `calm-suite/calm-studio/packages/mcp-server/src/tools/guide.ts:130,259`
59+
- `calm-suite/calm-studio/docs/REQ_fluxnova_aigf_integration.md:27`
60+
61+
→ all point at `finos-labs/ai-reference-architecture-library`, which is correct.
62+
63+
## Intentionally kept (historical attribution — do NOT "fix")
64+
65+
Legitimate provenance/credit, not an ownership claim:
66+
- `calm-suite/calm-guard/README.md:61` — link to the hackathon presentation PDF
67+
- `calm-suite/calm-guard/README.md:463` — "Built for DTCC/FINOS Innovate.DTCC AI Hackathon 2026"
68+
- `calm-suite/calm-guard/docs/docs/intro.md:65` — "built by Team OpsFlow at the DTCC/FINOS Innovate AI Hackathon"
69+
- `calm-suite/calm-studio/docs/CALM_1.2_CONTROLS_SCHEMA.md:436` — ecosystem-layering prose mentioning CalmSentry/OpsFlow

calm-suite/calm-guard/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</p>
1212

1313
<p align="center">
14-
<a href="https://github.com/finos-labs/dtcch-2026-opsflow-llc/actions/workflows/ci.yml"><img src="https://github.com/finos-labs/dtcch-2026-opsflow-llc/actions/workflows/ci.yml/badge.svg" alt="CI" /></a>
15-
<a href="https://github.com/finos-labs/dtcch-2026-opsflow-llc/actions/workflows/semgrep.yml"><img src="https://github.com/finos-labs/dtcch-2026-opsflow-llc/actions/workflows/semgrep.yml/badge.svg" alt="SAST" /></a>
14+
<a href="https://github.com/finos/architecture-as-code/actions/workflows/build-calm-guard.yml"><img src="https://github.com/finos/architecture-as-code/actions/workflows/build-calm-guard.yml/badge.svg" alt="CI" /></a>
15+
<a href="https://github.com/finos/architecture-as-code/actions/workflows/semgrep-ci.yml"><img src="https://github.com/finos/architecture-as-code/actions/workflows/semgrep-ci.yml/badge.svg" alt="SAST" /></a>
1616
<a href="LICENSE"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg" alt="License" /></a>
1717
<img src="https://img.shields.io/badge/TypeScript-strict-blue?logo=typescript&logoColor=white" alt="TypeScript" />
1818
<img src="https://img.shields.io/badge/FINOS-CALM_1.0--1.2-00A3E0?logo=linux-foundation&logoColor=white" alt="FINOS CALM" />

calm-suite/calm-guard/docs/docs/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ This adds `Signed-off-by: Your Name <email@example.com>` to the commit.
130130

131131
## License
132132

133-
CALMGuard is licensed under the [Apache 2.0 License](https://github.com/finos/dtcch-2026-opsflow-llc/blob/main/LICENSE).
133+
CALMGuard is licensed under the [Apache 2.0 License](https://github.com/finos/architecture-as-code/blob/main/LICENSE).
134134

135135
By contributing, you agree that your contributions will be licensed under Apache 2.0.
136136

calm-suite/calm-guard/docs/docusaurus.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ const config: Config = {
1717
url: 'https://finos-labs.github.io',
1818
baseUrl: '/dtcch-2026-opsflow-llc/',
1919

20-
organizationName: 'finos-labs',
21-
projectName: 'dtcch-2026-opsflow-llc',
20+
organizationName: 'finos',
21+
projectName: 'architecture-as-code',
2222

2323
onBrokenLinks: 'warn',
2424
onBrokenMarkdownLinks: 'warn',
@@ -70,7 +70,7 @@ const config: Config = {
7070
label: 'Documentation',
7171
},
7272
{
73-
href: 'https://github.com/finos-labs/dtcch-2026-opsflow-llc',
73+
href: 'https://github.com/finos/architecture-as-code/tree/main/calm-suite/calm-guard',
7474
label: 'GitHub',
7575
position: 'right',
7676
},

calm-suite/calm-guard/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
"description": "CALM-native continuous compliance DevSecOps platform",
66
"repository": {
77
"type": "git",
8-
"url": "https://github.com/finos-labs/dtcch-2026-opsflow-llc.git"
8+
"url": "https://github.com/finos/architecture-as-code.git",
9+
"directory": "calm-suite/calm-guard"
910
},
10-
"homepage": "https://github.com/finos-labs/dtcch-2026-opsflow-llc",
11+
"homepage": "https://github.com/finos/architecture-as-code/tree/main/calm-suite/calm-guard",
1112
"bugs": {
12-
"url": "https://github.com/finos-labs/dtcch-2026-opsflow-llc/issues"
13+
"url": "https://github.com/finos/architecture-as-code/issues"
1314
},
1415
"license": "Apache-2.0",
15-
"author": "OpsFlow LLC",
16+
"author": "FINOS",
1617
"keywords": [
1718
"calm",
1819
"finos",

calm-suite/calm-guard/src/app/api/github/create-pr/route.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function buildInfraPRBody(infra: CloudInfraConfig): string {
114114
return [
115115
'## CALMGuard Cloud Infrastructure',
116116
'',
117-
'Generated by [CALMGuard](https://github.com/finos-labs/dtcch-2026-opsflow-llc) compliance analysis.',
117+
'Generated by [CALMGuard](https://github.com/finos/architecture-as-code/tree/main/calm-suite/calm-guard) compliance analysis.',
118118
'',
119119
'### Summary',
120120
infra.summary,
@@ -165,7 +165,7 @@ function buildPipelinePRBody(
165165
return [
166166
'## CALMGuard Pipeline Artifacts',
167167
'',
168-
'Generated by [CALMGuard](https://github.com/finos-labs/dtcch-2026-opsflow-llc) compliance analysis.',
168+
'Generated by [CALMGuard](https://github.com/finos/architecture-as-code/tree/main/calm-suite/calm-guard) compliance analysis.',
169169
'',
170170
'### Summary',
171171
pipeline.summary,
@@ -420,7 +420,7 @@ export async function POST(req: Request): Promise<Response> {
420420
const remediationPrBody = [
421421
'## CALMGuard Compliance Remediation',
422422
'',
423-
'Generated by [CALMGuard](https://github.com/finos-labs/dtcch-2026-opsflow-llc) compliance analysis.',
423+
'Generated by [CALMGuard](https://github.com/finos/architecture-as-code/tree/main/calm-suite/calm-guard) compliance analysis.',
424424
'',
425425
'### Summary',
426426
summary,

0 commit comments

Comments
 (0)