Make gpg_secret_backend mount-only; plugin import split out

Plugin catalog registration now lives in its own module + config/plugins (see
the split-out PR), so this module no longer registers the plugin.

- Drop the vault_plugin resource and the sha256/command inputs; the mount now
  references the already-registered plugin type directly.
- Simplify config/gpg_secret_backend/gpg.yaml to just the mount description.

config/config.hcl

@@ -198,13 +198,6 @@ locals {
       })
       if startswith(file_path, "litellm_secret_backend_role/")
     }
-    plugins = {
-      for file_path, content in local.all_configs :
-      trimsuffix(basename(file_path), ".yaml") => merge(content, {
-        name = trimsuffix(basename(file_path), ".yaml")
-      })
-      if startswith(file_path, "plugins/")
-    }
     gpg_secret_backend = {
       for file_path, content in local.all_configs :
       trimsuffix(basename(file_path), ".yaml") => content

config/plugins/vault-plugin-secrets-gpg.yaml

@@ -1,10 +0,0 @@
-# config/plugins/vault-plugin-secrets-gpg.yaml
-# Imports (registers) the gpg secrets plugin in the catalog. Filename = catalog
-# name = mount type. The binary is installed on the OpenBao nodes by Puppet
-# (openbao-plugin-secrets-gpg RPM -> /opt/openbao-plugins/vault-plugin-secrets-gpg).
-#
-# sha256 pins the released v0.1.0 binary; bump it in lockstep with any RPM
-# upgrade or OpenBao will refuse to launch the plugin.
-type: secret
-command: vault-plugin-secrets-gpg
-sha256: "0e92d7408795688badb55789bc1604e8f1dd4d71998656c7f831991fce9a7b20"

environments/au/syd1/terragrunt.hcl

@@ -70,7 +70,6 @@ inputs = {
   pki_mount_only                 = local.config.pki_mount_only
   litellm_secret_backend         = local.config.litellm_secret_backend
   litellm_secret_backend_role    = local.config.litellm_secret_backend_role
-  plugins                        = local.config.plugins
   gpg_secret_backend             = local.config.gpg_secret_backend
   gpg_key                        = local.config.gpg_key
 

modules/vault_cluster/main.tf

@@ -334,18 +334,6 @@ module "litellm_secret_backend_role" {
   depends_on = [module.litellm_secret_backend]
 }
 
-module "plugin" {
-  source = "./modules/plugin"
-
-  for_each = var.plugins
-
-  name           = each.value.name
-  type           = each.value.type
-  command        = each.value.command
-  sha256         = each.value.sha256
-  plugin_version = each.value.version
-}
-
 module "gpg_secret_backend" {
   source = "./modules/gpg_secret_backend"
 
@@ -354,8 +342,6 @@ module "gpg_secret_backend" {
   path        = each.key
   plugin      = each.value.plugin
   description = each.value.description
-
-  depends_on = [module.plugin]
 }
 
 module "gpg_key" {

modules/vault_cluster/modules/plugin/main.tf

@@ -1,12 +0,0 @@
-# Registers ("imports") a plugin binary in the Vault/OpenBao plugin catalog so
-# it can be mounted. The binary must already exist in the server
-# plugin_directory (installed out of band, e.g. by Puppet); `command` is its
-# filename there. The sha256 must match the on-disk binary or the server refuses
-# to launch the plugin.
-resource "vault_plugin" "this" {
-  type    = var.type
-  name    = var.name
-  command = coalesce(var.command, var.name)
-  sha256  = var.sha256
-  version = var.plugin_version
-}

modules/vault_cluster/modules/plugin/terraform.tf

@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.10"
-  required_providers {
-    vault = {
-      source  = "hashicorp/vault"
-      version = "5.6.0"
-    }
-  }
-}

modules/vault_cluster/modules/plugin/variables.tf

@@ -1,27 +0,0 @@
-variable "name" {
-  description = "Name to register the plugin under in the catalog (also the mount type)"
-  type        = string
-}
-
-variable "type" {
-  description = "Plugin type: secret, auth or database"
-  type        = string
-  default     = "secret"
-}
-
-variable "command" {
-  description = "Plugin binary filename relative to the server plugin_directory. Defaults to the plugin name."
-  type        = string
-  default     = null
-}
-
-variable "sha256" {
-  description = "SHA-256 of the installed plugin binary; must match the on-disk binary"
-  type        = string
-}
-
-variable "plugin_version" {
-  description = "Optional plugin version to register the catalog entry under"
-  type        = string
-  default     = null
-}

modules/vault_cluster/variables.tf

@@ -315,18 +315,6 @@ variable "litellm_secret_backend_role" {
   default = {}
 }
 
-variable "plugins" {
-  description = "Map of plugins to import (register) in the catalog, keyed by catalog name"
-  type = map(object({
-    name    = string
-    type    = optional(string, "secret")
-    command = optional(string)
-    sha256  = string
-    version = optional(string)
-  }))
-  default = {}
-}
-
 variable "gpg_secret_backend" {
   description = "Map of GPG/OpenPGP secret engines to mount (path => registered plugin + description). The plugin is registered separately via config/plugins."
   type = map(object({

policies/gpg/admin.yaml

@@ -1,35 +0,0 @@
-# Allow the vault deployer to import the gpg plugin and manage its OpenPGP keys.
-#
-# terraform-vault registers the plugin itself (vault_plugin -> sys/plugins/catalog,
-# a sudo-protected path) and manages keys via the gpgvaultsecret provider, so the
-# deployer needs catalog access on top of the mount access it already has
-# (sys/mounts/*). Without this, apply 403s on the plugin registration and on
-# gpg/keys writes.
----
-rules:
-  # Import / register (and deregister) the gpg plugin in the catalog.
-  - path: "sys/plugins/catalog/secret/vault-plugin-secrets-gpg"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - sudo
-  # Manage keys (create/rotate/config/delete) in the gpg mount.
-  - path: "gpg/keys/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - list
-  - path: "gpg/keys"
-    capabilities:
-      - read
-      - list
-
-auth:
-  approle:
-    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault

policies/rancher/admin.yaml

@@ -1,55 +0,0 @@
-# Allow the vault deployer to import the rancher plugin and manage its engine
-# (config, seeded service accounts, and roles).
-#
-# terraform-vault registers the plugin itself (vault_plugin -> sys/plugins/catalog,
-# a sudo-protected path) and manages the engine via the ranchervaultsecret
-# provider, so the deployer needs catalog access on top of the mount access it
-# already has (sys/mounts/*). Without this, apply 403s on the plugin
-# registration and on rancher/{config,service-accounts,roles} writes.
----
-rules:
-  # Import / register (and deregister) the rancher plugin in the catalog.
-  - path: "sys/plugins/catalog/secret/vault-plugin-secrets-rancher"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - sudo
-  # Engine connection config.
-  - path: "rancher/config"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-  # Seeded, auto-rotated service-account tokens (+ manual rotate).
-  - path: "rancher/service-accounts/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - list
-  - path: "rancher/service-accounts"
-    capabilities:
-      - read
-      - list
-  # Token-minting roles.
-  - path: "rancher/roles/*"
-    capabilities:
-      - create
-      - read
-      - update
-      - delete
-      - list
-  - path: "rancher/roles"
-    capabilities:
-      - read
-      - list
-
-auth:
-  approle:
-    - tf_vault
-  k8s/au/syd1:
-    - woodpecker_terraform_vault