Fix odp ID for SI-03 (issue#695) (#714)

* Fix odp ID for SI-03 (issue#695) * From `docker-compose` to `docker compose` for #643 More details about GHA runner compatibility with old versus new docker compose commands in this discussion post. https://github.com/orgs/community/discussions/27185 --------- Co-authored-by: A.J. Stein <[email protected]>
GSA · Sep 23, 2024 · 8c539cf · 8c539cf
1 parent 24b6eac
commit 8c539cf
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/src/content/module.mk b/src/content/module.mk
@@ -9,7 +9,7 @@ OSCAL_DIR := vendor/oscal
 CICD_DIR_PATH := $(OSCAL_DIR)/build/ci-cd
 CONTENT_CONFIG_PATH := src/config
 
-OSCAL_DOCKER := docker-compose -f $(OSCAL_DIR)/build/docker-compose.yml -f $(CONTENT_DIR)/docker-compose.yml
+OSCAL_DOCKER := docker compose -f $(OSCAL_DIR)/build/docker-compose.yml -f $(CONTENT_DIR)/docker-compose.yml
 
 init-content:  ## Initialize content build environment (build Docker image)
 	@echo "Building Docker image for OSCAL content generation..."

diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
@@ -2261,7 +2261,7 @@
 				</description>
 			</constraint>
 		</set-parameter>
-		<set-parameter param-id="si-03_odp.05">
+		<set-parameter param-id="si-03_odp.06">
 			<constraint>
 				<description>
 					<p>administrator or defined security personnel near-realtime</p>

diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml
@@ -1239,7 +1239,7 @@
                 </description>
             </constraint>
         </set-parameter>
-        <set-parameter param-id="si-03_odp.05">
+        <set-parameter param-id="si-03_odp.06">
             <constraint>
                 <description>
                     <p>administrator or defined security personnel near-realtime</p>

diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
@@ -1239,7 +1239,7 @@
                 </description>
             </constraint>
         </set-parameter>
-        <set-parameter param-id="si-03_odp.05">
+        <set-parameter param-id="si-03_odp.06">
             <constraint>
                 <description>
                     <p>administrator or defined security personnel near-realtime</p>

diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
@@ -1938,7 +1938,7 @@
 				</description>
 			</constraint>
 		</set-parameter>
-		<set-parameter param-id="si-03_odp.05">
+		<set-parameter param-id="si-03_odp.06">
 			<constraint>
 				<description>
 					<p>administrator or defined security personnel near-realtime</p>

diff --git a/src/examples/java/README.md b/src/examples/java/README.md
@@ -15,26 +15,26 @@ make build-validations
 
 ## Usage
 
-This example uses Maven. You may run directly, or via the provided `docker-compose` configuration.
+This example uses Maven. You may run directly, or via the provided `docker compose` configuration.
 
 ```bash
 mvn --help
 ```
 
 ```bash
-docker-compose run example mvn --help
+docker compose run example mvn --help
 ```
 
 ## Developer notes
 
 To run tests:
 
 ```bash
-docker-compose run example mvn test
+docker compose run example mvn test
 ```
 
 To auto-format code:
 
 ```bash
-docker-compose run example mvn com.coveo:fmt-maven-plugin:format
+docker compose run example mvn com.coveo:fmt-maven-plugin:format
 ```
diff --git a/src/examples/javascript/README.md b/src/examples/javascript/README.md
@@ -23,7 +23,7 @@ make build-validations
 To get a bash prompt within the container, run:
 
 ```bash
-docker-compose run example bash -l
+docker compose run example bash -l
 ```
 
 You may now run and interact with the example code.
@@ -33,11 +33,11 @@ You may now run and interact with the example code.
 To run tests, build the required Schematron XSLT to sef.json files and run the test script:
 
 ```bash
-docker-compose run example npm run ./test.sh
+docker compose run example npm run ./test.sh
 ```
 
 To auto-format code:
 
 ```bash
-docker-compose run example npm format
+docker compose run example npm format
 ```
diff --git a/src/examples/module.mk b/src/examples/module.mk
@@ -3,14 +3,14 @@ test-examples: test-example-java test-example-python test-example-javascript  ##
 test-example-java:  ## Test example Java project
 	@echo "Verifying Java example..."
 	cd src/examples/java && \
-		docker-compose run example mvn test
+		docker compose run example mvn test
 
 test-example-python:  ## Test example Python project
 	@echo "Verifying Python example..."
 	cd src/examples/python && \
-		docker-compose run example pytest
+		docker compose run example pytest
 
 test-example-javascript:  ## Test example Javascript project
 	@echo "Verifying Javascript example..."
 	cd src/examples/javascript && \
-		docker-compose run example ./test.sh
+		docker compose run example ./test.sh
diff --git a/src/examples/python/README.md b/src/examples/python/README.md
@@ -19,7 +19,7 @@ make build-validations
 To get a bash prompt within the container, run:
 
 ```bash
-docker-compose run example bash -l
+docker compose run example bash -l
 ```
 
 You may now run and interact with the example code.
@@ -29,17 +29,17 @@ You may now run and interact with the example code.
 To run tests:
 
 ```bash
-docker-compose run example pytest
+docker compose run example pytest
 ```
 
 To auto-format code:
 
 ```bash
-docker-compose run example black
+docker compose run example black
 ```
 
 To type-check code:
 
 ```bash
-docker-compose run example mypy .
+docker compose run example mypy .
 ```
diff --git a/src/validations/CONTRIBUTING.md b/src/validations/CONTRIBUTING.md
@@ -59,10 +59,10 @@ Using the command with a different version of Saxon HE. *Note that you must down
 ./bin/validate_with_schematron.sh -f test/demo/FedRAMP-SSP-OSCAL-Template.xml -o ~/dev/report -v 10.8
 ```
 
-Alternatively, you can also use `docker-compose` to execute the validation script, like so:
+Alternatively, you can also use `docker compose` to execute the validation script, like so:
 
 ```sh
-docker-compose run \
+docker compose run \
   -w /root/src/validations \
   validator \
   ./bin/validate_with_schematron.sh -f ./test/demo/FedRAMP-SSP-OSCAL-Template.xml
@@ -100,10 +100,10 @@ export TEST_DIR=$(pwd)/report/test
 
 The JUnit XML report will be stored in the path set in the `TEST_DIR` environment variable.
 
-Alternatively, you can also use `docker-compose` to execute the test harness, like so:
+Alternatively, you can also use `docker compose` to execute the test harness, like so:
 
 ```sh
-docker-compose run \
+docker compose run \
   -w /root/src/validations \
   validator \
   /root/vendor/xspec/bin/xspec.sh -s -j ./test/test_all.xspec