CreateOperation should only be implemented alongside ExistenceCheck (o…

…penbao#50) * CreateOperation should only be implemented alongside ExistenceCheck See hashicorp/vault#18492 * Change CreateOperation to UpdateOperation in tests, too
cipherboy · Jan 19, 2023 · 5f620a8 · 5f620a8
1 parent 2865f8d
commit 5f620a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/path_rotate.go b/path_rotate.go
@@ -28,11 +28,6 @@ func (b *backend) pathRotateCredentials() []*framework.Path {
 					ForwardPerformanceStandby:   true,
 					ForwardPerformanceSecondary: true,
 				},
-				logical.CreateOperation: &framework.PathOperation{
-					Callback:                    b.pathRotateRootCredentialsUpdate,
-					ForwardPerformanceStandby:   true,
-					ForwardPerformanceSecondary: true,
-				},
 			},
 			HelpSynopsis: "Request to rotate the root credentials Vault uses for the LDAP administrator account.",
 			HelpDescription: "This path attempts to rotate the root credentials of the administrator account " +
@@ -52,11 +47,6 @@ func (b *backend) pathRotateCredentials() []*framework.Path {
 					ForwardPerformanceStandby:   true,
 					ForwardPerformanceSecondary: true,
 				},
-				logical.CreateOperation: &framework.PathOperation{
-					Callback:                    b.pathRotateRoleCredentialsUpdate,
-					ForwardPerformanceStandby:   true,
-					ForwardPerformanceSecondary: true,
-				},
 			},
 			HelpSynopsis:    "Request to rotate the credentials for a static user account.",
 			HelpDescription: "This path attempts to rotate the credentials for the given LDAP static user account.",

diff --git a/path_rotate_test.go b/path_rotate_test.go
@@ -34,7 +34,7 @@ func TestManualRotate(t *testing.T) {
 		}
 
 		req = &logical.Request{
-			Operation: logical.CreateOperation,
+			Operation: logical.UpdateOperation,
 			Path:      rotateRootPath,
 			Storage:   storage,
 			Data:      nil,
@@ -99,7 +99,7 @@ func TestManualRotate(t *testing.T) {
 		}
 
 		req = &logical.Request{
-			Operation: logical.CreateOperation,
+			Operation: logical.UpdateOperation,
 			Path:      rotateRootPath,
 			Storage:   storage,
 			Data:      nil,
@@ -183,7 +183,7 @@ func TestManualRotate(t *testing.T) {
 		defer b.Cleanup(context.Background())
 
 		req := &logical.Request{
-			Operation: logical.CreateOperation,
+			Operation: logical.UpdateOperation,
 			Path:      rotateRolePath + "hashicorp",
 			Storage:   storage,
 			Data:      nil,

diff --git a/rotation_test.go b/rotation_test.go
@@ -37,7 +37,7 @@ func TestAutoRotate(t *testing.T) {
 		}
 
 		req = &logical.Request{
-			Operation: logical.CreateOperation,
+			Operation: logical.UpdateOperation,
 			Path:      rotateRootPath,
 			Storage:   storage,
 			Data:      nil,