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

Issue open-horizon#3908 - Bug: CLI for node level secrets not applyin… #3909

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Issue open-horizon#3908 - Bug: CLI for node level secrets not applyin… #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions agreementbot/secure_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,11 +1200,11 @@ func (a *SecureAPI) errCheck(err error, action string, info *SecretRequestInfo)
// build the original secret name
var secretName string
if info.user != "" && info.node != "" {
secretName = "user/" + info.user + "node/" + info.node + cliutils.AddSlash(info.vaultSecretName)
secretName = "/user/" + info.user + "/node/" + info.node + cliutils.AddSlash(info.vaultSecretName)
} else if info.user != "" {
secretName = "user/" + info.user + cliutils.AddSlash(info.vaultSecretName)
secretName = "/user/" + info.user + cliutils.AddSlash(info.vaultSecretName)
} else if info.node != "" {
secretName = "node/" + info.node + cliutils.AddSlash(info.vaultSecretName)
secretName = "/node/" + info.node + cliutils.AddSlash(info.vaultSecretName)
} else {
secretName = info.vaultSecretName
}
Expand Down
33 changes: 25 additions & 8 deletions cli/secrets_manager/secrets_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ func SecretList(org, credToUse, secretName, secretNodeId string) {
secretName = secretName[:len(secretName)-1]
}

if !strings.Contains(secretName, "/node") && secretNodeId != "" {
// add /node/{nodeID} to the path
if strings.HasPrefix(secretName, "/") {
secretName = strings.TrimPrefix(secretName, "/")
}

if !strings.Contains(secretName, "node/") && secretNodeId != "" {
// add node/{nodeID} to the path
secretName = getSecretPathForNodeLevelSecret(secretName, secretNodeId)
}
// if given secretName := "", nodeId is specified, then secretName will be convert to "node/{nodeId}"
Expand Down Expand Up @@ -166,8 +170,12 @@ func SecretAdd(org, credToUse, secretName, secretNodeId, secretFile, secretKey,
secretName = secretName[:len(secretName)-1]
}

if !strings.Contains(secretName, "/node") && secretNodeId != "" {
// add /node/{nodeID} to the path
if strings.HasPrefix(secretName, "/") {
secretName = strings.TrimPrefix(secretName, "/")
}

if !strings.Contains(secretName, "node/") && secretNodeId != "" {
// add node/{nodeID} to the path
secretName = getSecretPathForNodeLevelSecret(secretName, secretNodeId)
}

Expand Down Expand Up @@ -259,8 +267,12 @@ func SecretRemove(org, credToUse, secretName, secretNodeId string, forceRemoval
secretName = secretName[:len(secretName)-1]
}

if !strings.Contains(secretName, "/node") && secretNodeId != "" {
// add /node/{nodeID} to the path
if strings.HasPrefix(secretName, "/") {
secretName = strings.TrimPrefix(secretName, "/")
}

if !strings.Contains(secretName, "node/") && secretNodeId != "" {
// add node/{nodeID} to the path
secretName = getSecretPathForNodeLevelSecret(secretName, secretNodeId)
}

Expand Down Expand Up @@ -299,8 +311,12 @@ func SecretRead(org, credToUse, secretName, secretNodeId string) {
secretName = secretName[:len(secretName)-1]
}

if !strings.Contains(secretName, "/node") && secretNodeId != "" {
// add /node/{nodeID} to the path
if strings.HasPrefix(secretName, "/") {
secretName = strings.TrimPrefix(secretName, "/")
}

if !strings.Contains(secretName, "node/") && secretNodeId != "" {
// add node/{nodeID} to the path
secretName = getSecretPathForNodeLevelSecret(secretName, secretNodeId)
}

Expand Down Expand Up @@ -328,6 +344,7 @@ func SecretRead(org, credToUse, secretName, secretNodeId string) {

func getSecretPathForNodeLevelSecret(secretName string, secretNodeId string) string {
secretName = strings.TrimSpace(secretName)
secretName = strings.TrimPrefix(secretName, "/")
if secretName == "" {
secretName = fmt.Sprintf("node/%v", secretNodeId)
} else {
Expand Down