refactor (kms): add GetWrapperer for RewrapFn parameter (#2701)
* refactor (kms): add GetWrapperer for RewrapFn parameter * tests (kms): add MockWrapper and MockGetWrapperer Make it a bit easier to write unhappy path tests which depend on a Wrapper or GetWrapperer
This commit is contained in:
12 files changed
+126
-29
No files matched your search
@@ -686,9 +686,9 @@ func fetchConnections(ctx context.Context, r db.Reader, sessionId string, opt ..
|
||||
// the session uses a legacy private key or not. It also updates the encrypted session
|
||||
// in the database (if necessary). Eventually we should be able to remove this function
|
||||
// and use the session key unconditionally.
|
||||
func decryptAndMaybeUpdateSession(ctx context.Context, kmsRepo *kms.Kms, session *Session, writer db.Writer) error {
|
||||
func decryptAndMaybeUpdateSession(ctx context.Context, kmsRepo kms.GetWrapperer, session *Session, writer db.Writer) error {
|
||||
const op = "session.decryptAndMaybeUpdateSession"
|
||||
if kmsRepo == nil {
|
||||
if util.IsNil(kmsRepo) {
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "missing kms repo")
|
||||
}
|
||||
if session == nil {
|
||||
|
||||
@@ -14,7 +14,7 @@ func init() {
|
||||
kms.RegisterTableRewrapFn("session_credential", sessionCredentialRewrapFn)
|
||||
}
|
||||
|
||||
func rewrapParameterChecks(ctx context.Context, dataKeyVersionId string, scopeId string, reader db.Reader, writer db.Writer, kmsRepo *kms.Kms) string {
|
||||
func rewrapParameterChecks(ctx context.Context, dataKeyVersionId string, scopeId string, reader db.Reader, writer db.Writer, kmsRepo kms.GetWrapperer) string {
|
||||
if dataKeyVersionId == "" {
|
||||
return "missing data key version id"
|
||||
}
|
||||
@@ -33,7 +33,7 @@ func rewrapParameterChecks(ctx context.Context, dataKeyVersionId string, scopeId
|
||||
return ""
|
||||
}
|
||||
|
||||
func sessionCredentialRewrapFn(ctx context.Context, dataKeyVersionId, scopeId string, reader db.Reader, writer db.Writer, kmsRepo *kms.Kms) error {
|
||||
func sessionCredentialRewrapFn(ctx context.Context, dataKeyVersionId, scopeId string, reader db.Reader, writer db.Writer, kmsRepo kms.GetWrapperer) error {
|
||||
const op = "session.sessionCredentialRewrapFn"
|
||||
if errStr := rewrapParameterChecks(ctx, dataKeyVersionId, scopeId, reader, writer, kmsRepo); errStr != "" {
|
||||
return errors.New(ctx, errors.InvalidParameter, op, errStr)
|
||||
@@ -84,7 +84,7 @@ func sessionCredentialRewrapFn(ctx context.Context, dataKeyVersionId, scopeId st
|
||||
return nil
|
||||
}
|
||||
|
||||
func sessionRewrapFn(ctx context.Context, dataKeyVersionId string, scopeId string, reader db.Reader, writer db.Writer, kmsRepo *kms.Kms) error {
|
||||
func sessionRewrapFn(ctx context.Context, dataKeyVersionId string, scopeId string, reader db.Reader, writer db.Writer, kmsRepo kms.GetWrapperer) error {
|
||||
const op = "session.sessionRewrapFn"
|
||||
if errStr := rewrapParameterChecks(ctx, dataKeyVersionId, scopeId, reader, writer, kmsRepo); errStr != "" {
|
||||
return errors.New(ctx, errors.InvalidParameter, op, errStr)
|
||||
|
||||
Reference in new issue
Block a user