Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions packages/cmd/dynamic_secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func getDynamicSecretList(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -171,7 +171,7 @@ func createDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -342,7 +342,7 @@ func renewDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -477,7 +477,7 @@ func revokeDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -605,7 +605,7 @@ func listDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cmd/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var exportCmd = &cobra.Command{
util.HandleError(err)
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err)
}
Expand Down
6 changes: 3 additions & 3 deletions packages/cmd/folder.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var getCmd = &cobra.Command{
}
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -110,7 +110,7 @@ var createCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -202,7 +202,7 @@ var deleteCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var runCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down
10 changes: 5 additions & 5 deletions packages/cmd/secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var secretsCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -191,7 +191,7 @@ var secretsSetCmd = &cobra.Command{
}
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -341,7 +341,7 @@ var secretsDeleteCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -454,7 +454,7 @@ func getSecretsByNames(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down Expand Up @@ -597,7 +597,7 @@ func generateExampleEnv(cmd *cobra.Command, args []string) {
util.HandleError(err, "Unable to parse flag")
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cmd/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ func sshAddHost(cmd *cobra.Command, args []string) {
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken
}

projectId, err := cmd.Flags().GetString("projectId")
projectId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse --projectId flag")
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cmd/tokens.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var tokensCreateCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag")
}

workspaceId, err := cmd.Flags().GetString("projectId")
workspaceId, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "projectId", []string{util.INFISICAL_PROJECT_ID_NAME}, "")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
Expand Down
1 change: 1 addition & 0 deletions packages/util/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const (
INFISICAL_DEFAULT_EU_URL = "https://eu.infisical.com"
INFISICAL_WORKSPACE_CONFIG_FILE_NAME = ".infisical.json"
INFISICAL_TOKEN_NAME = "INFISICAL_TOKEN"
INFISICAL_PROJECT_ID_NAME = "INFISICAL_PROJECT_ID"
Comment thread
scott-ray-wilson marked this conversation as resolved.
INFISICAL_UNIVERSAL_AUTH_ACCESS_TOKEN_NAME = "INFISICAL_UNIVERSAL_AUTH_ACCESS_TOKEN"
INFISICAL_VAULT_FILE_PASSPHRASE_ENV_NAME = "INFISICAL_VAULT_FILE_PASSPHRASE" // This works because we've forked the keyring package and added support for this env variable. This explains why you won't find any occurrences of it in the CLI codebase.

Expand Down
Loading