feat: enhance munge key management API

.editorconfig

@@ -6,7 +6,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-[Makefile]
+[{Makefile,go.mod,go.sum,*.go}]
 indent_style = tab
 indent_size = 4
 

.github/workflows/ci.yaml

@@ -36,9 +36,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install dependencies
-        run: python3 -m pip install tox
+        run: |
+          sudo snap install golangci-lint --classic
+          python3 -m pip install tox
       - name: Run linters
-        run: tox run -e lint
+        run: make lint
 
   unit-test:
     name: Unit tests
@@ -49,7 +51,7 @@ jobs:
       - name: Install dependencies
         run: python3 -m pip install tox
       - name: Run tests
-        run: tox run -e unit
+        run: make unit
 
   integration-test:
     name: Integration tests

Makefile

@@ -17,20 +17,46 @@ FORMAT_YELLOW = \033[0;33m
 FORMAT_BLUE = \033[0;34m
 FORMAT_END = \033[0m
 
+MUNGECTL := $(CURDIR)/src/mungectl
+define INTEGRATION_TESTS
+	integration-configless
+endef
+
+define mungectl
+	@make -f $(MUNGECTL)/Makefile -C $(MUNGECTL) $(1)
+endef
+
+define slurmhelpers
+	@tox run -e $(1)
+endef
+
 ##@ Build
 
 .PHONY: snap
-snap: ## Build Slurm snap package
-	@snapcraft -v pack
+snap: ## Build snap package
+	snapcraft -v pack
+
+##@ Lint
+
+.PHONY: fmt
+fmt: ## Format snap code
+	@$(call mungectl, "fmt")
+	@$(call slurmhelpers, "fmt")
+
+.PHONY:
+lint: ## Lint snap code
+	@$(call mungectl, "lint")
+	@$(call slurmhelpers, "lint")
 
 ##@ Test
 
-define INTEGRATION_TESTS
-	integration-configless
-endef
+.PHONY: unit
+unit: ## Run snap unit tests
+	@$(call mungectl, "unit")
+	@$(call slurmhelpers, "unit")
 
 .PHONY: integration
-integration: $(INTEGRATION_TESTS) ## Run Slurm integration tests with gambol
+integration: $(INTEGRATION_TESTS) ## Run snap integration tests with gambol
 
 .PHONY: check-snap-exists
 check-snap-exists:

pyproject.toml

@@ -17,6 +17,7 @@ name = "slurm-helpers"
 version = "0.1.0"
 
 [tool.setuptools.packages.find]
+where = ["src"]
 include = ["slurmhelpers"]
 
 # Hook configuration for snaphelpers utility.

snap/snapcraft.yaml

@@ -57,6 +57,8 @@ apps:
     command: bin/remunge --socket $SNAP_COMMON/run/munge/munged.socket.2
   mungekey:
     command: sbin/mungekey
+  mungectl:
+    command: bin/mungectl
 
   slurmctld:
     command: sbin/slurmctld.wrapper
@@ -189,6 +191,12 @@ parts:
       - --with-munge-socket=/var/snap/${SNAPCRAFT_PROJECT_NAME}/common/run/munge/munged.socket.2
       - --with-crypto-lib=openssl
 
+  mungectl:
+    source: src/mungectl
+    plugin: go
+    build-snaps:
+      - go/1.22/stable
+
   slurm:
     plugin: nil
     after: [munge, patch]