From 45bd588770846933ec6ff3dce3bb53b721d3107e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 4 Jul 2023 23:01:32 -0600
Subject: [PATCH] Stop using `github.com/pkg/errors` directly
---
controllers/upload_controller/upload_controller.go | 2 +-
go.mod | 2 +-
matrix/auth.go | 2 +-
matrix/client_server.go | 2 +-
storage/datastore/datastore.go | 2 +-
storage/datastore/ds_s3/s3_store.go | 2 +-
util/identifiers.go | 3 +--
7 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/controllers/upload_controller/upload_controller.go b/controllers/upload_controller/upload_controller.go
index 15e912b7..c2ad26b6 100644
--- a/controllers/upload_controller/upload_controller.go
+++ b/controllers/upload_controller/upload_controller.go
@@ -1,6 +1,7 @@
package upload_controller
import (
+ "errors"
"io"
"strconv"
"time"
@@ -10,7 +11,6 @@ import (
"github.com/turt2live/matrix-media-repo/util/stream_util"
"github.com/patrickmn/go-cache"
- "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/turt2live/matrix-media-repo/common"
"github.com/turt2live/matrix-media-repo/common/rcontext"
diff --git a/go.mod b/go.mod
index 2f845371..b7a377b2 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
github.com/minio/minio-go/v6 v6.0.57
github.com/olebedev/emitter v0.0.0-20230411050614-349169dec2ba
github.com/patrickmn/go-cache v2.1.0+incompatible
- github.com/pkg/errors v0.9.1
+ github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
github.com/rubyist/circuitbreaker v2.2.1+incompatible
diff --git a/matrix/auth.go b/matrix/auth.go
index c89b686a..df688f02 100644
--- a/matrix/auth.go
+++ b/matrix/auth.go
@@ -1,10 +1,10 @@
package matrix
import (
+ "errors"
"net/url"
"time"
- "github.com/pkg/errors"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/util"
)
diff --git a/matrix/client_server.go b/matrix/client_server.go
index 66a0d5d4..3588ebc9 100644
--- a/matrix/client_server.go
+++ b/matrix/client_server.go
@@ -3,11 +3,11 @@ package matrix
import (
"bytes"
"encoding/json"
+ "errors"
"io"
"net/http"
"time"
- "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/util/stream_util"
diff --git a/storage/datastore/datastore.go b/storage/datastore/datastore.go
index f482e77e..719a3783 100644
--- a/storage/datastore/datastore.go
+++ b/storage/datastore/datastore.go
@@ -1,13 +1,13 @@
package datastore
import (
+ "errors"
"fmt"
"io"
"github.com/getsentry/sentry-go"
"github.com/turt2live/matrix-media-repo/common"
- "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/turt2live/matrix-media-repo/common/config"
"github.com/turt2live/matrix-media-repo/common/rcontext"
diff --git a/storage/datastore/ds_s3/s3_store.go b/storage/datastore/ds_s3/s3_store.go
index df7b3725..3a3914e8 100644
--- a/storage/datastore/ds_s3/s3_store.go
+++ b/storage/datastore/ds_s3/s3_store.go
@@ -1,6 +1,7 @@
package ds_s3
import (
+ "errors"
"fmt"
"io"
"os"
@@ -11,7 +12,6 @@ import (
"github.com/turt2live/matrix-media-repo/util/ids"
"github.com/turt2live/matrix-media-repo/util/stream_util"
- "github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"github.com/turt2live/matrix-media-repo/common/config"
diff --git a/util/identifiers.go b/util/identifiers.go
index 7caf0cda..f10403de 100644
--- a/util/identifiers.go
+++ b/util/identifiers.go
@@ -1,9 +1,8 @@
package util
import (
+ "errors"
"strings"
-
- "github.com/pkg/errors"
)
func SplitMxc(mxc string) (string, string, error) {
--
GitLab