diff --git a/cmd/secretsEncrypt.go b/cmd/secretsEncrypt.go index 3752bec..9cf0ca8 100644 --- a/cmd/secretsEncrypt.go +++ b/cmd/secretsEncrypt.go @@ -24,11 +24,18 @@ var secretsEncryptCmd = &cobra.Command{ return err } - promptPushSecret(sm, secret) + if encryptPush { + err := promptPushSecret(sm, secret) + if err != nil { + return err + } + } + return nil }, } func init() { secretsEncryptCmd.Flags().BoolVarP(&encryptPush, "push", "y", false, "Push after encrypt") + secretsEncryptCmd.Flags().BoolVarP(&forcePush, "force", "f", false, "Used with push to skip prompt") } diff --git a/cmd/secretsPull.go b/cmd/secretsPull.go index dadc800..de18171 100644 --- a/cmd/secretsPull.go +++ b/cmd/secretsPull.go @@ -40,7 +40,7 @@ var secretsPullCmd = &cobra.Command{ } func pullSecret(sm *truss.SecretsManager, secret truss.SecretConfig) error { - areSame, err := secretCompare(sm, secret, false) + areSame, err := secretCompare(sm, secret, false, forcePull) if err != nil { return err } @@ -49,6 +49,9 @@ func pullSecret(sm *truss.SecretsManager, secret truss.SecretConfig) error { return nil } + if forcePull { + fmt.Println("Force pulling secrets.") + } if forcePull || prompter.YesNo(fmt.Sprintf("Pull from environment %s?", secret.Name()), false) { return sm.Pull(secret) } diff --git a/cmd/secretsPush.go b/cmd/secretsPush.go index 6f76f9c..548f8ef 100644 --- a/cmd/secretsPush.go +++ b/cmd/secretsPush.go @@ -40,7 +40,7 @@ var secretsPushCmd = &cobra.Command{ } func promptPushSecret(sm *truss.SecretsManager, secret truss.SecretConfig) error { - areSame, err := secretCompare(sm, secret, true) + areSame, err := secretCompare(sm, secret, true, forcePush) if err != nil { return err } @@ -49,6 +49,9 @@ func promptPushSecret(sm *truss.SecretsManager, secret truss.SecretConfig) error return nil } + if forcePush { + fmt.Println("Force pushing secrets.") + } if forcePush || prompter.YesNo(fmt.Sprintf("Push to environment %s?", secret.Name()), false) { return sm.Push(secret) } diff --git a/cmd/secretsView.go b/cmd/secretsView.go index 017e792..bce2736 100644 --- a/cmd/secretsView.go +++ b/cmd/secretsView.go @@ -23,13 +23,13 @@ var secretsViewCmd = &cobra.Command{ return err } - _, err = secretCompare(sm, secret, true) + _, err = secretCompare(sm, secret, true, false) return err }, } // return true if same -func secretCompare(sm *truss.SecretsManager, secret truss.SecretConfig, localToRemote bool) (bool, error) { +func secretCompare(sm *truss.SecretsManager, secret truss.SecretConfig, localToRemote bool, quiet bool) (bool, error) { localContent, remoteContent, err := sm.View(secret) if err != nil { return false, err @@ -42,6 +42,8 @@ func secretCompare(sm *truss.SecretsManager, secret truss.SecretConfig, localToR } else { diffs = dmp.DiffMain(localContent, remoteContent, false) } - fmt.Println(dmp.DiffPrettyText(diffs)) + if !quiet { + fmt.Println(dmp.DiffPrettyText(diffs)) + } return remoteContent == localContent, nil }