openapi: A few fixes for display attributes (hashicorp#20549)

fopina · May 11, 2023 · 02742a7 · 02742a7
1 parent dae5cf1
commit 02742a7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/builtin/credential/approle/path_role.go b/builtin/credential/approle/path_role.go
@@ -1077,7 +1077,6 @@ Overrides secret_id_ttl role option when supplied. May not be longer than role's
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id/destroy/?$",
 			DisplayAttrs: &framework.DisplayAttributes{
 				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id",
 				OperationVerb:   "destroy",
 			},
 			Fields: map[string]*framework.FieldSchema{
@@ -1094,6 +1093,9 @@ Overrides secret_id_ttl role option when supplied. May not be longer than role's
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback:  b.pathRoleSecretIDDestroyUpdateDelete,
 					Responses: responseNoContent,
+					DisplayAttrs: &framework.DisplayAttributes{
+						OperationSuffix: "secret-id",
+					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback:  b.pathRoleSecretIDDestroyUpdateDelete,
@@ -1183,7 +1185,6 @@ Overrides secret_id_ttl role option when supplied. May not be longer than role's
 			Pattern: "role/" + framework.GenericNameRegex("role_name") + "/secret-id-accessor/destroy/?$",
 			DisplayAttrs: &framework.DisplayAttributes{
 				OperationPrefix: operationPrefixAppRole,
-				OperationSuffix: "secret-id-by-accessor",
 				OperationVerb:   "destroy",
 			},
 			Fields: map[string]*framework.FieldSchema{
@@ -1200,6 +1201,9 @@ Overrides secret_id_ttl role option when supplied. May not be longer than role's
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback:  b.pathRoleSecretIDAccessorDestroyUpdateDelete,
 					Responses: responseNoContent,
+					DisplayAttrs: &framework.DisplayAttributes{
+						OperationSuffix: "secret-id-by-accessor",
+					},
 				},
 				logical.DeleteOperation: &framework.PathOperation{
 					Callback:  b.pathRoleSecretIDAccessorDestroyUpdateDelete,

diff --git a/builtin/credential/aws/path_role.go b/builtin/credential/aws/path_role.go
@@ -233,7 +233,7 @@ func (b *backend) pathListRoles() *framework.Path {
 
 		DisplayAttrs: &framework.DisplayAttributes{
 			OperationPrefix: operationPrefixAWS,
-			OperationSuffix: "roles2",
+			OperationSuffix: "auth-roles2",
 		},
 
 		Operations: map[logical.Operation]framework.OperationHandler{

diff --git a/builtin/logical/aws/path_user.go b/builtin/logical/aws/path_user.go
@@ -57,7 +57,7 @@ func pathUser(b *backend) *framework.Path {
 			logical.UpdateOperation: &framework.PathOperation{
 				Callback: b.pathCredsRead,
 				DisplayAttrs: &framework.DisplayAttributes{
-					OperationSuffix: "credentials2|sts-credentials2",
+					OperationSuffix: "credentials-with-parameters|sts-credentials-with-parameters",
 				},
 			},
 		},

diff --git a/vault/identity_store_oidc_provider.go b/vault/identity_store_oidc_provider.go
@@ -527,7 +527,8 @@ func oidcProviderPaths(i *IdentityStore) []*framework.Path {
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: i.pathOIDCAuthorize,
 					DisplayAttrs: &framework.DisplayAttributes{
-						OperationVerb: "authorize2",
+						OperationVerb:   "authorize",
+						OperationSuffix: "with-parameters",
 					},
 					ForwardPerformanceStandby:   true,
 					ForwardPerformanceSecondary: false,

diff --git a/vault/logical_system_paths.go b/vault/logical_system_paths.go
@@ -2214,7 +2214,7 @@ func (b *SystemBackend) internalPaths() []*framework.Path {
 				logical.UpdateOperation: &framework.PathOperation{
 					Callback: b.pathInternalOpenAPI,
 					DisplayAttrs: &framework.DisplayAttributes{
-						OperationSuffix: "open-api-document2",
+						OperationSuffix: "open-api-document-with-parameters",
 					},
 				},
 			},