From 3a893bbfb6551791665459f8d34ea4096bbc95ca Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Wed, 10 May 2023 13:36:08 +0200
Subject: [PATCH] Replace "errorx".First => "errors".Join

---
 cmd/server.go                                   | 6 +++---
 internal/dis/component/sql/provision.go         | 3 +--
 internal/dis/component/triplestore/provision.go | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmd/server.go b/cmd/server.go
index 67b6841..c2fa803 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"net"
 	"net/http"
 
@@ -8,7 +9,6 @@ import (
 	"github.com/FAU-CDI/wisski-distillery/internal/cli"
 	"github.com/rs/zerolog"
 	"github.com/tkw1536/goprogram/exit"
-	"github.com/tkw1536/pkglib/errorx"
 )
 
 // Server is the 'server' command
@@ -105,11 +105,11 @@ func (s server) Run(context wisski_distillery.Context) error {
 
 	go func() {
 		<-context.Context.Done()
-	
+
 		zerolog.Ctx(context.Context).Info().Msg("shutting down server")
 		publicS.Shutdown(context.Context)
 		internalS.Shutdown(context.Context)
 	}()
 
-	return errServerListen.Wrap(errorx.First(<-internalC, <-publicC, err))
+	return errServerListen.Wrap(errors.Join(<-internalC, <-publicC, err))
 }
diff --git a/internal/dis/component/sql/provision.go b/internal/dis/component/sql/provision.go
index 88a1747..c2c6100 100644
--- a/internal/dis/component/sql/provision.go
+++ b/internal/dis/component/sql/provision.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 
 	"github.com/FAU-CDI/wisski-distillery/internal/models"
-	"github.com/tkw1536/pkglib/errorx"
 	"github.com/tkw1536/pkglib/sqlx"
 )
 
@@ -19,7 +18,7 @@ func (sql *SQL) Provision(ctx context.Context, instance models.Instance, domain
 
 // Purge purges sql-specific resources for the given instance
 func (sql *SQL) Purge(ctx context.Context, instance models.Instance, domain string) error {
-	return errorx.First(
+	return errors.Join(
 		sql.PurgeDatabase(instance.SqlDatabase),
 		sql.PurgeUser(ctx, instance.SqlUsername),
 	)
diff --git a/internal/dis/component/triplestore/provision.go b/internal/dis/component/triplestore/provision.go
index 75046d1..3066393 100644
--- a/internal/dis/component/triplestore/provision.go
+++ b/internal/dis/component/triplestore/provision.go
@@ -3,6 +3,7 @@ package triplestore
 import (
 	"bytes"
 	"context"
+	"errors"
 	"net/http"
 
 	_ "embed"
@@ -10,7 +11,6 @@ import (
 	"github.com/FAU-CDI/wisski-distillery/internal/models"
 	"github.com/FAU-CDI/wisski-distillery/pkg/unpack"
 	"github.com/tkw1536/goprogram/exit"
-	"github.com/tkw1536/pkglib/errorx"
 )
 
 var errTripleStoreFailedRepository = exit.Error{
@@ -26,7 +26,7 @@ func (ts *Triplestore) Provision(ctx context.Context, instance models.Instance,
 }
 
 func (ts *Triplestore) Purge(ctx context.Context, instance models.Instance, domain string) error {
-	return errorx.First(
+	return errors.Join(
 		ts.PurgeRepo(ctx, instance.GraphDBRepository),
 		ts.PurgeUser(ctx, instance.GraphDBUsername),
 	)