Skip to content

WIP: Minor updates/fixes #435

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

Draft
CGoodwin90 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: Minor updates/fixes #435

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
2 changes: 1 addition & 1 deletion cmd/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ var listVariablesCmd = &cobra.Command{
env = append(env, returnNonEmptyString(fmt.Sprintf("%v", envvar.Scope)))
env = append(env, returnNonEmptyString(fmt.Sprintf("%v", envvar.Name)))
if reveal {
env = append(env, fmt.Sprintf("%v", envvar.Value))
env = append(env, returnNonEmptyString(fmt.Sprintf("%v", envvar.Value)))
outputOptions.MultiLine = true
}
data = append(data, env)
Expand Down
1 change: 1 addition & 0 deletions cmd/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var outputOptions = output.Options{
}

var groupRoles = []string{"guest", "reporter", "developer", "maintainer", "owner"}
var variableScopes = []string{"global", "build", "runtime", "container_registry", "internal_container_registry"}

var debugEnable bool

Expand Down
5 changes: 5 additions & 0 deletions cmd/variables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"context"
"fmt"
"slices"
"strings"

"github.com/uselagoon/machinery/api/lagoon"
Expand Down Expand Up @@ -54,6 +55,10 @@ func addOrUpdateVariable(cmd *cobra.Command, args []string) error {
return err
}

if varScope != "" && !slices.Contains(variableScopes, strings.ToLower(varScope)) {
return fmt.Errorf("invalid scope '%s', valid scopes include: %s", varScope, strings.Join(variableScopes, ", "))
}

current := lagoonCLIConfig.Current
token := lagoonCLIConfig.Lagoons[current].Token
lc := lclient.New(
Expand Down
Loading