pin versions (GSA#903)

* pin versions * Update module.mk * version bump * Update .tool-versions Co-authored-by: A.J. Stein <[email protected]> --------- Co-authored-by: A.J. Stein <[email protected]>
aj-stein-gsa · Nov 18, 2024 · be494dd · be494dd
1 parent c6da668
commit be494dd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+oscal-cli 2.3.1
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "inquirer": "^10.1.8",
     "js-yaml": "^4.1.0",
     "jsdom": "^25.0.0",
-    "oscal": "2.0.5",
+    "oscal": "2.0.6",
     "ts-node": "^10.9.2",
     "xml-formatter": "^3.6.3",
     "xml2js": "^0.6.2"

diff --git a/src/content/module.mk b/src/content/module.mk
@@ -1,5 +1,7 @@
 # Variables
-OSCAL_CLI = npx oscal@latest
+OSCAL_VERSION = $(shell jq -r .dependencies.oscal package.json)
+OSCAL_CLI_VERSION = $(shell awk '/^oscal-cli/ {print $$2}' .tool-versions)
+OSCAL_CLI = npx oscal@$(OSCAL_VERSION)
 SRC_DIR = ./src
 DIST_DIR = ./dist
 XML_DIR = $(DIST_DIR)/content/rev5/baselines/xml
@@ -9,7 +11,7 @@ YAML_DIR = $(DIST_DIR)/content/rev5/baselines/yaml
 .PHONY: init-content
 init-content:
 	@npm install
-	$(OSCAL_CLI) use latest
+	$(OSCAL_CLI) use $(OSCAL_CLI_VERSION)
 	$(OSCAL_CLI) server update
 	$(OSCAL_CLI) server start -bg
 # Generate content and perform conversions

diff --git a/src/validations/module.mk b/src/validations/module.mk
@@ -1,5 +1,7 @@
 # Variables
-OSCAL_CLI = npx [email protected]
+OSCAL_VERSION = $(shell jq -r .dependencies.oscal package.json)
+OSCAL_CLI_VERSION = $(shell awk '/^oscal-cli/ {print $$2}' .tool-versions)
+OSCAL_CLI = npx oscal@$(OSCAL_VERSION)
 SRC_DIR = ./src
 DIST_DIR = ./dist
 REV5_BASELINES = ./dist/content/rev5/baselines
@@ -10,7 +12,7 @@ REV5_TEMPLATES = ./dist/content/rev5/templates
 init-validations:
 	@echo "Installing node modules..."
 	npm install
-	$(OSCAL_CLI) use latest
+	$(OSCAL_CLI) use $(OSCAL_CLI_VERSION)
 	$(OSCAL_CLI) server update
 
 # Style lint