Merge pull request #10 from compliance-framework/feature-standard-make

Standardise make and actions

Author: Chris Vermeulen

.github/workflows/build-and-upload.yml

@@ -31,3 +31,4 @@ jobs:
       - name: gooci Upload Latest
         if: "!github.event.release.prerelease"
         run: gooci upload-single dist/bundle.tar.gz ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest
+        

.github/workflows/push.yaml

@@ -0,0 +1,13 @@
+name: Push
+
+on:
+  pull_request:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  test:
+    permissions:
+      contents: read
+    uses: ./.github/workflows/test.yml

.github/workflows/release.yml

@@ -10,4 +10,4 @@ jobs:
     permissions:
       packages: write
       contents: write
-    uses: ./.github/workflows/build-and-upload.yml
+    uses: ./.github/workflows/build-and-upload.yml

.github/workflows/test.yml

@@ -14,10 +14,10 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2
         with:
-          version: latest
+          version: 1.6.0
 
       - name: Run OPA Tests
         run: opa test policies
 
       - name: Run OPA Check
-        run: opa check policies
+        run: opa check policies

Makefile

@@ -9,6 +9,12 @@
 # More info on the awk command:
 # http://linuxcommand.org/lc3_adv_awk.php
 
+# Check if OPA CLI is installed
+OPA := $(shell command -v opa 2> /dev/null)
+ifeq ($(OPA),)
+$(error "opa CLI not found. Please install it: https://www.openpolicyagent.org/docs/latest/cli/")
+endif
+
 ##@ Help
 help: ## Display this concise help, ie only the porcelain target
 	@awk 'BEGIN {FS = ":.*##"; printf "\033[1mUsage\033[0m\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-30s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
@@ -17,8 +23,17 @@ help-all: ## Display all help items, ie including plumbing targets
 	@awk 'BEGIN {FS = ":.*#"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?#/ { printf "  \033[36m%-25s\033[0m %s\n", $$1, $$2 } /^#@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 ##@ Policies
-build: ## Build the OPA bundle
+test: ## Test policy files
+	@OPA test policies
+
+validate: ## Validate policy files
+	@opa check policies
+
+clean: # Cleanup build artifacts
+	@rm -f dist/*
+
+# Bundle the policies into a tarball for OCI registry
+build: clean ## Build the policy bundle
+	@mkdir -p dist/
 	@opa build -b policies -o dist/bundle.tar.gz
 
-test: ## Test the OPA policies
-	@opa test policies