upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-03 13:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

command/namespace: Move trailing slash check to the end (#5163)

Browse source
This commit is contained in:
Calvin Leung Huang 2018-08-22 15:49:24 -07:00 committed by GitHub
parent fb2d2de66b
commit ac10e2078e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
command/namespace_create.go
View file

@ -85,12 +85,14 @@ func (c *NamespaceCreateCommand) Run(args []string) int {
return 2
}
if !strings.HasSuffix(namespacePath, "/") {
namespacePath = namespacePath + "/"
}
if c.flagNamespace != notSetNamespace {
namespacePath = path.Join(c.flagNamespace, namespacePath)
}
if !strings.HasSuffix(namespacePath, "/") {
namespacePath = namespacePath + "/"
}
// Output full path
c.UI.Output(fmt.Sprintf("Success! Namespace created at: %s", namespacePath))
return 0

7
command/namespace_delete.go
View file

@ -90,13 +90,14 @@ func (c *NamespaceDeleteCommand) Run(args []string) int {
return OutputSecret(c.UI, secret)
}
if !strings.HasSuffix(namespacePath, "/") {
namespacePath = namespacePath + "/"
}
if c.flagNamespace != notSetNamespace {
namespacePath = path.Join(c.flagNamespace, namespacePath)
}
if !strings.HasSuffix(namespacePath, "/") {
namespacePath = namespacePath + "/"
}
c.UI.Output(fmt.Sprintf("Success! Namespace deleted at: %s", namespacePath))
return 0
}