Skip to content

Add env value check to project name detection #392

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

Merged
GokceGK merged 2 commits into from
Jun 28, 2024
Merged

Add env value check to project name detection #392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd58f84
check if project id is set in env variables
GokceGK Jun 27, 2024
7df3098
changed function for getting env variable value
GokceGK Jun 27, 2024
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
14 changes: 11 additions & 3 deletions internal/pkg/projectname/project_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package projectname
import (
"context"
"fmt"
"os"

"github.com/stackitcloud/stackit-cli/internal/pkg/config"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
Expand Down Expand Up @@ -41,7 +42,7 @@ func GetProjectName(ctx context.Context, p *print.Printer, cmd *cobra.Command) (

// If project ID is set in config, we store the project name in config
// (So next time we can just pull it from there)
if !isProjectIdSetInFlags(p, cmd) {
if !(isProjectIdSetInFlags(p, cmd) || isProjectIdSetInEnvVar()) {
viper.Set(config.ProjectNameKey, projectName)
err = config.Write()
if err != nil {
Expand All @@ -57,13 +58,14 @@ func useProjectNameFromConfig(p *print.Printer, cmd *cobra.Command) bool {
// We use the project name from the config file, if:
// - Project id is not set to a different value than the one in the config file
// - Project name in the config file is not empty
projectIdSet := isProjectIdSetInFlags(p, cmd)
projectIdSetInFlags := isProjectIdSetInFlags(p, cmd)
projectIdSetInEnv := isProjectIdSetInEnvVar()
projectName := viper.GetString(config.ProjectNameKey)
projectNameSet := false
if projectName != "" {
projectNameSet = true
}
return !projectIdSet && projectNameSet
return !projectIdSetInFlags && !projectIdSetInEnv && projectNameSet
}

func isProjectIdSetInFlags(p *print.Printer, cmd *cobra.Command) bool {
Expand All @@ -77,3 +79,9 @@ func isProjectIdSetInFlags(p *print.Printer, cmd *cobra.Command) bool {
}
return projectIdSetInFlag
}

func isProjectIdSetInEnvVar() bool {
// Reads the project Id from the environment variable PROJECT_ID
_, projectIdSetInEnv := os.LookupEnv("STACKIT_PROJECT_ID")
return projectIdSetInEnv
}