Fixes #333 Apply feedback from Matt #338
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/control-example/control-specification.json", | ||
| "title": "Evidence of pre-production review", | ||
| "control-id": "ci-arch-001", | ||
| "name": "Architecture review pre-production", | ||
| "scope-text": "All workloads going to production", | ||
| "scope-rego": "input.metadata.target-deployment.environment == Production", | ||
| "description": "As part of the SDLC requirements, each workload going to production is subject to an architecture review" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/control.json#/defs/evidence", | ||
| "evidence": { | ||
| "unique-id": "pre-prod-review-evidence", | ||
| "evidence-path": "https://evidence.com/12345", | ||
| "control-configuration-uri": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/control-example/pre-prod-review-configuration.json" | ||
| } | ||
| } |
jpgough-ms marked this conversation as resolved.
Show resolved
Hide resolved
jpgough-ms marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,35 @@ | ||
| { | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/control-example/control-specification.json", | ||
| "title": "Example Production Control Specification", | ||
| "type": "object", | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/control-requirement.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "control-id": { | ||
| "const": "ci-arch-001" | ||
| }, | ||
| "name": { | ||
| "const": "Architecture review pre-production" | ||
| }, | ||
| "description": { | ||
| "const": "As part of the SDLC requirements, each workload going to production is subject to an architecture review" | ||
| }, | ||
| "scope-text": { | ||
| "const": "All workloads going to production" | ||
| }, | ||
| "scope-rego": { | ||
| "const": "input.metadata.target-deployment.environment == Production" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "scope-text", | ||
| "scope-rego", | ||
| "control-id", | ||
| "name", | ||
| "description" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| { | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/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", | ||
| "properties": { | ||
| "control-id": { | ||
| "type": "string", | ||
| "description": "The unique identifier of this control, which has the potential to be used for linking evidence" | ||
| }, | ||
| "name": { | ||
| "type": "string", | ||
| "description": "The name of the control requirement that provides contextual meaning within a given domain" | ||
| }, | ||
| "description": { | ||
| "type": "string", | ||
| "description": "A more detailed description of the control and information on what a developer needs to consider" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "control-id", | ||
| "name", | ||
| "description" | ||
| ], | ||
| "examples": [ | ||
| { | ||
| "control-id": "CR-001", | ||
| "name": "Access Control", | ||
| "description": "Ensure that access to sensitive information is restricted." | ||
| } | ||
| ] | ||
| } |
|
There was a problem hiding this comment. We should add a reference to the control.json into the calm.json the same way core.json is referenced otherwise the one-node-wonder doesn't know what a control-requirement is because the schema reference is to calm which currently knows nothing about controls. There was a problem hiding this comment. That's interesting, is this something we've broken with |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/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": { | ||
| "control-detail": { | ||
| "type": "object", | ||
| "properties": { | ||
| "control-requirement": { | ||
| "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/control-requirement.json", | ||
| "description": "The requirement schema that specifies how a control should be defined" | ||
| }, | ||
| "control-config": { | ||
| "$ref": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/meta/control-requirement.json", | ||
| "description": "The configuration of how the control requirement schema is met" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "control-requirement" | ||
| ] | ||
| }, | ||
| "controls": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^[a-zA-Z0-9-]+$": { | ||
| "type": "object", | ||
| "properties": { | ||
| "description": { | ||
| "type": "string", | ||
| "description": "A description of a control and how it applies to a given architecture" | ||
| }, | ||
| "requirements": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "#/$defs/control-detail", | ||
| "description": "The detail of a how a specified control is structured and (if it currently does) is configured to meet the requirement" | ||
| } | ||
| } | ||
| }, | ||
| "required": [ | ||
| "description", | ||
| "requirements" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| { | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "$id": "https://raw.githubusercontent.com/finos/architecture-as-code/main/calm/draft/2024-08/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", | ||
| "properties": { | ||
| "evidence": { | ||
| "type": "object", | ||
| "properties": { | ||
| "unique-id": { | ||
| "type": "string", | ||
| "description": "CALM unique-id for future linking and uniquely defining this evidence" | ||
| }, | ||
| "evidence-paths": { | ||
| "type": "array", | ||
| "description": "Paths to the evidence relating to a specific control", | ||
| "items": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "control-configuration-uri": { | ||
| "type": "string", | ||
| "description": "URI for the control configuration this evidence relates to" | ||
| } | ||
| }, | ||
| "required":[ | ||
| "unique-id", | ||
| "evidence-paths", | ||
| "control-configuration-uri" | ||
| ] | ||
| } | ||
| }, | ||
| "required": [ | ||
| "evidence" | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No pattern ID?