awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-04 21:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

change flag --stage to --env

Browse Source
This commit is contained in:
Maidul Islam
2022-11-19 11:35:13 -05:00
parent 321b040fe7
commit b164a2f7ac
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/run.go
+6 -6
View File
@@ -22,13 +22,13 @@ var runCmd = &cobra.Command{
Use: "run [any infisical run command flags] -- [your application start command]", Use: "run [any infisical run command flags] -- [your application start command]",
Short: "Used to inject environments variables into your application process", Short: "Used to inject environments variables into your application process",
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
Example: "infisical run --stage=prod -- npm run dev", Example: "infisical run --env=prod -- npm run dev",
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
PreRun: toggleDebug, PreRun: toggleDebug,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
stageName, err := cmd.Flags().GetString("stage") envName, err := cmd.Flags().GetString("env")
if err != nil { if err != nil {
log.Errorln("Unable to parse the stage flag") log.Errorln("Unable to parse the environment flag")
log.Debugln(err) log.Debugln(err)
return return
} }
@@ -67,14 +67,14 @@ var runCmd = &cobra.Command{
return return
} }
envsFromApi, err = util.GetSecretsFromAPIUsingCurrentLoggedInUser(stageName, userCreds) envsFromApi, err = util.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 return
} }
} else { } else {
envsFromApi, err = util.GetSecretsFromAPIUsingInfisicalToken(infisicalToken, stageName, projectId) envsFromApi, err = util.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)
@@ -88,7 +88,7 @@ var runCmd = &cobra.Command{
func init() { func init() {
rootCmd.AddCommand(runCmd) rootCmd.AddCommand(runCmd)
runCmd.Flags().StringP("stage", "s", "dev", "Set the stage (dev, prod, etc.) from which your secrets should be pulled from") runCmd.Flags().StringP("env", "e", "dev", "Set the environment (dev, prod, etc.) from which your secrets should be pulled from")
runCmd.Flags().String("projectId", "", "The project ID from which your secrets should be pulled from") runCmd.Flags().String("projectId", "", "The project ID from which your secrets should be pulled from")
} }
cli/packages/util/secrets.go
+7 -7
View File
@@ -12,8 +12,8 @@ import (
"golang.org/x/crypto/nacl/box" "golang.org/x/crypto/nacl/box"
) )
func GetSecretsFromAPIUsingCurrentLoggedInUser(stageName string, userCreds models.UserCredentials) ([]models.SingleEnvironmentVariable, error) { func GetSecretsFromAPIUsingCurrentLoggedInUser(envName string, userCreds models.UserCredentials) ([]models.SingleEnvironmentVariable, error) {
log.Debugln("stageName", stageName, "userCreds", userCreds) log.Debugln("envName", envName, "userCreds", userCreds)
// check if user has configured a workspace // check if user has configured a workspace
workspace, err := GetWorkSpaceFromFile() workspace, err := GetWorkSpaceFromFile()
if err != nil { if err != nil {
@@ -28,7 +28,7 @@ func GetSecretsFromAPIUsingCurrentLoggedInUser(stageName string, userCreds model
var pullSecretsRequestResponse models.PullSecretsResponse var pullSecretsRequestResponse models.PullSecretsResponse
response, err := httpClient. response, err := httpClient.
R(). R().
SetQueryParam("environment", stageName). SetQueryParam("environment", envName).
SetQueryParam("channel", "cli"). SetQueryParam("channel", "cli").
SetResult(&pullSecretsRequestResponse). SetResult(&pullSecretsRequestResponse).
Get(fmt.Sprintf("%v/%v/%v", INFISICAL_URL, "secret", workspace.WorkspaceId)) // need to change workspace id Get(fmt.Sprintf("%v/%v/%v", INFISICAL_URL, "secret", workspace.WorkspaceId)) // need to change workspace id
@@ -97,9 +97,9 @@ func GetSecretsFromAPIUsingCurrentLoggedInUser(stageName string, userCreds model
return listOfEnv, nil return listOfEnv, nil
} }
func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, stageName string, projectId string) ([]models.SingleEnvironmentVariable, error) { func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, envName string, projectId string) ([]models.SingleEnvironmentVariable, error) {
if infisicalToken == "" || projectId == "" || stageName == "" { if infisicalToken == "" || projectId == "" || envName == "" {
return nil, errors.New("infisical token, project id and or stage name cannot be empty") return nil, errors.New("infisical token, project id and or environment name cannot be empty")
} }
splitToken := strings.Split(infisicalToken, ",") splitToken := strings.Split(infisicalToken, ",")
JTWToken := splitToken[0] JTWToken := splitToken[0]
@@ -113,7 +113,7 @@ func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, stageName strin
var pullSecretsByInfisicalTokenResponse models.PullSecretsByInfisicalTokenResponse var pullSecretsByInfisicalTokenResponse models.PullSecretsByInfisicalTokenResponse
response, err := httpClient. response, err := httpClient.
R(). R().
SetQueryParam("environment", stageName). SetQueryParam("environment", envName).
SetQueryParam("channel", "cli"). SetQueryParam("channel", "cli").
SetResult(&pullSecretsByInfisicalTokenResponse). SetResult(&pullSecretsByInfisicalTokenResponse).
Get(fmt.Sprintf("%v/secret/%v/service-token", INFISICAL_URL, projectId)) Get(fmt.Sprintf("%v/secret/%v/service-token", INFISICAL_URL, projectId))