From 29221be094ec12b928cec69a0c8107969223b55f Mon Sep 17 00:00:00 2001
From: Andy Mills <andy@defenseunicorns.com>
Date: Fri, 14 Jun 2024 14:47:22 +0000
Subject: [PATCH] small updates

---
 .github/actions/setup/action.yaml |  1 +
 .github/workflows/lint.yaml       |  2 --
 oscal.yaml                        |  1 +
 renovate.json                     | 10 ----------
 tasks/lint.yaml                   |  8 +++++++-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
index 54e55d5..65f2ce3 100644
--- a/.github/actions/setup/action.yaml
+++ b/.github/actions/setup/action.yaml
@@ -32,6 +32,7 @@ runs:
     - name: Install Lula
       uses: defenseunicorns/lula-action/setup@095636b7880051e11b05f10a582fdd911526161c
       with:
+        # renovate: datasource=github-tags depName=defenseunicorns/lula versioning=semver-coerced
         version: v0.3.0
 
     - name: Iron Bank Login
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index fbbebcb..96238ce 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -33,8 +33,6 @@ jobs:
           uds run lint:deps --no-progress
 
       - name: Lint the repository
-        env:
-          OSCALFILES: ./oscal.yaml
         run: |
           uds run lint:yaml --no-progress
           uds run lint:oscal --no-progress
diff --git a/oscal.yaml b/oscal.yaml
index d9773d4..62f5347 100644
--- a/oscal.yaml
+++ b/oscal.yaml
@@ -30,6 +30,7 @@ component-definition:
           source: https://raw.githubusercontent.com/GSA/fedramp-automation/93ca0e20ff5e54fc04140613476fba80f08e3c7d/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.json
           description: Validate generic security requirements
           implemented-requirements:
+            # TODO: (@WSTARR) - make this more relevant once this podinfo package is integrated further with UDS Core (i.e. authservice)
             - uuid: 7faf6742-a23d-41c1-9ba7-2072494aedc2
               control-id: ac-2.3
               description: >-
diff --git a/renovate.json b/renovate.json
index ff7659b..21eda47 100644
--- a/renovate.json
+++ b/renovate.json
@@ -40,16 +40,6 @@
       "matchStrings": ["- Lula: (?<currentValue>.*)"],
       "datasourceTemplate": "github-tags",
       "extractVersionTemplate": "^v(?<version>.*)$"
-    },
-    {
-      "fileMatch": [".github/actions/setup/action\\.yaml"],
-      "matchStrings": [
-        "uses: defenseunicorns/lula-action/setup@(?<currentValue>[a-f0-9]{40})",
-        "version: v(?<currentValue>\\d+\\.\\d+\\.\\d+)"
-      ],
-      "depNameTemplate": "defenseunicorns/lula",
-      "datasourceTemplate": "github-tags",
-      "extractVersionTemplate": "^v(?<version>.*)$"
     }
   ],
   "packageRules": [
diff --git a/tasks/lint.yaml b/tasks/lint.yaml
index 0390584..339970c 100644
--- a/tasks/lint.yaml
+++ b/tasks/lint.yaml
@@ -1,3 +1,7 @@
+variables:
+  - name: OSCALFILES
+    default: ./oscal.yaml
+
 tasks:
   - name: deps
     description: Install linting tool dependencies
@@ -16,4 +20,6 @@ tasks:
     description: Run linting checks on OSCAL
     actions:
       - description: Lint OSCAL files
-        cmd: lula tools lint -f $OSCALFILES
+        cmd: lula tools lint -f ${OSCALFILES}
+        setVariables:
+          - name: OSCALFILES