diff --git a/internal/util/crypto.go b/internal/util/crypto.go index a4be18dc9..ff8f5637c 100644 --- a/internal/util/crypto.go +++ b/internal/util/crypto.go @@ -67,11 +67,6 @@ type EncryptionKMS interface { GetID() string } -// MissingPassphrase is an error instructing to generate new passphrase. -type MissingPassphrase struct { - error -} - // SecretsKMS is default KMS implementation that means no KMS is in use. type SecretsKMS struct { passphrase string diff --git a/internal/util/vault.go b/internal/util/vault.go index ed377019b..465073946 100644 --- a/internal/util/vault.go +++ b/internal/util/vault.go @@ -331,9 +331,7 @@ func (vc *vaultConnection) GetID() string { // data.data.passphrase structure. func (kms *VaultKMS) GetPassphrase(key string) (string, error) { s, err := kms.secrets.GetSecret(filepath.Join(kms.vaultPassphrasePath, key), kms.keyContext) - if errors.Is(err, loss.ErrInvalidSecretId) { - return "", MissingPassphrase{err} - } else if err != nil { + if err != nil { return "", err } diff --git a/internal/util/vault_tokens.go b/internal/util/vault_tokens.go index 80fe22da5..120ae4b0f 100644 --- a/internal/util/vault_tokens.go +++ b/internal/util/vault_tokens.go @@ -25,7 +25,6 @@ import ( "strconv" "github.com/hashicorp/vault/api" - loss "github.com/libopenstorage/secrets" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -351,9 +350,7 @@ func (kms *VaultTokensKMS) initCertificates(config map[string]interface{}) error // data.data.passphrase structure. func (kms *VaultTokensKMS) GetPassphrase(key string) (string, error) { s, err := kms.secrets.GetSecret(key, kms.keyContext) - if errors.Is(err, loss.ErrInvalidSecretId) { - return "", MissingPassphrase{err} - } else if err != nil { + if err != nil { return "", err }