Skip to content

Commit

Permalink
Sync automatic updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jpower432 authored and trestle-bot[bot] committed Mar 12, 2024
1 parent 25cb8ba commit 64d086c
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 35 deletions.
22 changes: 11 additions & 11 deletions component-definitions/example/component-definition.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
{
"component-definition": {
"uuid": "231abb61-81ad-4c0e-b2a9-09128de8e67a",
"uuid": "2c886a12-6ffa-41f9-a304-fec473e6a7ec",
"metadata": {
"title": "Component definition for example",
"last-modified": "2023-10-25T21:25:22+00:00",
"last-modified": "2024-03-12T20:06:19+00:00",
"version": "1.0",
"oscal-version": "1.0.4"
},
"components": [
{
"uuid": "5c3e6d1f-8a90-42d4-97c4-9af36d916ae6",
"uuid": "a8556264-7348-43a6-91be-8b9126dcd51f",
"type": "service",
"title": "Example",
"description": "Example Application",
"props": [
{
"name": "Rule_Id",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Test-rule_001",
"remarks": "rule_set_0"
},
{
"name": "Rule_Description",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Ensure all of the services are running these tests",
"remarks": "rule_set_0"
},
{
"name": "Parameter_Id",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "prm_1",
"remarks": "rule_set_0"
},
{
"name": "Parameter_Description",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "prm_1 description",
"remarks": "rule_set_0"
},
{
"name": "Parameter_Value_Alternatives",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "{'default': '5%', '5pc': '5%', '10pc': '10%', '15pc': '15%', '20pc': '20%'}",
"remarks": "rule_set_0"
}
],
"control-implementations": [
{
"uuid": "8f45e213-a818-4d61-80df-2b8563e3641d",
"uuid": "0e040159-9453-455a-8ec4-a88ca0a1f073",
"source": "profiles/fedramp_rev5_high/profile.json",
"description": "FedRAMP REV5 High Baseline",
"set-parameters": [
Expand All @@ -60,13 +60,13 @@
],
"implemented-requirements": [
{
"uuid": "b34fa867-a4a9-44b1-86c5-d3517e8d8d81",
"uuid": "a0d16eea-7a18-49a3-a7ac-ba5e8375a3f1",
"control-id": "ac-1",
"description": "",
"props": [
{
"name": "Rule_Id",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Test-rule_001"
}
]
Expand Down
74 changes: 50 additions & 24 deletions component-definitions/test_comp/component-definition.json
Original file line number Diff line number Diff line change
@@ -1,119 +1,145 @@
{
"component-definition": {
"uuid": "739fcb1f-acec-48d5-971c-62188875fe3b",
"uuid": "1ab73aee-4eef-4f7a-aec9-50a4554dc7be",
"metadata": {
"title": "Component definition for test_comp",
"last-modified": "2024-03-07T22:36:45+00:00",
"last-modified": "2024-03-12T20:06:19+00:00",
"version": "1.0",
"oscal-version": "1.0.4"
},
"components": [
{
"uuid": "c493e246-37a0-44de-90da-320ec3f863ce",
"uuid": "6532d319-9669-4708-805c-a38c59c9afc6",
"type": "service",
"title": "My Comp",
"description": "My testing comp",
"props": [
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-ac-2",
"value": "rule-sc-1",
"remarks": "rule_set_0"
},
{
"name": "Rule_Description",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Rule for ac-2",
"value": "Rule for sc-1",
"remarks": "rule_set_0"
},
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-ac-1",
"value": "rule-ac-2",
"remarks": "rule_set_1"
},
{
"name": "Rule_Description",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Rule for ac-1",
"value": "Rule for ac-2",
"remarks": "rule_set_1"
},
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-ac-4.4",
"value": "rule-ac-1",
"remarks": "rule_set_2"
},
{
"name": "Rule_Description",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Rule for ac-4.4",
"value": "Rule for ac-1",
"remarks": "rule_set_2"
},
{
"name": "Parameter_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "prm_1",
"remarks": "rule_set_2"
},
{
"name": "Parameter_Description",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "prm_1 description",
"remarks": "rule_set_2"
},
{
"name": "Parameter_Value_Alternatives",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "{'default': '5%', '5pc': '5%', '10pc': '10%', '15pc': '15%', '20pc': '20%'}",
"remarks": "rule_set_2"
},
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-sc-1",
"value": "rule-ac-4.4",
"remarks": "rule_set_3"
},
{
"name": "Rule_Description",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "Rule for sc-1",
"value": "Rule for ac-4.4",
"remarks": "rule_set_3"
}
],
"control-implementations": [
{
"uuid": "ac573ce2-6bff-4251-8816-c99294c4fedf",
"uuid": "5352fbc3-4539-47d2-ab3c-04839019f997",
"source": "trestle://profiles/example/profile.json",
"description": "Example",
"set-parameters": [
{
"param-id": "prm_1",
"values": [
"5%"
]
}
],
"implemented-requirements": [
{
"uuid": "1c3726d9-9a44-4416-b2cb-702ab94d82dc",
"control-id": "ac-2",
"uuid": "e70fe341-dc48-4762-87ef-0e794a10b68c",
"control-id": "sc-1",
"description": "",
"props": [
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-ac-2"
"value": "rule-sc-1"
}
]
},
{
"uuid": "a18c86a2-2157-4874-b986-1a03566aa97f",
"control-id": "ac-1",
"uuid": "1f4814b7-a983-4e10-b5e9-f3944088e36a",
"control-id": "ac-2",
"description": "",
"props": [
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-ac-1"
"value": "rule-ac-2"
}
]
},
{
"uuid": "faa6d8ff-e3e3-442d-b09e-be3e493f54e9",
"control-id": "ac-4.4",
"uuid": "5de15c47-59d0-4fc1-99e7-ea5fbeb13b82",
"control-id": "ac-1",
"description": "",
"props": [
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-ac-4.4"
"value": "rule-ac-1"
}
]
},
{
"uuid": "1ddfd3d5-c205-4e5b-82df-2f26e63de906",
"control-id": "sc-1",
"uuid": "c18dcaae-3353-4c33-9049-fda41e1076da",
"control-id": "ac-4.4",
"description": "",
"props": [
{
"name": "Rule_Id",
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal",
"value": "rule-sc-1"
"value": "rule-ac-4.4"
}
]
}
Expand Down

0 comments on commit 64d086c

Please sign in to comment.