Skip to content

Commit b84d99d

Browse files
authored
Merge pull request #142 from estroz/chore/remove-non-std-errors
*: remove non-std library errors packages
2 parents 7c959bd + 5752b6f commit b84d99d

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ require (
88
github.com/go-git/go-git/v5 v5.1.0
99
github.com/go-logr/logr v0.3.0
1010
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
11-
github.com/pkg/errors v0.9.1
1211
github.com/prometheus/client_golang v1.7.1
1312
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
1413
golang.org/x/tools v0.0.0-20200714190737-9048b464a08d
15-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
1614
k8s.io/api v0.19.2
1715
k8s.io/apimachinery v0.19.2
1816
k8s.io/cli-runtime v0.19.2

pkg/test/golden/validator.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ package golden
1919
import (
2020
"bytes"
2121
"context"
22+
"fmt"
2223
"io/ioutil"
2324
"os"
2425
"os/exec"
2526
"path/filepath"
2627
"strings"
2728
"testing"
2829

29-
"golang.org/x/xerrors"
3030
"k8s.io/apimachinery/pkg/api/meta"
3131
"k8s.io/apimachinery/pkg/runtime"
3232
"k8s.io/apimachinery/pkg/runtime/serializer/json"
@@ -294,30 +294,30 @@ func diffFiles(t *testing.T, expectedPath, actual string) error {
294294

295295
actualTmp, err := writeTmp(actual)
296296
if err != nil {
297-
return xerrors.Errorf("write actual yaml to temp file failed: %w", err)
297+
return fmt.Errorf("write actual yaml to temp file failed: %w", err)
298298
}
299299
t.Logf("Wrote actual to %s", actualTmp)
300300

301301
// pls to use unified diffs, kthxbai?
302302
cmd := exec.Command("diff", "-u", expectedPath, actualTmp)
303303
stdout, err := cmd.StdoutPipe()
304304
if err != nil {
305-
return xerrors.Errorf("set up stdout pipe from diff failed: %w", err)
305+
return fmt.Errorf("set up stdout pipe from diff failed: %w", err)
306306
}
307307

308308
if err := cmd.Start(); err != nil {
309-
return xerrors.Errorf("start command failed: %w", err)
309+
return fmt.Errorf("start command failed: %w", err)
310310
}
311311

312312
diff, err := ioutil.ReadAll(stdout)
313313
if err != nil {
314-
return xerrors.Errorf("read from diff stdout failed: %w", err)
314+
return fmt.Errorf("read from diff stdout failed: %w", err)
315315
}
316316

317317
if err := cmd.Wait(); err != nil {
318318
exitErr, ok := err.(*exec.ExitError)
319319
if !ok {
320-
return xerrors.Errorf("wait for command to finish failed: %w", err)
320+
return fmt.Errorf("wait for command to finish failed: %w", err)
321321
}
322322
t.Logf("Diff exited %s", exitErr)
323323
}

utils/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package utils
22

33
import (
44
"context"
5+
"fmt"
56
"net"
67
"strings"
78

8-
"github.com/pkg/errors"
99
corev1 "k8s.io/api/core/v1"
1010
apierrors "k8s.io/apimachinery/pkg/api/errors"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,7 +45,7 @@ func FindDNSClusterIP(ctx context.Context, c client.Client) (string, error) {
4545

4646
ip := net.ParseIP(kubernetesService.Spec.ClusterIP)
4747
if ip == nil {
48-
return "", errors.Errorf("cannot parse kubernetes ClusterIP %q", kubernetesService.Spec.ClusterIP)
48+
return "", fmt.Errorf("cannot parse kubernetes ClusterIP %q", kubernetesService.Spec.ClusterIP)
4949
}
5050

5151
// The kubernetes Service ClusterIP is the 1st IP in the Service Subnet.

0 commit comments

Comments
 (0)