From 479519e6df4ccd79b2fa2745cb324738ad613461 Mon Sep 17 00:00:00 2001
From: Max Bowsher <maxbowsher@gmail.com>
Date: Mon, 28 Aug 2023 14:11:16 +0100
Subject: [PATCH] Fix erroneous OpenAPI operation IDs (#22579)

The recent additions to the transit secret engine have created two new
endpoints which both have the incorrect (and duplicate) operation ID of
just `"update"`.

Amend to unique meaningful values.
---
 builtin/logical/transit/path_certificates.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/builtin/logical/transit/path_certificates.go b/builtin/logical/transit/path_certificates.go
index 7984ffb9da..9868965de3 100644
--- a/builtin/logical/transit/path_certificates.go
+++ b/builtin/logical/transit/path_certificates.go
@@ -21,6 +21,12 @@ import (
 func (b *backend) pathCreateCsr() *framework.Path {
 	return &framework.Path{
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/csr",
+
+		DisplayAttrs: &framework.DisplayAttributes{
+			OperationPrefix: operationPrefixTransit,
+			OperationVerb:   "generate-csr-for-key",
+		},
+
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -42,9 +48,6 @@ will be used as a basis for the CSR with the key in transit. If not set, an empt
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCreateCsrWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "update",
-				},
 			},
 		},
 		HelpSynopsis:    pathCreateCsrHelpSyn,
@@ -57,6 +60,12 @@ func (b *backend) pathImportCertChain() *framework.Path {
 		// NOTE: `set-certificate` or `set_certificate`? Paths seem to use different
 		// case, such as `transit/wrapping_key` and `transit/cache-config`.
 		Pattern: "keys/" + framework.GenericNameRegex("name") + "/set-certificate",
+
+		DisplayAttrs: &framework.DisplayAttributes{
+			OperationPrefix: operationPrefixTransit,
+			OperationVerb:   "set-certificate-for-key",
+		},
+
 		Fields: map[string]*framework.FieldSchema{
 			"name": {
 				Type:        framework.TypeString,
@@ -78,9 +87,6 @@ by one or more concatenated PEM blocks and ordered starting from the end-entity
 		Operations: map[logical.Operation]framework.OperationHandler{
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathImportCertChainWrite,
-				DisplayAttrs: &framework.DisplayAttributes{
-					OperationVerb: "update",
-				},
 			},
 		},
 		HelpSynopsis:    pathImportCertChainHelpSyn,