Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move the declaration to a OSS build tag file to not have it collide w… #10750

Merged
merged 3 commits into from
Jan 25, 2021
Merged

Move the declaration to a OSS build tag file to not have it collide w… #10750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1623304
Move the declaration to a OSS build tag file to not have it collide w…
vishalnayak Jan 23, 2021
318ee88
Add comment
vishalnayak Jan 24, 2021
e6c46b3
Remove comment to trigger ci
vishalnayak Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions vault/logical_system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3835,12 +3835,6 @@ func (b *SystemBackend) handleLeaderStatus(ctx context.Context, req *logical.Req
return httpResp, nil
}

func (b *SystemBackend) verifyDROperationToken(f framework.OperationFunc, lock bool) framework.OperationFunc {
return func(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
return f(ctx, req, d)
}
}

func sanitizePath(path string) string {
if !strings.HasSuffix(path, "/") {
path += "/"
Expand Down
16 changes: 16 additions & 0 deletions vault/logical_system_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// +build !enterprise

package vault

import (
"context"

"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/logical"
)

func (b *SystemBackend) verifyDROperationToken(f framework.OperationFunc, lock bool) framework.OperationFunc {
return func(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
return f(ctx, req, d)
}
}