jprdonnelly/steampipe
1
0
Fork 0
mirror of https://github.com/turbot/steampipe.git synced 2025-12-19 18:12:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where steampipe login was not respecting PIPES_INSTALL_DIR env var (#4616)

Browse Source
This commit is contained in:
Priyanka Chatterjee
2025-07-22 13:29:41 +05:30
committed by GitHub
parent 7f26869c71
commit 86628e56ce
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cmdconfig/cmd_hooks.go
View File

@@ -12,8 +12,6 @@ import (
"strings"
"time"
pfilepaths "github.com/turbot/pipe-fittings/v2/filepaths"
"github.com/fatih/color"
"github.com/hashicorp/go-hclog"
"github.com/mattn/go-isatty"
@@ -24,6 +22,7 @@ import (
"github.com/turbot/pipe-fittings/v2/app_specific"
pconstants "github.com/turbot/pipe-fittings/v2/constants"
perror_helpers "github.com/turbot/pipe-fittings/v2/error_helpers"
pfilepaths "github.com/turbot/pipe-fittings/v2/filepaths"
"github.com/turbot/pipe-fittings/v2/parse"
"github.com/turbot/pipe-fittings/v2/pipes"
"github.com/turbot/pipe-fittings/v2/utils"
@@ -243,6 +242,9 @@ func initGlobalConfig() perror_helpers.ErrorAndWarnings {
SetDefaultsFromConfig(loader.ConfiguredProfile.ConfigMap(cmd))
}
// now env vars have been processed, set PipesInstallDir
pfilepaths.PipesInstallDir = viper.GetString(pconstants.ArgPipesInstallDir)
// NOTE: we need to resolve the token separately
// - that is because we need the resolved value of ArgPipesHost in order to load any saved token
// and we cannot get this until the other config has been resolved
@@ -392,7 +394,6 @@ func createLogger(logBuffer *bytes.Buffer, cmd *cobra.Command) {
}
func ensureInstallDir() {
pipesInstallDir := viper.GetString(pconstants.ArgPipesInstallDir)
installDir := viper.GetString(pconstants.ArgInstallDir)
log.Printf("[TRACE] ensureInstallDir %s", installDir)
@@ -402,15 +403,8 @@ func ensureInstallDir() {
error_helpers.FailOnErrorWithMessage(err, fmt.Sprintf("could not create installation directory: %s", installDir))
}
if _, err := os.Stat(pipesInstallDir); os.IsNotExist(err) {
log.Printf("[TRACE] creating install dir")
err = os.MkdirAll(pipesInstallDir, 0755)
error_helpers.FailOnErrorWithMessage(err, fmt.Sprintf("could not create pipes installation directory: %s", pipesInstallDir))
}
// store as app_specific.InstallDir and PipesInstallDir
// store as app_specific.InstallDir
app_specific.InstallDir = installDir
pfilepaths.PipesInstallDir = pipesInstallDir
}
// displayDeprecationWarnings shows the deprecated warnings in a formatted way

1
pkg/cmdconfig/viper.go
View File

@@ -152,6 +152,7 @@ func setDefaultsFromEnv() {
constants.EnvUpdateCheck: {[]string{pconstants.ArgUpdateCheck}, Bool},
constants.EnvPipesHost: {[]string{pconstants.ArgPipesHost}, String},
constants.EnvPipesToken: {[]string{pconstants.ArgPipesToken}, String},
constants.EnvPipesInstallDir: {[]string{pconstants.ArgPipesInstallDir}, String},
constants.EnvSnapshotLocation: {[]string{pconstants.ArgSnapshotLocation}, String},
constants.EnvWorkspaceDatabase: {[]string{pconstants.ArgWorkspaceDatabase}, String},
constants.EnvServicePassword: {[]string{pconstants.ArgServicePassword}, String},

5
pkg/constants/env.go
View File

@@ -16,8 +16,9 @@ const (
EnvWorkspaceDatabase = "STEAMPIPE_WORKSPACE_DATABASE"
EnvWorkspaceProfile = "STEAMPIPE_WORKSPACE"
EnvPipesHost = "PIPES_HOST"
EnvPipesToken = "PIPES_TOKEN"
EnvPipesHost = "PIPES_HOST"
EnvPipesToken = "PIPES_TOKEN"
EnvPipesInstallDir = "PIPES_INSTALL_DIR"
EnvDisplayWidth = "STEAMPIPE_DISPLAY_WIDTH"
EnvCacheEnabled = "STEAMPIPE_CACHE"