feat: add pre-commit check in ci

- add a ci workflow to verify pre-commit passes - fix pre-commit errors/warnings: - missing required_version - missing required_providers - fixed terraform_deprecated_interpolation - removed terraform_unused_declarations
2026-02-28 20:57:16 +11:00
67 changed files with 23 additions and 306 deletions
@@ -1,23 +0,0 @@
-when:
-  - event: push
-    branch: master
-
-steps:
-  - name: apply
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
-    environment:
-      VAULT_AUTH_METHOD: kubernetes
-    commands:
-      - dnf install vault -y
-      - make plan
-      - make apply
-    backend_options:
-      kubernetes:
-        serviceAccountName: terraform-vault
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
@@ -1,21 +0,0 @@
-when:
-  - event: pull_request
-
-steps:
-  - name: plan
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
-    environment:
-      VAULT_AUTH_METHOD: kubernetes
-    commands:
-      - dnf install vault -y
-      - make plan
-    backend_options:
-      kubernetes:
-        serviceAccountName: terraform-vault
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
@@ -3,16 +3,7 @@ when:

 steps:
  - name: pre-commit
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: git.unkin.net/unkin/almalinux9-base:latest
    commands:
+      - dnf install uv opentofu terragrunt tflint -y
      - uvx pre-commit run --all-files
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
@@ -1,19 +1,10 @@
 .PHONY: init plan apply format

-VAULT_AUTH_METHOD ?= approle
-VAULT_K8S_ROLE ?= woodpecker_terraform_vault
-VAULT_K8S_MOUNT ?= auth/k8s/au/syd1
-VAULT_K8S_JWT_PATH ?= /var/run/secrets/kubernetes.io/serviceaccount/token
-
 # Define vault_env function to set up vault environment
 define vault_env
 	@export VAULT_ADDR="https://vault.service.consul:8200" && \
-	if [ "$(VAULT_AUTH_METHOD)" = "kubernetes" ]; then \
-		export VAULT_TOKEN=$$(vault write -field=token $(VAULT_K8S_MOUNT)/login role=$(VAULT_K8S_ROLE) jwt=$$(cat $(VAULT_K8S_JWT_PATH))); \
-	else \
-		export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID); \
-	fi && \
-	export CONSUL_HTTP_TOKEN=$$(vault read -field=token consul_root/au/syd1/creds/terraform-vault)
+	export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
+	export CONSUL_HTTP_TOKEN=$$(vault read -format=json consul_root/au/syd1/creds/terraform-vault | jq '.data.token')
 endef

 init:
@@ -1,9 +0,0 @@
-token_ttl: 120
-token_max_ttl: 120
-bind_secret_id: false
-token_bound_cidrs:
-  - "10.10.12.200/32"
-  - "198.18.25.102/32"
-  - "198.18.26.91/32"
-  - "198.18.27.40/32"
-use_deterministic_role_id: true
@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - default
-bound_service_account_namespaces:
-  - artifactapi
-token_ttl: 600
-token_max_ttl: 600
-audience: vault
@@ -1,6 +0,0 @@
-bound_service_account_names:
-  - default
-bound_service_account_namespaces: ['*']
-token_ttl: 600
-token_max_ttl: 600
-audience: vault
@@ -1,8 +0,0 @@
-bound_service_account_names:
-  - default
-  - forgebot-operator
-bound_service_account_namespaces:
-  - forgebot
-token_ttl: 600
-token_max_ttl: 600
-audience: vault
@@ -1,8 +0,0 @@
-# rpmbuilder is deployed in woodpeckerci
-bound_service_account_names:
-  - default
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local
@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-git
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local
@@ -1,7 +0,0 @@
-bound_service_account_names:
-  - terraform-vault
-bound_service_account_namespaces:
-  - woodpecker
-token_ttl: 600
-token_max_ttl: 600
-audience: https://kubernetes.default.svc.cluster.local
@@ -1,5 +0,0 @@
-consul_roles:
-  - terraform-git
-ttl: 120
-max_ttl: 300
-datacenters: []
@@ -263,11 +263,12 @@ module "consul_secret_backend_role" {

  for_each = var.consul_secret_backend_role

-  name    = each.value.name
-  backend = each.value.backend
-  ttl     = each.value.ttl
-  max_ttl = each.value.max_ttl
-  local   = each.value.local
+  name         = each.value.name
+  backend      = each.value.backend
+  consul_roles = each.value.consul_roles
+  ttl          = each.value.ttl
+  max_ttl      = each.value.max_ttl
+  local        = each.value.local

  depends_on = [module.consul_secret_backend, module.consul_acl_management]
 }
@@ -320,6 +321,7 @@ module "pki_mount_only" {
  path                          = each.key
  description                   = each.value.description
  max_lease_ttl_seconds         = each.value.max_lease_ttl_seconds
+  issuer_ref                    = each.value.issuer_ref
  issuing_certificates          = each.value.issuing_certificates
  crl_distribution_points       = each.value.crl_distribution_points
  ocsp_servers                  = each.value.ocsp_servers
@@ -9,6 +9,12 @@ variable "name" {
 }


+variable "consul_roles" {
+  description = "List of Consul roles to attach to tokens"
+  type        = list(string)
+  default     = []
+}
+

 variable "ttl" {
  description = "TTL for generated tokens"
@@ -13,6 +13,11 @@ variable "max_lease_ttl_seconds" {
  type        = number
 }

+variable "issuer_ref" {
+  description = "Reference to the PKI issuer (default, or issuer ID/name)"
+  type        = string
+  default     = "default"
+}

 variable "issuing_certificates" {
  description = "List of URLs for issuing certificates"
@@ -203,6 +203,7 @@ variable "pki_mount_only" {
  type = map(object({
    description                   = optional(string)
    max_lease_ttl_seconds         = optional(number, 315360000)
+    issuer_ref                    = optional(string, "default")
    issuing_certificates          = optional(list(string), [])
    crl_distribution_points       = optional(list(string), [])
    ocsp_servers                  = optional(list(string), [])
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -21,5 +21,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -15,5 +15,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -14,5 +14,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,11 +0,0 @@
---
-rules:
-  - path: "consul_root/au/syd1/creds/terraform-git"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -15,5 +15,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,16 +0,0 @@
-# Templated access to kv secrets for kubernetes
-#
-# kv/kubernetes/namespace/<namespace>/<service_account>
-# kv/kubernetes/cluster/<cluster>/<namespace>/<service_account>
---
-rules:
-  - path: "kv/data/kubernetes/namespace/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_namespace}}/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_name}}/*"
-    capabilities:
-      - read
-  - path: "kv/data/kubernetes/cluster/au/syd1/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_namespace}}/{{identity.entity.aliases.auth_kubernetes_ac24966b.metadata.service_account_name}}/*"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - default
@@ -1,10 +0,0 @@
-# Allow reading environment variables for artifactapi
---
-rules:
-  - path: "kv/data/service/artifactapi/environment"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - artifactapi
@@ -1,10 +0,0 @@
-# Allow reading environment vars for postgres/artifactapi
---
-rules:
-  - path: "kv/data/service/artifactapi/postgres-password"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - artifactapi
@@ -1,9 +0,0 @@
---
-rules:
-  - path: "kv/data/kubernetes/namespace/forgebot/*"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - forgebot
@@ -1,12 +0,0 @@
-# Allow reading Gitea admin token
---
-rules:
-  - path: "kv/data/service/gitea/gitadmin/tokens/terraform-git"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - rpmbuilder
-  k8s/au/syd1:
-    - rpmbuilder
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - rpmbuilder
-  k8s/au/syd1:
-    - rpmbuilder
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -8,5 +8,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,11 +0,0 @@
---
-rules:
-  - path: "kv/data/service/woodpecker/tokens/gitadmin"
-    capabilities:
-      - read
-
-auth:
-  approle:
-    - terraform_git
-  k8s/au/syd1:
-    - woodpecker_terraform_git
@@ -1,10 +0,0 @@
-# Allow reading woodpecker agent secret for auto joining more agents
---
-rules:
-  - path: "kv/data/service/woodpecker/woodpecker-agent-secret"
-    capabilities:
-      - read
-
-auth:
-  k8s/au/syd1:
-    - woodpecker
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -9,5 +9,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -12,5 +12,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -20,5 +20,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -16,5 +16,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -16,5 +16,3 @@ rules:
 auth:
  approle:
    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault
@@ -1,7 +0,0 @@
-key_prefix "infra/terraform/git/" {
-  policy = "write"
-}
-
-session_prefix "" {
-  policy = "write"
-}
@@ -21,7 +21,6 @@ rules:
      - "logstash.k8s.elastic.co"
      - "elasticsearch.k8s.elastic.co"
      - "kibana.k8s.elastic.co"
-      - "gateway.networking.k8s.io"
    resources:
      - "*"
    verbs:
@@ -21,7 +21,6 @@ rules:
      - "logstash.k8s.elastic.co"
      - "elasticsearch.k8s.elastic.co"
      - "kibana.k8s.elastic.co"
-      - "gateway.networking.k8s.io"
    resources:
      - "*"
    verbs: