Rename credential.Reader to PassphraseReader

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/secrethub/demo-app v0.1.0
-	github.com/secrethub/secrethub-go v0.31.0
+	github.com/secrethub/secrethub-go v0.30.1-0.20201019102115-41563feace06
 	github.com/zalando/go-keyring v0.0.0-20190208082241-fbe81aec3a07
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
 	golang.org/x/sys v0.0.0-20200501052902-10377860bb8e

go.sum

@@ -182,8 +182,10 @@ github.com/secrethub/secrethub-go v0.29.1-0.20200728110331-9d7b31301226/go.mod h
 github.com/secrethub/secrethub-go v0.29.1-0.20200728110331-9d7b31301226/go.mod h1:tDeBtyjfFQX3UqgaZfY+H4dYkcGfiVzrwLDf0XtfOrw=
 github.com/secrethub/secrethub-go v0.30.0 h1:Nh1twPDwPbYQj/cYc1NG+j7sv76LZiXLPovyV83tZj0=
 github.com/secrethub/secrethub-go v0.30.0/go.mod h1:tDeBtyjfFQX3UqgaZfY+H4dYkcGfiVzrwLDf0XtfOrw=
-github.com/secrethub/secrethub-go v0.31.0 h1:0KoG0KHBOa5knkvf3K0f6sKuPSQ5VGPXLD4ttC9Eul8=
-github.com/secrethub/secrethub-go v0.31.0/go.mod h1:ZIco8Y0G0Pi0Vb7pQROjvEKgSreZiRMLhAbzWUneUSQ=
+github.com/secrethub/secrethub-go v0.30.1-0.20201019093244-fe328a799a81 h1:OM/fDm+rREF4HvPbMK9yCMeS2jlP2BpnSX4Shd2hDUE=
+github.com/secrethub/secrethub-go v0.30.1-0.20201019093244-fe328a799a81/go.mod h1:ZIco8Y0G0Pi0Vb7pQROjvEKgSreZiRMLhAbzWUneUSQ=
+github.com/secrethub/secrethub-go v0.30.1-0.20201019102115-41563feace06 h1:GssQpC4pFkRU/yZDl15M7iWpHJr+F6z05jPmcOZncj0=
+github.com/secrethub/secrethub-go v0.30.1-0.20201019102115-41563feace06/go.mod h1:ZIco8Y0G0Pi0Vb7pQROjvEKgSreZiRMLhAbzWUneUSQ=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=

internals/secrethub/account_init.go

@@ -176,7 +176,7 @@ func (cmd *AccountInitCommand) Run() error {
 
 		exportKey := credential.Key
 		if passphrase != "" {
-			exportKey = exportKey.Passphrase(credentials.FromString(passphrase))
+			exportKey = exportKey.Passphrase(credentials.PassphraseFromString(passphrase))
 		}
 
 		exportedCredential, err := exportKey.Export()

internals/secrethub/config_update_passphrase.go

@@ -63,7 +63,7 @@ func (cmd *ConfigUpdatePassphraseCommand) Run() error {
 		return err
 	}
 	if passphrase != "" {
-		credential = credential.Passphrase(credentials.FromString(passphrase))
+		credential = credential.Passphrase(credentials.PassphraseFromString(passphrase))
 	}
 	exportedCredential, err := credential.Export()
 	if err != nil {

internals/secrethub/credential_store.go

@@ -20,7 +20,7 @@ type CredentialConfig interface {
 	Provider() credentials.Provider
 	Import() (credentials.Key, error)
 	ConfigDir() configdir.Dir
-	PassphraseReader() credentials.Reader
+	PassphraseReader() credentials.PassphraseReader
 
 	Register(FlagRegisterer)
 }
@@ -61,21 +61,21 @@ func (store *credentialConfig) Register(r FlagRegisterer) {
 // When a credential is set, that credential is returned,
 // otherwise the credential is read from the configured file.
 func (store *credentialConfig) Provider() credentials.Provider {
-	return credentials.UseKey(store.getCredentialReader()).Passphrase(store.PassphraseReader())
+	return credentials.UseKey(store.getKeyReader(), credentials.KeyDecoderWithPassphrase(store.PassphraseReader()))
 }
 
 func (store *credentialConfig) Import() (credentials.Key, error) {
-	return credentials.ImportKey(store.getCredentialReader(), store.PassphraseReader())
+	return store.getKeyReader().Read(credentials.KeyDecoderWithPassphrase(store.PassphraseReader()))
 }
 
-func (store *credentialConfig) getCredentialReader() credentials.Reader {
+func (store *credentialConfig) getKeyReader() credentials.KeyReader {
 	if store.AccountCredential != "" {
 		return credentials.FromString(store.AccountCredential)
 	}
 	return store.configDir.Credential()
 }
 
 // PassphraseReader returns a PassphraseReader configured by the flags.
-func (store *credentialConfig) PassphraseReader() credentials.Reader {
+func (store *credentialConfig) PassphraseReader() credentials.PassphraseReader {
 	return NewPassphraseReader(store.io, store.credentialPassphrase, store.CredentialPassphraseCacheTTL)
 }

internals/secrethub/init.go

@@ -253,7 +253,7 @@ func (cmd *InitCommand) Run() error {
 
 		exportKey := credential.Key
 		if passphrase != "" {
-			exportKey = exportKey.Passphrase(credentials.FromString(passphrase))
+			exportKey = exportKey.Passphrase(credentials.PassphraseFromString(passphrase))
 		}
 
 		exportedKey, err := exportKey.Export()

internals/secrethub/keyring.go

@@ -67,7 +67,7 @@ func (pr *passphraseReader) Read() ([]byte, error) {
 }
 
 // NewPassphraseReader constructs a new PassphraseReader using values in the CLI.
-func NewPassphraseReader(io ui.IO, credentialPassphrase string, credentialPassphraseTTL time.Duration) credentials.Reader {
+func NewPassphraseReader(io ui.IO, credentialPassphrase string, credentialPassphraseTTL time.Duration) credentials.PassphraseReader {
 	ttl := credentialPassphraseTTL
 	cleaner := NewKeyringCleaner()
 	keyring := NewKeyring()

internals/secrethub/signup.go

@@ -244,7 +244,7 @@ func createWorkspace(client secrethub.ClientInterface, io ui.IO, org string, org
 func writeNewCredential(credential *credentials.KeyCreator, passphrase string, credentialFile *configdir.CredentialFile) error {
 	exportKey := credential.Key
 	if passphrase != "" {
-		exportKey = exportKey.Passphrase(credentials.FromString(passphrase))
+		exportKey = exportKey.Passphrase(credentials.PassphraseFromString(passphrase))
 	}
 
 	encodedCredential, err := credential.Export()