From 7dbb8566b32a0d475dc7ac63861dc8f83b418db9 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter.kurfer@rwe.com>
Date: Thu, 23 Feb 2023 09:39:03 +0100
Subject: [PATCH] refactor(sql): replace multierr with errors.Join

---
 go.mod                  | 2 +-
 protocols/sql/select.go | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index d9cdc8f..f821cc3 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/testcontainers/testcontainers-go v0.17.0
 	github.com/valyala/bytebufferpool v1.0.0
-	go.uber.org/multierr v1.9.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
 	golang.org/x/sync v0.1.0
@@ -55,6 +54,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/goleak v1.1.12 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/net v0.6.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
diff --git a/protocols/sql/select.go b/protocols/sql/select.go
index e02a70f..1b8a108 100644
--- a/protocols/sql/select.go
+++ b/protocols/sql/select.go
@@ -3,8 +3,7 @@ package sql
 import (
 	"context"
 	"database/sql"
-
-	"go.uber.org/multierr"
+	"errors"
 
 	"code.icb4dc0.de/prskr/nurse/check"
 	"code.icb4dc0.de/prskr/nurse/config"
@@ -66,8 +65,10 @@ func (s *SelectCheck) executeAttempt(ctx context.Context) (err error) {
 		return err
 	}
 
-	defer multierr.AppendInvoke(&err, multierr.Close(rows))
-	defer multierr.AppendInvoke(&err, multierr.Invoke(rows.Err))
+	defer func() {
+		err = errors.Join(rows.Close(), rows.Err())
+	}()
+
 
 	return s.validators.Validate(rows)
 }