Merge branch 'main' into feat/decorator-storage

harveymmaunders · web-flow · commit 23be1feac63c · 2026-03-13T15:41:42.000Z
diff --git a/calm/draft/2026-03/README.md b/calm/draft/2026-03/README.md
@@ -0,0 +1,21 @@
+# CALM Draft 2026-03
+
+This directory contains draft schemas and specifications for the CALM (Common Architecture Language Model) 1.3 release.
+
+## Deployment Decorator Schema
+
+This draft includes the deployment decorator schema, which provides a standardized way to annotate CALM architectures with deployment-related metadata.
+
+### Related Issues
+
+- **[#1908](https://github.com/finos/architecture-as-code/issues/1908)** - Deployment decorator schema
+- **[#2183](https://github.com/finos/architecture-as-code/issues/2183)** - Update the deployment decorator to include target-type
+
+### Contents
+
+- `meta/` - Core CALM meta-schemas
+- `standards/deployment/` - Deployment decorator standard and examples
+
+## Status
+
+**Draft** - This specification is under active development and subject to change.
diff --git a/calm/draft/2026-03/meta/calm-timeline.json b/calm/draft/2026-03/meta/calm-timeline.json
@@ -1,14 +1,14 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/calm-timeline.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/calm-timeline.json",
   "$vocabulary": {
     "https://json-schema.org/draft/2020-12/vocab/core": true,
     "https://json-schema.org/draft/2020-12/vocab/applicator": true,
     "https://json-schema.org/draft/2020-12/vocab/validation": true,
     "https://json-schema.org/draft/2020-12/vocab/meta-data": true,
     "https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
     "https://json-schema.org/draft/2020-12/vocab/content": true,
-    "https://calm.finos.org/draft/2183/meta/core.json": true
+    "https://calm.finos.org/draft/2026-03/meta/core.json": true
   },
   "$dynamicAnchor": "meta",
   "title": "Common Architecture Language Model (CALM) Timelines Schema",
@@ -17,7 +17,7 @@
       "$ref": "https://json-schema.org/draft/2020-12/schema"
     },
     {
-      "$ref": "https://calm.finos.org/draft/2183/meta/timeline.json"
+      "$ref": "https://calm.finos.org/draft/2026-03/meta/timeline.json"
     }
   ]
 }
diff --git a/calm/draft/2026-03/meta/calm.json b/calm/draft/2026-03/meta/calm.json
@@ -1,14 +1,14 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/calm.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/calm.json",
   "$vocabulary": {
     "https://json-schema.org/draft/2020-12/vocab/core": true,
     "https://json-schema.org/draft/2020-12/vocab/applicator": true,
     "https://json-schema.org/draft/2020-12/vocab/validation": true,
     "https://json-schema.org/draft/2020-12/vocab/meta-data": true,
     "https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
     "https://json-schema.org/draft/2020-12/vocab/content": true,
-    "https://calm.finos.org/draft/2183/meta/core.json": true
+    "https://calm.finos.org/draft/2026-03/meta/core.json": true
   },
   "$dynamicAnchor": "meta",
   "title": "Common Architecture Language Model (CALM) Schema",
@@ -17,7 +17,7 @@
       "$ref": "https://json-schema.org/draft/2020-12/schema"
     },
     {
-      "$ref": "https://calm.finos.org/draft/2183/meta/core.json"
+      "$ref": "https://calm.finos.org/draft/2026-03/meta/core.json"
     }
   ]
 }
diff --git a/calm/draft/2026-03/meta/control-requirement.json b/calm/draft/2026-03/meta/control-requirement.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/control-requirement.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/control-requirement.json",
   "title": "Common Architecture Language Model Control Requirement",
   "description": "Schema for defining control requirements within the Common Architecture Language Model.",
   "type": "object",
diff --git a/calm/draft/2026-03/meta/control.json b/calm/draft/2026-03/meta/control.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/control.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/control.json",
   "title": "Common Architecture Language Model Controls",
   "description": "Controls model requirements for domains. For example, a security domain contains a series of control requirements",
   "defs": {
diff --git a/calm/draft/2026-03/meta/core.json b/calm/draft/2026-03/meta/core.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/core.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/core.json",
   "title": "Common Architecture Language Model (CALM) Vocab",
   "type": "object",
   "properties": {
diff --git a/calm/draft/2026-03/meta/decorators.json b/calm/draft/2026-03/meta/decorators.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://calm.finos.org/draft/2183/meta/decorators.json",
+    "$id": "https://calm.finos.org/draft/2026-03/meta/decorators.json",
     "title": "Common Architecture Language Model Decorators",
     "description": "Decorators attach supplementary information to multiple nodes and relationships simultaneously, enabling cross-cutting concerns like guides, threat models, business context, and deployment information",
     "defs": {
diff --git a/calm/draft/2026-03/meta/evidence.json b/calm/draft/2026-03/meta/evidence.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/evidence.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/evidence.json",
   "title": "Common Architecture Language Model Evidence",
   "description": "Schema for defining evidence for control requirements within the Common Architecture Language Model.",
   "type": "object",
diff --git a/calm/draft/2026-03/meta/flow.json b/calm/draft/2026-03/meta/flow.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/flow.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/flow.json",
   "title": "Business Flow Model",
   "description": "Defines business flows that relate to technical architectures, allowing mapping of flows to technical components and attaching control requirements.",
   "defs": {
diff --git a/calm/draft/2026-03/meta/interface.json b/calm/draft/2026-03/meta/interface.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/interface.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/interface.json",
   "title": "Common Architecture Language Model Interfaces",
   "defs": {
     "interface-definition": {
diff --git a/calm/draft/2026-03/meta/timeline.json b/calm/draft/2026-03/meta/timeline.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/timeline.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/timeline.json",
   "title": "Common Architecture Language Model (CALM) Timelines Vocab",
   "type": "object",
   "required": [
diff --git a/calm/draft/2026-03/meta/units.json b/calm/draft/2026-03/meta/units.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://calm.finos.org/draft/2183/meta/units.json",
+  "$id": "https://calm.finos.org/draft/2026-03/meta/units.json",
   "title": "Common Architecture Language Model Units",
   "defs": {
     "time-unit": {
diff --git a/calm/draft/2026-03/standards/README.md b/calm/draft/2026-03/standards/README.md
@@ -0,0 +1,82 @@
+# FINOS Official CALM Standards
+
+This directory contains the official repository of standardized CALM decorator schemas and other reusable standards published and maintained by FINOS.
+
+## Purpose
+
+Standards in this directory represent validated, approved decorator schemas and cross-cutting architectural standards that organizations can use directly or extend for their specific needs. These standards enable consistent application of supplementary information across CALM architectures without modifying the core architecture definitions.
+
+## Organization
+
+Standards are organized by category to facilitate discovery and reuse:
+
+- **Deployment**: Deployment tracking decorators for various platforms (Kubernetes, AWS, Azure, etc.)
+- **Security**: Security context decorators including threat models, compliance frameworks, and security controls
+- **Business**: Business context decorators such as cost allocation, ownership, and organizational metadata
+- **Operational**: Operational decorators including runbooks, SLAs, incident contacts, and support information
+- **Observability**: Monitoring and observability decorators with dashboard links, alerting rules, and health checks
+- **Guide**: Architectural decision records (ADRs) and design guidance decorators
+
+## Standard Types
+
+Each standard definition includes:
+
+- **Schema definition**: JSON Schema extending the base decorator schema
+- **Required properties**: Mandatory fields for the decorator type
+- **Optional properties**: Additional fields for enhanced context
+- **Validation rules**: Constraints and patterns for data integrity
+- **Documentation**: Usage examples and implementation guidelines
+
+## Decorator Standards
+
+Decorator standards define typed schemas that extend the base decorator schema (`decorators.json#/defs/decorator`). Each decorator standard:
+
+1. Constrains the `type` field to a specific value
+2. Defines the structure of the `data` field
+3. Can be further extended by more specific schemas
+4. Maintains backward compatibility through versioning
+
+## Versioning
+
+All standards in this directory follow semantic versioning to ensure backward compatibility and clear evolution paths.
+
+## Publishing
+
+Standards in this directory are automatically published to the hosted CALM Hub when they are added, modified, or removed. This ensures that the latest approved standards are always available to the community.
+
+## Contributing
+
+To contribute new standards or modify existing ones:
+
+1. Follow the CALM decorator schema specification
+2. Ensure your standard extends the base decorator schema using `allOf`
+3. Provide clear documentation with comprehensive examples
+4. Include test cases demonstrating valid and invalid instances
+5. Submit a pull request with a detailed description of the standard's purpose and use cases
+
+## Usage
+
+Organizations can reference these standards directly in their decorator documents by using the appropriate `$schema` reference.
+
+```json
+{
+  "$schema": "https://calm.finos.org/standards/deployment/deployment.decorator.standard.json",
+  "unique-id": "my-deployment-001",
+  "type": "deployment",
+  "target": ["my-architecture.json"],
+  "applies-to": ["my-service"],
+  "data": {
+    "start-time": "2026-02-23T10:00:00Z",
+    "status": "completed"
+  }
+}
+```
+
+## Standard vs Other CALM Concepts
+
+| Concept | Purpose | Location |
+|---------|---------|----------|
+| **Standard** | Reusable decorator schemas and cross-cutting patterns | `calm/standards/` |
+| **Interface** | Communication protocol definitions | `calm/interfaces/` |
+| **Control** | Compliance and governance requirements | `calm/controls/` |
+| **Schema** | Core CALM meta-schemas | `calm/release/X.Y/meta/` |
diff --git a/calm/draft/2026-03/standards/deployment/README.md b/calm/draft/2026-03/standards/deployment/README.md
@@ -0,0 +1,92 @@
+# Deployment Decorator Standards
+
+This directory contains standardized deployment decorator schemas for tracking deployment information across various platforms and environments.
+
+## Overview
+
+Deployment decorators attach deployment tracking information to architecture elements without modifying the core architecture definition. They enable tracking of deployment status, timing, deployment details links, and platform-specific details across the architecture lifecycle.
+
+## Base Deployment Decorator
+
+The base deployment decorator standard (`deployment.decorator.standard.json`) defines common deployment attributes applicable across all platforms:
+
+- **start-time**: ISO 8601 timestamp of when the deployment started (required)
+- **status**: Current deployment status (pending, in-progress, completed, failed, rolled-back) (required)
+- **target-type**: Type of resources this decorator targets - must be ["architecture"] (required)
+- **end-time**: ISO 8601 timestamp of when the deployment completed or failed
+- **deployment-details**: URI linking to logs, metrics, or observability dashboards
+- **notes**: Free-form notes or comments about the deployment
+
+## Platform-Specific Extensions
+
+Platform-specific deployment decorators extend the base deployment standard and add platform-specific attributes:
+
+- **Kubernetes**: Helm charts, clusters, namespaces (example provided)
+- **AWS**: ECS services, CloudFormation stacks, regions
+- **Azure**: Resource groups, subscriptions, deployment slots
+- **Google Cloud**: Projects, regions, deployment managers
+
+## Usage
+
+### Basic Deployment Decorator
+
+```json
+{
+  "$schema": "https://calm.finos.org/draft/2026-03/standards/deployment/deployment.decorator.standard.json",
+  "unique-id": "api-service-deployment-001",
+  "type": "deployment",
+  "target": ["my-architecture.json"],
+  "target-type": ["architecture"],
+  "applies-to": ["api-service"],
+  "data": {
+    "start-time": "2026-02-23T10:00:00Z",
+    "end-time": "2026-02-23T10:05:00Z",
+    "status": "completed",
+    "deployment-details": "https://grafana.example.com/d/api-service",
+    "notes": "Successful deployment with zero downtime"
+  }
+}
+```
+
+### Kubernetes Deployment Decorator (Example)
+
+```json
+{
+  "$schema": "https://calm.finos.org/draft/2026-03/standards/deployment/kubernetes.decorator.standard.json",
+  "unique-id": "k8s-deployment-001",
+  "type": "deployment",
+  "target": ["my-architecture.json"],
+  "target-type": ["architecture"],
+  "applies-to": ["api-service"],
+  "data": {
+    "start-time": "2026-02-23T10:00:00Z",
+    "end-time": "2026-02-23T10:08:00Z",
+    "status": "completed",
+    "deployment-details": "https://grafana.example.com/d/k8s-prod",
+    "notes": "Rolling update with new features",
+    "kubernetes": {
+      "helm-chart-version": "1.2.3",
+      "cluster": "prod-us-west-01",
+      "namespace": "production"
+    }
+  }
+}
+```
+
+## Standard Inheritance
+
+```
+decorators.json (base decorator)
+  └── deployment.decorator.standard.json (deployment standard)
+        └── Platform-specific extensions (add platform sub-objects in data)
+```
+
+## Contributing
+
+To contribute new platform-specific deployment decorators:
+
+1. Use the base `deployment.decorator.standard.json` standard
+2. Add platform-specific properties in a namespaced sub-object within `data`
+3. Provide comprehensive examples demonstrating the platform-specific fields
+4. Document all required and optional fields
+5. Submit examples to the `examples/` directory
diff --git a/calm/draft/2026-03/standards/deployment/deployment.decorator.standard.json b/calm/draft/2026-03/standards/deployment/deployment.decorator.standard.json
diff --git a/calm/draft/2026-03/standards/deployment/examples/README.md b/calm/draft/2026-03/standards/deployment/examples/README.md
diff --git a/calm/draft/2026-03/standards/deployment/examples/failed-deployment.decorator.json b/calm/draft/2026-03/standards/deployment/examples/failed-deployment.decorator.json
diff --git a/calm/draft/2026-03/standards/deployment/examples/kubernetes-deployment.decorator.json b/calm/draft/2026-03/standards/deployment/examples/kubernetes-deployment.decorator.json
diff --git a/calm/draft/2026-03/standards/deployment/examples/multi-target-deployment.decorator.json b/calm/draft/2026-03/standards/deployment/examples/multi-target-deployment.decorator.json
diff --git a/calm/draft/2026-03/standards/deployment/examples/simple-deployment.decorator.json b/calm/draft/2026-03/standards/deployment/examples/simple-deployment.decorator.json
diff --git a/calm/draft/2026-03/standards/deployment/kubernetes.decorator.standard.json b/calm/draft/2026-03/standards/deployment/kubernetes.decorator.standard.json

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://json-schema.org/draft/2020-12/schema",`
`3`		`- "$id": "https://calm.finos.org/draft/2183/meta/calm-timeline.json",`
	`3`	`+ "$id": "https://calm.finos.org/draft/2026-03/meta/calm-timeline.json",`
`4`	`4`	`"$vocabulary": {`
`5`	`5`	`"https://json-schema.org/draft/2020-12/vocab/core": true,`
`6`	`6`	`"https://json-schema.org/draft/2020-12/vocab/applicator": true,`
`7`	`7`	`"https://json-schema.org/draft/2020-12/vocab/validation": true,`
`8`	`8`	`"https://json-schema.org/draft/2020-12/vocab/meta-data": true,`
`9`	`9`	`"https://json-schema.org/draft/2020-12/vocab/format-annotation": true,`
`10`	`10`	`"https://json-schema.org/draft/2020-12/vocab/content": true,`
`11`		`- "https://calm.finos.org/draft/2183/meta/core.json": true`
	`11`	`+ "https://calm.finos.org/draft/2026-03/meta/core.json": true`
`12`	`12`	`},`
`13`	`13`	`"$dynamicAnchor": "meta",`
`14`	`14`	`"title": "Common Architecture Language Model (CALM) Timelines Schema",`
`@@ -17,7 +17,7 @@`
`17`	`17`	`"$ref": "https://json-schema.org/draft/2020-12/schema"`
`18`	`18`	`},`
`19`	`19`	`{`
`20`		`- "$ref": "https://calm.finos.org/draft/2183/meta/timeline.json"`
	`20`	`+ "$ref": "https://calm.finos.org/draft/2026-03/meta/timeline.json"`
`21`	`21`	`}`
`22`	`22`	`]`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://json-schema.org/draft/2020-12/schema",`
`3`		`- "$id": "https://calm.finos.org/draft/2183/meta/control-requirement.json",`
	`3`	`+ "$id": "https://calm.finos.org/draft/2026-03/meta/control-requirement.json",`
`4`	`4`	`"title": "Common Architecture Language Model Control Requirement",`
`5`	`5`	`"description": "Schema for defining control requirements within the Common Architecture Language Model.",`
`6`	`6`	`"type": "object",`