awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 11:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1550 from Infisical/daniel/cli-hotfix

Browse Source 
Fix: CLI Service Tokens
This commit is contained in:
Daniel Hougaard
2024-03-11 10:04:32 +01:00
committed by GitHub
parent f1b7653a52 40ccab6576
commit 628c641580
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/export.go
+2 -1
View File
@@ -59,7 +59,8 @@ var exportCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
infisicalToken, err := cmd.Flags().GetString("token") infisicalToken, err := util.GetInfisicalServiceToken(cmd)
if err != nil { if err != nil {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
cli/packages/cmd/folder.go
+2 -1
View File
@@ -36,7 +36,8 @@ var getCmd = &cobra.Command{
} }
} }
infisicalToken, err := cmd.Flags().GetString("token") infisicalToken, err := util.GetInfisicalServiceToken(cmd)
if err != nil { if err != nil {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
cli/packages/cmd/run.go
+2 -1
View File
@@ -62,7 +62,8 @@ var runCmd = &cobra.Command{
} }
} }
infisicalToken, err := cmd.Flags().GetString("token") infisicalToken, err := util.GetInfisicalServiceToken(cmd)
if err != nil { if err != nil {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
cli/packages/cmd/secrets.go
+7 -6
View File
@@ -7,7 +7,6 @@ import (
"crypto/sha256" "crypto/sha256"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"os"
"regexp" "regexp"
"sort" "sort"
"strings" "strings"
@@ -39,10 +38,10 @@ var secretsCmd = &cobra.Command{
} }
} }
infisicalToken, err := cmd.Flags().GetString("token") infisicalToken, err := util.GetInfisicalServiceToken(cmd)
if infisicalToken == "" { if err != nil {
infisicalToken = os.Getenv(util.INFISICAL_TOKEN_NAME) util.HandleError(err, "Unable to parse flag")
} }
if err != nil { if err != nil {
@@ -399,7 +398,8 @@ func getSecretsByNames(cmd *cobra.Command, args []string) {
} }
} }
infisicalToken, err := cmd.Flags().GetString("token") infisicalToken, err := util.GetInfisicalServiceToken(cmd)
if err != nil { if err != nil {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
@@ -466,7 +466,8 @@ func generateExampleEnv(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
infisicalToken, err := cmd.Flags().GetString("token") infisicalToken, err := util.GetInfisicalServiceToken(cmd)
if err != nil { if err != nil {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
cli/packages/util/helper.go
+15
View File
@@ -11,6 +11,7 @@ import (
"strings" "strings"
"github.com/Infisical/infisical-merge/packages/models" "github.com/Infisical/infisical-merge/packages/models"
"github.com/spf13/cobra"
) )
type DecodedSymmetricEncryptionDetails = struct { type DecodedSymmetricEncryptionDetails = struct {
@@ -63,6 +64,20 @@ func IsSecretTypeValid(s string) bool {
return false return false
} }
func GetInfisicalServiceToken(cmd *cobra.Command) (serviceToken string, err error) {
infisicalToken, err := cmd.Flags().GetString("token")
if infisicalToken == "" {
infisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
}
if err != nil {
return "", err
}
return infisicalToken, nil
}
// Checks if the passed in email already exists in the users slice // Checks if the passed in email already exists in the users slice
func ConfigContainsEmail(users []models.LoggedInUser, email string) bool { func ConfigContainsEmail(users []models.LoggedInUser, email string) bool {
for _, value := range users { for _, value := range users {