chore: upgrade and prune dependencies (#439)

Author: alnr

Makefile

@@ -13,7 +13,7 @@ docs/cli: .bin/clidoc
 	clidoc .
 
 .bin/cli: go.mod Makefile
-	go build -o .bin/cli -tags sqlite github.com/ory/cli
+	go build -o .bin/cli github.com/ory/cli
 
 .bin/golangci-lint-$(GOLANGCI_LINT_VERSION):
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b .bin v$(GOLANGCI_LINT_VERSION)
@@ -28,11 +28,11 @@ lint: .bin/golangci-lint-$(GOLANGCI_LINT_VERSION)
 
 .PHONY: install
 install:
-	go install -tags sqlite .
+	go install .
 
 .PHONY: refresh
 refresh:
-	UPDATE_SNAPSHOTS=true go test -tags sqlite,json1,refresh ./...
+	UPDATE_SNAPSHOTS=true go test -tags=refresh ./...
 
 # Formats the code
 .PHONY: format

cmd/cloudx/oauth2/client_test.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gofrs/uuid/v3"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/tidwall/gjson"

cmd/cloudx/proxy/helpers.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/go-jose/go-jose/v3"
 	"github.com/go-jose/go-jose/v3/jwt"
-	"github.com/gofrs/uuid/v3"
+	"github.com/gofrs/uuid"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/pkg/errors"
 	"github.com/rs/cors"
@@ -376,7 +376,7 @@ func checkSession(c *retryablehttp.Client, r *http.Request, target *url.URL) (js
 	target.Path = path.Join(target.Path, "sessions", "whoami")
 	req, err := retryablehttp.NewRequest("GET", target.String(), nil)
 	if err != nil {
-		return nil, errors.WithStack(herodot.ErrInternalServerError)
+		return nil, errors.WithStack(herodot.ErrInternalServerError())
 	}
 
 	req.Header.Set("Cookie", r.Header.Get("Cookie"))
@@ -387,13 +387,13 @@ func checkSession(c *retryablehttp.Client, r *http.Request, target *url.URL) (js
 
 	res, err := c.Do(req)
 	if err != nil {
-		return nil, errors.WithStack(herodot.ErrInternalServerError.WithReasonf("Unable to call session checker: %s", err).WithWrap(err))
+		return nil, errors.WithStack(herodot.ErrInternalServerError().WithReasonf("Unable to call session checker: %s", err).WithWrap(err))
 	}
 	defer res.Body.Close()
 
 	var body json.RawMessage
 	if err := json.NewDecoder(res.Body).Decode(&body); err != nil {
-		return nil, errors.WithStack(herodot.ErrInternalServerError.WithReasonf("Unable to decode session to JSON: %s", err).WithWrap(err))
+		return nil, errors.WithStack(herodot.ErrInternalServerError().WithReasonf("Unable to decode session to JSON: %s", err).WithWrap(err))
 	}
 
 	return body, nil