golint: add missing error checks

Ajnasz · Apr 22, 2024 · 5d3b870 · 5d3b870
1 parent aff9b9a
commit 5d3b870
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/internal/models/entrykey_test.go b/internal/models/entrykey_test.go
@@ -231,6 +231,12 @@ func Test_EntryKeyModel_Delete(t *testing.T) {
 	defer db.Close()
 
 	uid, entryKeyUUID, err := createTestEntryKey(ctx, tx)
+	if err != nil {
+		if err := tx.Rollback(); err != nil {
+			t.Errorf("rollback failed: %v", err)
+		}
+		t.Fatal(err)
+	}
 
 	model := &EntryKeyModel{}
 
@@ -410,6 +416,13 @@ func Test_EntryKeyModel_UseTx(t *testing.T) {
 
 	uid, entryKeyUUID, err := createTestEntryKey(ctx, tx)
 
+	if err != nil {
+		if err := tx.Rollback(); err != nil {
+			t.Errorf("rollback failed: %v", err)
+		}
+		t.Fatal(err)
+	}
+
 	model := &EntryKeyModel{}
 
 	if err := model.SetMaxReads(ctx, tx, entryKeyUUID, 2); err != nil {

diff --git a/internal/services/entrykeymanager.go b/internal/services/entrykeymanager.go
@@ -51,6 +51,13 @@ func (e *EntryKeyManager) Create(ctx context.Context, entryUUID string, dek key.
 
 	entryKey, k, err := e.CreateWithTx(ctx, tx, entryUUID, dek, expire, maxRead)
 
+	if err != nil {
+		if rollbackErr := tx.Rollback(); rollbackErr != nil {
+			return nil, nil, errors.Join(err, rollbackErr)
+		}
+		return nil, nil, err
+	}
+
 	if err := tx.Commit(); err != nil {
 		return nil, nil, err
 	}