🐛 Spelling (#1286)

rigdev · Oct 16, 2024 · afa9064 · afa9064
1 parent 91ca9e2
commit afa9064
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cmd/rig/cmd/cmdconfig/context.go b/cmd/rig/cmd/cmdconfig/context.go
@@ -133,7 +133,7 @@ func (cfg *Config) CreateContext(name, host string, interactive bool) error {
 	})
 
 	if interactive {
-		if ok, err := cfg.prompter.Confirm("Do you want activate this Rig context now?", true); err != nil {
+		if ok, err := cfg.prompter.Confirm("Do you want to activate this Rig context now?", true); err != nil {
 			return err
 		} else if ok {
 			cfg.CurrentContextName = name

diff --git a/cmd/rig/cmd/config/use_environment.go b/cmd/rig/cmd/config/use_environment.go
@@ -89,7 +89,7 @@ func (c *CmdWScope) environmentFromArg(ctx context.Context, environmentArg strin
 		}
 
 		if c.Scope.GetCurrentContext().GetProject() != "" &&
-			!slices.Contains(e.GetActiveProjects(), c.Scope.GetCurrentContext().GetProject()) {
+			!e.GetGlobal() && !slices.Contains(e.GetActiveProjects(), c.Scope.GetCurrentContext().GetProject()) {
 			cont, err := c.Prompter.Confirm(
 				fmt.Sprintf(
 					"Warning: project '%s' is not active in environment '%s'.\nDo you want to continue anyways?",

diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/nyaruka/phonenumbers v1.1.7
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.70.0
-	github.com/rigdev/rig-go-api v0.0.0-20241016085442-e5380ca42f6e
+	github.com/rigdev/rig-go-api v0.0.0-20241016115738-abe8c0b9fe81
 	github.com/rigdev/rig-go-sdk v0.0.0-20240612092526-69df8621bc22
 	github.com/rivo/tview v0.0.0-20240524063012-037df494fb76
 	github.com/robfig/cron v1.2.0

diff --git a/go.sum b/go.sum
@@ -309,8 +309,8 @@ github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJ
 github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/rigdev/rig-go-api v0.0.0-20241016085442-e5380ca42f6e h1:HNra1/GQrYbPbb9V4DD+mpLjLtdSGpKZNNfqgyvOkiI=
-github.com/rigdev/rig-go-api v0.0.0-20241016085442-e5380ca42f6e/go.mod h1:6xxlwvADYBFRiIrot3yrcXVJT2IMGfkTZ5LIRomNlXY=
+github.com/rigdev/rig-go-api v0.0.0-20241016115738-abe8c0b9fe81 h1:V/ZLEdOZ0jLemexdyUymiJ3vMWMvc0E6EwdYvP+YO2U=
+github.com/rigdev/rig-go-api v0.0.0-20241016115738-abe8c0b9fe81/go.mod h1:6xxlwvADYBFRiIrot3yrcXVJT2IMGfkTZ5LIRomNlXY=
 github.com/rigdev/rig-go-sdk v0.0.0-20240612092526-69df8621bc22 h1:NFjBY/F42lcgqnqru+h1q3RrzRk645HUilCvbZD7exI=
 github.com/rigdev/rig-go-sdk v0.0.0-20240612092526-69df8621bc22/go.mod h1:bmASl5RyuOoEddGeaOxHB27W3KDI4sBxqfnR1cRTstY=
 github.com/rivo/tview v0.0.0-20240524063012-037df494fb76 h1:iqvDlgyjmqleATtFbA7c14djmPh2n4mCYUv7JlD/ruA=