mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 12:27:31 +00:00
fix variable assignment when pulling via token
This commit is contained in:
@@ -196,7 +196,6 @@ func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, envName string,
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetAllEnvironmentVariables(projectId string, envName string) ([]models.SingleEnvironmentVariable, error) {
|
func GetAllEnvironmentVariables(projectId string, envName string) ([]models.SingleEnvironmentVariable, error) {
|
||||||
var envsFromApi []models.SingleEnvironmentVariable
|
|
||||||
infisicalToken := os.Getenv(INFISICAL_TOKEN_NAME)
|
infisicalToken := os.Getenv(INFISICAL_TOKEN_NAME)
|
||||||
|
|
||||||
if infisicalToken == "" {
|
if infisicalToken == "" {
|
||||||
@@ -204,19 +203,19 @@ func GetAllEnvironmentVariables(projectId string, envName string) ([]models.Sing
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Info("Unexpected issue occurred while checking login status. To see more details, add flag --debug")
|
log.Info("Unexpected issue occurred while checking login status. To see more details, add flag --debug")
|
||||||
log.Debugln(err)
|
log.Debugln(err)
|
||||||
return envsFromApi, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !hasUserLoggedInbefore {
|
if !hasUserLoggedInbefore {
|
||||||
log.Infoln("No logged in user. To login, please run command [infisical login]")
|
log.Infoln("No logged in user. To login, please run command [infisical login]")
|
||||||
return envsFromApi, fmt.Errorf("user not logged in")
|
return nil, fmt.Errorf("user not logged in")
|
||||||
}
|
}
|
||||||
|
|
||||||
userCreds, err := GetUserCredsFromKeyRing(loggedInUserEmail)
|
userCreds, err := GetUserCredsFromKeyRing(loggedInUserEmail)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Infoln("Unable to get user creds from key ring")
|
log.Infoln("Unable to get user creds from key ring")
|
||||||
log.Debug(err)
|
log.Debug(err)
|
||||||
return envsFromApi, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
workspaceConfigs, err := GetAllWorkSpaceConfigsStartingFromCurrentPath()
|
workspaceConfigs, err := GetAllWorkSpaceConfigsStartingFromCurrentPath()
|
||||||
@@ -226,25 +225,28 @@ func GetAllEnvironmentVariables(projectId string, envName string) ([]models.Sing
|
|||||||
|
|
||||||
if len(workspaceConfigs) == 0 {
|
if len(workspaceConfigs) == 0 {
|
||||||
log.Infoln("Your local project is not connected to a Infisical project yet. Run command [infisical init]")
|
log.Infoln("Your local project is not connected to a Infisical project yet. Run command [infisical init]")
|
||||||
return envsFromApi, fmt.Errorf("project not initialized")
|
return nil, fmt.Errorf("project not initialized")
|
||||||
}
|
}
|
||||||
|
|
||||||
envsFromApi, err = GetSecretsFromAPIUsingCurrentLoggedInUser(envName, userCreds)
|
envsFromApi, err := GetSecretsFromAPIUsingCurrentLoggedInUser(envName, userCreds)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorln("Something went wrong when pulling secrets using your logged in credentials. If the issue persists, double check your project id/try logging in again.")
|
log.Errorln("Something went wrong when pulling secrets using your logged in credentials. If the issue persists, double check your project id/try logging in again.")
|
||||||
log.Debugln(err)
|
log.Debugln(err)
|
||||||
return envsFromApi, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return envsFromApi, nil
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
envsFromApi, err := GetSecretsFromAPIUsingInfisicalToken(infisicalToken, envName, projectId)
|
envsFromApi, err := GetSecretsFromAPIUsingInfisicalToken(infisicalToken, envName, projectId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorln("Something went wrong when pulling secrets using your Infisical token. Double check the token, project id or environment name (dev, prod, ect.)")
|
log.Errorln("Something went wrong when pulling secrets using your Infisical token. Double check the token, project id or environment name (dev, prod, ect.)")
|
||||||
log.Debugln(err)
|
log.Debugln(err)
|
||||||
return envsFromApi, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return envsFromApi, nil
|
return envsFromApi, nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetWorkSpacesFromAPI(userCreds models.UserCredentials) (workspaces []models.Workspace, err error) {
|
func GetWorkSpacesFromAPI(userCreds models.UserCredentials) (workspaces []models.Workspace, err error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user