cleanup: use errors.Join

Signed-off-by: Stephan Renatus <[email protected]>
open-policy-agent · Feb 27, 2024 · d978deb · d978deb
1 parent 28a14a3
commit d978deb
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 63 deletions.
diff --git a/internal/errors/join.go b/internal/errors/join.go
diff --git a/internal/errors/join_go1.20.go b/internal/errors/join_go1.20.go
diff --git a/plugins/discovery/discovery.go b/plugins/discovery/discovery.go
@@ -8,6 +8,7 @@ package discovery
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -22,7 +23,6 @@ import (
 	"github.com/open-policy-agent/opa/hooks"
 	bundleUtils "github.com/open-policy-agent/opa/internal/bundle"
 	cfg "github.com/open-policy-agent/opa/internal/config"
-	"github.com/open-policy-agent/opa/internal/errors"
 	"github.com/open-policy-agent/opa/keys"
 	"github.com/open-policy-agent/opa/logging"
 	"github.com/open-policy-agent/opa/metrics"

diff --git a/plugins/plugins.go b/plugins/plugins.go
@@ -7,6 +7,7 @@ package plugins
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	mr "math/rand"
 	"sync"
@@ -24,7 +25,6 @@ import (
 	"github.com/open-policy-agent/opa/hooks"
 	bundleUtils "github.com/open-policy-agent/opa/internal/bundle"
 	cfg "github.com/open-policy-agent/opa/internal/config"
-	"github.com/open-policy-agent/opa/internal/errors"
 	initload "github.com/open-policy-agent/opa/internal/runtime/init"
 	"github.com/open-policy-agent/opa/keys"
 	"github.com/open-policy-agent/opa/loader"

diff --git a/server/certs.go b/server/certs.go
@@ -9,14 +9,14 @@ import (
 	"crypto/sha256"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"time"
 
 	"github.com/fsnotify/fsnotify"
 
-	"github.com/open-policy-agent/opa/internal/errors"
 	"github.com/open-policy-agent/opa/internal/pathwatcher"
 	"github.com/open-policy-agent/opa/logging"
 )