Merge pull request #2248 from Infisical/misc/addressed-reported-cli-behaviors

misc: addressed reported flaws with CLI usage
This commit is contained in:
Sheen Capadngan
2024-08-13 12:49:20 +08:00
committed by GitHub
+16 -12
View File
@@ -155,7 +155,14 @@ var secretsSetCmd = &cobra.Command{
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
util.RequireLocalWorkspaceFile() token, err := util.GetInfisicalToken(cmd)
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
if (token == nil) {
util.RequireLocalWorkspaceFile()
}
environmentName, _ := cmd.Flags().GetString("env") environmentName, _ := cmd.Flags().GetString("env")
if !cmd.Flags().Changed("env") { if !cmd.Flags().Changed("env") {
@@ -165,12 +172,7 @@ var secretsSetCmd = &cobra.Command{
} }
} }
token, err := util.GetInfisicalToken(cmd) projectId, err := cmd.Flags().GetString("projectId")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
projectId, err := cmd.Flags().GetString("projectId")
if err != nil { if err != nil {
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
@@ -424,11 +426,13 @@ func getSecretsByNames(cmd *cobra.Command, args []string) {
if value, ok := secretsMap[secretKeyFromArg]; ok { if value, ok := secretsMap[secretKeyFromArg]; ok {
requestedSecrets = append(requestedSecrets, value) requestedSecrets = append(requestedSecrets, value)
} else { } else {
requestedSecrets = append(requestedSecrets, models.SingleEnvironmentVariable{ if !(plainOutput || showOnlyValue) {
Key: secretKeyFromArg, requestedSecrets = append(requestedSecrets, models.SingleEnvironmentVariable{
Type: "*not found*", Key: secretKeyFromArg,
Value: "*not found*", Type: "*not found*",
}) Value: "*not found*",
})
}
} }
} }