From a1075bf6b8604c2b671d36e9e00224e13148232b Mon Sep 17 00:00:00 2001 From: Indradhanush Gupta Date: Fri, 11 Jun 2021 13:49:21 +0530 Subject: [PATCH] all: Replace github.com/pkg/errors with github.com/cockroachdb/errors (#21684) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In this commit, along with moving to github.com/cockroachdb/errors, we update a few tests and some error checks in non-test code. List of files that have code changes apart from changes in the error package import: enterprise/internal/batches/sources/gitlab.go enterprise/internal/batches/sources/gitlab_test.go internal/conf/client.go internal/store/store_test.go Co-authored-by: ᴜɴᴋɴᴡᴏɴ --- cmd/frontend/backend/inventory.go | 2 +- cmd/frontend/backend/repos.go | 2 +- cmd/frontend/backend/repos_vcs.go | 2 +- cmd/frontend/backend/user_emails.go | 2 +- .../affiliated_repositories_connection.go | 2 +- .../graphqlbackend/external_service.go | 3 +- .../graphqlbackend/external_services.go | 2 +- cmd/frontend/graphqlbackend/git_tree_entry.go | 2 +- cmd/frontend/graphqlbackend/org.go | 2 +- .../graphqlbackend/org_invitations.go | 2 +- cmd/frontend/graphqlbackend/rate_limit.go | 2 +- cmd/frontend/graphqlbackend/repository.go | 2 +- cmd/frontend/graphqlbackend/search.go | 2 +- cmd/frontend/graphqlbackend/search_results.go | 2 +- .../graphqlbackend/search_suggestions.go | 2 +- .../set_external_service_repos.go | 2 +- cmd/frontend/graphqlbackend/site_admin.go | 2 +- .../graphqlbackend/status_messages.go | 2 +- .../hubspot/hubspotutil/hubspotutil.go | 2 +- cmd/frontend/internal/app/badge.go | 2 +- cmd/frontend/internal/app/debug.go | 2 +- cmd/frontend/internal/app/ui/handlers.go | 2 +- cmd/frontend/internal/app/ui/landing.go | 2 +- .../internal/app/updatecheck/handler.go | 2 +- cmd/frontend/internal/auth/override_test.go | 2 +- .../auth/userpasswd/reset_password.go | 2 +- cmd/frontend/internal/cli/config.go | 2 +- cmd/frontend/internal/cloneurls/clone_urls.go | 2 +- .../internal/handlerutil/error_reporting.go | 2 +- cmd/frontend/internal/handlerutil/handler.go | 2 +- cmd/frontend/internal/highlight/highlight.go | 2 +- cmd/frontend/internal/httpapi/internal.go | 2 +- cmd/frontend/internal/httpapi/repo_shield.go | 2 +- cmd/frontend/internal/session/session.go | 2 +- cmd/frontend/internal/vfsutil/gitserver.go | 2 +- cmd/frontend/internal/vfsutil/zip.go | 2 +- cmd/frontend/registry/client/client.go | 2 +- cmd/gitserver/main.go | 2 +- cmd/gitserver/server/cleanup.go | 2 +- cmd/gitserver/server/cleanup_test.go | 2 +- cmd/gitserver/server/patch.go | 2 +- cmd/gitserver/server/repo_info.go | 2 +- cmd/gitserver/server/server.go | 2 +- cmd/gitserver/server/server_test.go | 2 +- cmd/gitserver/server/serverutil.go | 2 +- cmd/gitserver/server/ssh_agent.go | 2 +- cmd/gitserver/server/vcs_syncer.go | 2 +- cmd/query-runner/all_saved_queries.go | 2 +- cmd/query-runner/email.go | 2 +- cmd/query-runner/graphql.go | 2 +- cmd/query-runner/main.go | 2 +- .../queryrunnerapi/queryrunnerapi.go | 2 +- cmd/repo-updater/repoupdater/observability.go | 2 +- cmd/repo-updater/repoupdater/server.go | 2 +- cmd/searcher/search/search.go | 2 +- cmd/server/shared/copy.go | 2 +- cmd/server/shared/nginx.go | 2 +- cmd/symbols/internal/symbols/parse.go | 2 +- dev/gqltest/access_token_test.go | 2 +- dev/repogen/main.go | 2 +- dev/sg/config.go | 2 +- dev/sg/go.mod | 2 +- dev/sg/go.sum | 218 ++++++++++++++-- dev/sg/migration.go | 2 +- dev/sg/run.go | 2 +- dev/sg/util.go | 2 +- dev/src-expose/serve.go | 2 +- dev/src-expose/snapshot.go | 2 +- doc/cli/references/doc.go | 2 +- .../executor/internal/command/firecracker.go | 2 +- .../cmd/executor/internal/worker/handler.go | 2 +- .../cmd/executor/internal/worker/workspace.go | 2 +- .../internal/auth/githuboauth/session.go | 2 +- .../internal/auth/githuboauth/session_test.go | 2 +- .../internal/auth/gitlaboauth/login.go | 2 +- .../internal/auth/gitlaboauth/session.go | 2 +- .../internal/auth/oauth/middleware.go | 2 +- .../internal/auth/openidconnect/provider.go | 2 +- .../internal/auth/openidconnect/session.go | 2 +- .../internal/auth/openidconnect/user.go | 2 +- .../frontend/internal/auth/saml/provider.go | 2 +- .../frontend/internal/auth/saml/session.go | 2 +- .../cmd/frontend/internal/auth/saml/user.go | 2 +- .../internal/authz/resolvers/resolver.go | 2 +- .../internal/codeintel/httpapi/auth_github.go | 2 +- .../codeintel/resolvers/commit_checker.go | 2 +- .../internal/codeintel/resolvers/exists.go | 2 +- .../codeintel/resolvers/graphql/query.go | 2 +- .../resolvers/graphql/query_documentation.go | 2 +- .../codeintel/resolvers/graphql/resolver.go | 2 +- .../codeintel/resolvers/query_definitions.go | 2 +- .../codeintel/resolvers/query_diagnostics.go | 2 +- .../codeintel/resolvers/query_hover.go | 2 +- .../codeintel/resolvers/query_ranges.go | 2 +- .../codeintel/resolvers/query_references.go | 2 +- .../codeintel/resolvers/query_util.go | 2 +- .../internal/dotcom/billing/customers.go | 2 +- .../productsubscription/invoices_graphql.go | 2 +- .../dotcom/productsubscription/licenses_db.go | 2 +- .../productsubscription/subscriptions_db.go | 2 +- .../subscriptions_graphql.go | 2 +- .../executor/internal_proxy_handler.go | 2 +- .../internal/registry/extensions_db.go | 2 +- .../internal/worker/handler.go | 2 +- .../internal/authz/perms_syncer.go | 2 +- .../internal/authz/perms_syncer_test.go | 2 +- .../internal/codeintel/commitgraph/updater.go | 2 +- .../indexing/dependency_indexing_scheduler.go | 2 +- .../codeintel/indexing/index_scheduler.go | 2 +- .../indexing/indexability_updater.go | 2 +- .../codeintel/janitor/abandoned_uploads.go | 2 +- .../codeintel/janitor/deleted_repositories.go | 2 +- .../internal/codeintel/janitor/hard_delete.go | 2 +- .../codeintel/janitor/record_expirer.go | 2 +- .../codeintel/janitor/unknown_commits.go | 2 +- enterprise/internal/authz/authz.go | 2 +- enterprise/internal/authz/authz_test.go | 2 +- .../batches/background/bulk_processor.go | 2 +- .../background/site_credential_migrator.go | 2 +- .../batches/background/spec_expire.go | 2 +- .../background/user_credential_migrator.go | 2 +- .../internal/batches/reconciler/executor.go | 2 +- .../batches/reconciler/executor_test.go | 2 +- .../batches/resolvers/batch_change.go | 2 +- .../internal/batches/resolvers/batch_spec.go | 2 +- .../internal/batches/resolvers/changeset.go | 2 +- .../resolvers/changeset_apply_preview.go | 2 +- .../changeset_apply_preview_connection.go | 2 +- ...changeset_apply_preview_connection_test.go | 2 +- .../internal/batches/resolvers/credential.go | 2 +- .../internal/batches/resolvers/resolver.go | 2 +- .../batches/resolvers/resolver_test.go | 2 +- enterprise/internal/batches/search/text.go | 2 +- .../internal/batches/service/service.go | 2 +- .../service/service_apply_batch_change.go | 2 +- .../batches/sources/bitbucketserver.go | 2 +- enterprise/internal/batches/sources/fake.go | 2 +- enterprise/internal/batches/sources/github.go | 2 +- enterprise/internal/batches/sources/gitlab.go | 4 +- .../internal/batches/sources/gitlab_test.go | 12 +- .../internal/batches/sources/sources.go | 2 +- .../batches/state/changeset_history.go | 2 +- enterprise/internal/batches/state/state.go | 2 +- .../internal/batches/store/batch_changes.go | 2 +- .../internal/batches/store/batch_specs.go | 2 +- .../batches/store/changeset_events.go | 2 +- .../internal/batches/store/changeset_specs.go | 2 +- .../internal/batches/store/changesets.go | 2 +- enterprise/internal/batches/store/store.go | 2 +- enterprise/internal/batches/syncer/syncer.go | 2 +- .../internal/batches/syncer/syncer_test.go | 2 +- .../batches/testing/mock_sync_state.go | 2 +- .../internal/batches/types/changeset.go | 2 +- .../internal/batches/types/changeset_event.go | 2 +- .../internal/batches/types/changeset_spec.go | 2 +- .../types/changeset_spec_description.go | 2 +- .../batches/types/scheduler/window/config.go | 2 +- .../batches/types/scheduler/window/rate.go | 2 +- .../types/scheduler/window/schedule.go | 2 +- .../batches/types/scheduler/window/window.go | 2 +- .../internal/batches/types/site_credential.go | 2 +- .../batches/webhooks/bitbucketserver.go | 2 +- .../internal/batches/webhooks/gitlab.go | 2 +- .../internal/batches/webhooks/gitlab_test.go | 2 +- .../internal/batches/webhooks/webhooks.go | 2 +- .../codeintel/autoindex/enqueuer/enqueuer.go | 2 +- .../autoindex/enqueuer/index_records.go | 2 +- .../internal/codeintel/gitserver/client.go | 2 +- .../codeintel/stores/dbstore/errors.go | 2 +- .../stores/dbstore/migration/committed_at.go | 2 +- .../stores/uploadstore/gcs_client.go | 2 +- .../codeintel/stores/uploadstore/s3_client.go | 2 +- .../stores/uploadstore/s3_client_test.go | 2 +- .../codemonitors/background/graphql.go | 2 +- enterprise/internal/database/authz.go | 2 +- enterprise/internal/database/perms_store.go | 2 +- .../background/historical_enqueuer.go | 2 +- .../insights/background/insight_enqueuer.go | 2 +- .../background/queryrunner/graphql.go | 2 +- .../background/queryrunner/work_handler.go | 2 +- .../insights/discovery/all_repos_iterator.go | 2 +- enterprise/internal/insights/store/store.go | 2 +- enterprise/internal/licensing/features.go | 2 +- enterprise/internal/licensing/licensing.go | 2 +- enterprise/internal/licensing/plans.go | 2 +- go.mod | 4 +- go.sum | 5 +- internal/authz/bitbucketserver/authz.go | 2 +- internal/authz/bitbucketserver/provider.go | 2 +- internal/authz/github/github.go | 2 +- internal/authz/gitlab/oauth.go | 2 +- internal/authz/gitlab/sudo.go | 2 +- internal/authz/header.go | 2 +- internal/authz/perforce/perforce.go | 2 +- internal/authz/perms.go | 2 +- .../cmd/precise-code-intel-tester/upload.go | 2 +- internal/cmd/tracking-issue/issue_loader.go | 2 +- internal/cmd/tracking-issue/main.go | 2 +- internal/cmd/tracking-issue/update.go | 2 +- internal/comby/comby.go | 2 +- internal/conf/client.go | 11 +- internal/conf/client_test.go | 7 +- internal/conf/reposource/common.go | 2 +- internal/conf/server.go | 2 +- internal/conf/store.go | 2 +- internal/database/access_tokens.go | 2 +- internal/database/authenticator.go | 2 +- internal/database/authenticator_test.go | 2 +- internal/database/batch/batch.go | 2 +- .../database/dbcache/cached_default_repos.go | 2 +- internal/database/dbconn/dbconn.go | 2 +- internal/database/dbconn/migration.go | 2 +- internal/database/dbtesting/dbtesting.go | 2 +- internal/database/dbutil/dbutil.go | 2 +- internal/database/event_logs.go | 2 +- internal/database/external_services.go | 2 +- internal/database/feature_flags.go | 2 +- internal/database/gitserver_repos.go | 2 +- internal/database/namespaces.go | 2 +- internal/database/oob_migrate.go | 2 +- internal/database/phabricator.go | 2 +- internal/database/query/query_test.go | 2 +- internal/database/repos.go | 2 +- internal/database/repos_perm.go | 2 +- internal/database/saved_queries.go | 2 +- internal/database/saved_searches.go | 2 +- internal/database/schemadoc/main.go | 2 +- internal/database/user_credentials.go | 2 +- internal/database/user_credentials_test.go | 2 +- internal/database/users.go | 2 +- internal/diskcache/cache.go | 2 +- internal/encryption/awskms/aws_kms.go | 2 +- internal/encryption/rsa.go | 2 +- internal/endpoint/endpoint.go | 2 +- internal/errcode/presentation_error_test.go | 2 +- internal/extsvc/awscodecommit/client.go | 2 +- internal/extsvc/bitbucketcloud/client.go | 2 +- internal/extsvc/bitbucketserver/client.go | 2 +- internal/extsvc/github/common.go | 2 +- internal/extsvc/github/v3.go | 2 +- internal/extsvc/github/v4.go | 2 +- internal/extsvc/github/v4_test.go | 2 +- internal/extsvc/gitlab/client.go | 2 +- internal/extsvc/gitlab/merge_requests.go | 2 +- internal/extsvc/gitlab/notes.go | 2 +- internal/extsvc/gitlab/pipelines.go | 2 +- internal/extsvc/gitlab/repositories.go | 2 +- .../extsvc/gitlab/resource_state_events.go | 2 +- internal/extsvc/gitlab/webhooks/events.go | 2 +- .../extsvc/gitlab/webhooks/merge_requests.go | 2 +- internal/extsvc/phabricator/client.go | 2 +- internal/extsvc/types.go | 2 +- internal/gitserver/client.go | 2 +- internal/gitserver/client_test.go | 2 +- internal/gqltestutil/access_token.go | 2 +- internal/gqltestutil/client.go | 2 +- internal/gqltestutil/external_service.go | 2 +- internal/gqltestutil/git_blob.go | 2 +- internal/gqltestutil/helper.go | 2 +- internal/gqltestutil/organization.go | 2 +- internal/gqltestutil/permissions.go | 2 +- internal/gqltestutil/repository.go | 2 +- internal/gqltestutil/search.go | 2 +- internal/gqltestutil/search_context.go | 2 +- internal/gqltestutil/settings.go | 2 +- internal/gqltestutil/user.go | 2 +- internal/httpcli/client.go | 2 +- internal/inventory/entries.go | 2 +- internal/inventory/inventory.go | 2 +- internal/jsonc/jsonc.go | 2 +- internal/repos/awscodecommit.go | 2 +- internal/repos/bitbucketcloud.go | 2 +- internal/repos/bitbucketserver.go | 2 +- internal/repos/clone_url.go | 2 +- internal/repos/github.go | 2 +- internal/repos/github_test.go | 2 +- internal/repos/gitlab.go | 2 +- internal/repos/gitolite.go | 2 +- internal/repos/integration_test.go | 2 +- internal/repos/other.go | 2 +- internal/repos/phabricator.go | 2 +- internal/repos/sources.go | 2 +- internal/repos/status_messages.go | 2 +- internal/repos/status_messages_test.go | 2 +- internal/repos/store.go | 2 +- internal/repos/syncer.go | 2 +- internal/repos/types.go | 2 +- internal/repoupdater/client.go | 2 +- internal/search/query/parser_test.go | 2 +- internal/search/query/validate.go | 2 +- internal/search/repos/repos.go | 2 +- internal/search/run/aggregator.go | 2 +- internal/search/run/commit.go | 2 +- internal/search/run/symbol.go | 2 +- internal/search/run/textsearch.go | 2 +- internal/search/run/textsearch_test.go | 2 +- internal/search/run/zoekt.go | 2 +- internal/search/searcher/client.go | 2 +- internal/slack/slack.go | 2 +- internal/src-cli/version.go | 2 +- internal/store/retry_test.go | 2 +- internal/store/store.go | 2 +- internal/store/store_test.go | 4 +- internal/store/zipcache.go | 2 +- internal/symbols/client.go | 2 +- internal/tracer/tracer.go | 2 +- internal/vcs/git/blame.go | 2 +- internal/vcs/git/blob.go | 2 +- internal/vcs/git/commits.go | 2 +- internal/vcs/git/diff.go | 2 +- internal/vcs/git/diff_search.go | 2 +- internal/vcs/git/exec.go | 2 +- internal/vcs/git/merge_base.go | 2 +- internal/vcs/git/object.go | 2 +- internal/vcs/git/refs.go | 2 +- internal/vcs/git/revisions.go | 2 +- internal/vcs/git/tree.go | 2 +- internal/workerutil/worker.go | 2 +- lib/codeintel/lsif/conversion/correlate.go | 2 +- lib/codeintel/lsif/conversion/group.go | 2 +- lib/codeintel/pathexistence/git.go | 2 +- lib/codeintel/tools/lsif-index-tester/main.go | 2 +- lib/codeintel/upload/indexer_name.go | 2 +- lib/codeintel/upload/request.go | 2 +- lib/go.mod | 4 +- lib/go.sum | 244 ++++++++++++++---- ui/assets/load_manifest_dev.go | 2 +- ui/assets/load_manifest_dist.go | 2 +- 328 files changed, 747 insertions(+), 403 deletions(-) diff --git a/cmd/frontend/backend/inventory.go b/cmd/frontend/backend/inventory.go index 70833116307..031c98c0ad3 100644 --- a/cmd/frontend/backend/inventory.go +++ b/cmd/frontend/backend/inventory.go @@ -8,8 +8,8 @@ import ( "io/fs" "strconv" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/env" diff --git a/cmd/frontend/backend/repos.go b/cmd/frontend/backend/repos.go index d74b6938e25..ca6b2bb7bb8 100644 --- a/cmd/frontend/backend/repos.go +++ b/cmd/frontend/backend/repos.go @@ -6,9 +6,9 @@ import ( "net/url" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/frontend/backend/repos_vcs.go b/cmd/frontend/backend/repos_vcs.go index 643dd34aea1..b3e53801b56 100644 --- a/cmd/frontend/backend/repos_vcs.go +++ b/cmd/frontend/backend/repos_vcs.go @@ -3,8 +3,8 @@ package backend import ( "context" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/types" diff --git a/cmd/frontend/backend/user_emails.go b/cmd/frontend/backend/user_emails.go index 6e759643cbe..e3a95bd4a79 100644 --- a/cmd/frontend/backend/user_emails.go +++ b/cmd/frontend/backend/user_emails.go @@ -7,8 +7,8 @@ import ( "fmt" "net/url" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" diff --git a/cmd/frontend/graphqlbackend/affiliated_repositories_connection.go b/cmd/frontend/graphqlbackend/affiliated_repositories_connection.go index e3f4008c1bf..a43a11fa67e 100644 --- a/cmd/frontend/graphqlbackend/affiliated_repositories_connection.go +++ b/cmd/frontend/graphqlbackend/affiliated_repositories_connection.go @@ -6,8 +6,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/graphqlbackend/external_service.go b/cmd/frontend/graphqlbackend/external_service.go index f96977fa6fe..bc22d000911 100644 --- a/cmd/frontend/graphqlbackend/external_service.go +++ b/cmd/frontend/graphqlbackend/external_service.go @@ -5,11 +5,10 @@ import ( "fmt" "sync" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" "github.com/inconshreveable/log15" - "github.com/pkg/errors" - "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/cmd/frontend/graphqlbackend/external_services.go b/cmd/frontend/graphqlbackend/external_services.go index 4b4012319e6..2819dec2d94 100644 --- a/cmd/frontend/graphqlbackend/external_services.go +++ b/cmd/frontend/graphqlbackend/external_services.go @@ -9,10 +9,10 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" diff --git a/cmd/frontend/graphqlbackend/git_tree_entry.go b/cmd/frontend/graphqlbackend/git_tree_entry.go index fa1ff631b42..c318ef27d9c 100644 --- a/cmd/frontend/graphqlbackend/git_tree_entry.go +++ b/cmd/frontend/graphqlbackend/git_tree_entry.go @@ -11,8 +11,8 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/frontend/graphqlbackend/org.go b/cmd/frontend/graphqlbackend/org.go index ac1d3947a1c..a60c488f11b 100644 --- a/cmd/frontend/graphqlbackend/org.go +++ b/cmd/frontend/graphqlbackend/org.go @@ -3,10 +3,10 @@ package graphqlbackend import ( "context" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/suspiciousnames" diff --git a/cmd/frontend/graphqlbackend/org_invitations.go b/cmd/frontend/graphqlbackend/org_invitations.go index ae1ff1aeec6..9561455bff7 100644 --- a/cmd/frontend/graphqlbackend/org_invitations.go +++ b/cmd/frontend/graphqlbackend/org_invitations.go @@ -5,9 +5,9 @@ import ( "fmt" "net/url" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" diff --git a/cmd/frontend/graphqlbackend/rate_limit.go b/cmd/frontend/graphqlbackend/rate_limit.go index c35c54017e9..a43e4f3f2ab 100644 --- a/cmd/frontend/graphqlbackend/rate_limit.go +++ b/cmd/frontend/graphqlbackend/rate_limit.go @@ -5,12 +5,12 @@ import ( "strconv" "sync/atomic" + "github.com/cockroachdb/errors" "github.com/graphql-go/graphql/language/ast" "github.com/graphql-go/graphql/language/kinds" "github.com/graphql-go/graphql/language/parser" "github.com/graphql-go/graphql/language/visitor" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/throttled/throttled/v2" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/cmd/frontend/graphqlbackend/repository.go b/cmd/frontend/graphqlbackend/repository.go index 70d86cfd806..7b370f4e058 100644 --- a/cmd/frontend/graphqlbackend/repository.go +++ b/cmd/frontend/graphqlbackend/repository.go @@ -7,10 +7,10 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/externallink" diff --git a/cmd/frontend/graphqlbackend/search.go b/cmd/frontend/graphqlbackend/search.go index 210e06b7094..49d8f42640b 100644 --- a/cmd/frontend/graphqlbackend/search.go +++ b/cmd/frontend/graphqlbackend/search.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" + "github.com/cockroachdb/errors" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/cmd/frontend/graphqlbackend/search_results.go b/cmd/frontend/graphqlbackend/search_results.go index 38701d0d4b4..c62db134895 100644 --- a/cmd/frontend/graphqlbackend/search_results.go +++ b/cmd/frontend/graphqlbackend/search_results.go @@ -12,13 +12,13 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/honeycombio/libhoney-go" "github.com/inconshreveable/log15" "github.com/neelance/parallel" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" diff --git a/cmd/frontend/graphqlbackend/search_suggestions.go b/cmd/frontend/graphqlbackend/search_suggestions.go index df5b8548e3e..abbd1733d92 100644 --- a/cmd/frontend/graphqlbackend/search_suggestions.go +++ b/cmd/frontend/graphqlbackend/search_suggestions.go @@ -9,9 +9,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/neelance/parallel" - "github.com/pkg/errors" "github.com/sourcegraph/go-lsp" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" diff --git a/cmd/frontend/graphqlbackend/set_external_service_repos.go b/cmd/frontend/graphqlbackend/set_external_service_repos.go index 5cf66b8681c..9718a9a3d11 100644 --- a/cmd/frontend/graphqlbackend/set_external_service_repos.go +++ b/cmd/frontend/graphqlbackend/set_external_service_repos.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/cmd/frontend/graphqlbackend/site_admin.go b/cmd/frontend/graphqlbackend/site_admin.go index b8e095f49a8..b7f712119df 100644 --- a/cmd/frontend/graphqlbackend/site_admin.go +++ b/cmd/frontend/graphqlbackend/site_admin.go @@ -3,8 +3,8 @@ package graphqlbackend import ( "context" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" diff --git a/cmd/frontend/graphqlbackend/status_messages.go b/cmd/frontend/graphqlbackend/status_messages.go index fc5cd071c82..bf4987903f4 100644 --- a/cmd/frontend/graphqlbackend/status_messages.go +++ b/cmd/frontend/graphqlbackend/status_messages.go @@ -3,7 +3,7 @@ package graphqlbackend import ( "context" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" diff --git a/cmd/frontend/hubspot/hubspotutil/hubspotutil.go b/cmd/frontend/hubspot/hubspotutil/hubspotutil.go index 5c2c010d87a..fa2f37bc102 100644 --- a/cmd/frontend/hubspot/hubspotutil/hubspotutil.go +++ b/cmd/frontend/hubspot/hubspotutil/hubspotutil.go @@ -3,8 +3,8 @@ package hubspotutil import ( "log" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" diff --git a/cmd/frontend/internal/app/badge.go b/cmd/frontend/internal/app/badge.go index 21deab20c71..81f6004161c 100644 --- a/cmd/frontend/internal/app/badge.go +++ b/cmd/frontend/internal/app/badge.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" diff --git a/cmd/frontend/internal/app/debug.go b/cmd/frontend/internal/app/debug.go index 6e59c3e285e..33a0b7351d9 100644 --- a/cmd/frontend/internal/app/debug.go +++ b/cmd/frontend/internal/app/debug.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/debugproxies" diff --git a/cmd/frontend/internal/app/ui/handlers.go b/cmd/frontend/internal/app/ui/handlers.go index 39e56662f7d..8e77fe48d0a 100644 --- a/cmd/frontend/internal/app/ui/handlers.go +++ b/cmd/frontend/internal/app/ui/handlers.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" diff --git a/cmd/frontend/internal/app/ui/landing.go b/cmd/frontend/internal/app/ui/landing.go index dfe2c1f61f0..145c420f98a 100644 --- a/cmd/frontend/internal/app/ui/landing.go +++ b/cmd/frontend/internal/app/ui/landing.go @@ -6,9 +6,9 @@ import ( "github.com/inconshreveable/log15" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" "github.com/opentracing/opentracing-go/ext" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/handlerutil" diff --git a/cmd/frontend/internal/app/updatecheck/handler.go b/cmd/frontend/internal/app/updatecheck/handler.go index 05961c16bf9..fe65a388161 100644 --- a/cmd/frontend/internal/app/updatecheck/handler.go +++ b/cmd/frontend/internal/app/updatecheck/handler.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/cockroachdb/errors" "github.com/coreos/go-semver/semver" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" diff --git a/cmd/frontend/internal/auth/override_test.go b/cmd/frontend/internal/auth/override_test.go index 92ce17400a6..81c5d6a8149 100644 --- a/cmd/frontend/internal/auth/override_test.go +++ b/cmd/frontend/internal/auth/override_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/session" diff --git a/cmd/frontend/internal/auth/userpasswd/reset_password.go b/cmd/frontend/internal/auth/userpasswd/reset_password.go index 85f32212e6d..3c2f3b7d5b9 100644 --- a/cmd/frontend/internal/auth/userpasswd/reset_password.go +++ b/cmd/frontend/internal/auth/userpasswd/reset_password.go @@ -5,8 +5,8 @@ import ( "encoding/json" "net/http" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" diff --git a/cmd/frontend/internal/cli/config.go b/cmd/frontend/internal/cli/config.go index 44560a57d5b..838b7b5f634 100644 --- a/cmd/frontend/internal/cli/config.go +++ b/cmd/frontend/internal/cli/config.go @@ -11,9 +11,9 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/fsnotify/fsnotify" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/frontend/internal/cloneurls/clone_urls.go b/cmd/frontend/internal/cloneurls/clone_urls.go index ed3e9fbd84c..5cf775bb960 100644 --- a/cmd/frontend/internal/cloneurls/clone_urls.go +++ b/cmd/frontend/internal/cloneurls/clone_urls.go @@ -5,7 +5,7 @@ import ( neturl "net/url" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/reposource" diff --git a/cmd/frontend/internal/handlerutil/error_reporting.go b/cmd/frontend/internal/handlerutil/error_reporting.go index 8fbedbcbfc8..eab3c25a77d 100644 --- a/cmd/frontend/internal/handlerutil/error_reporting.go +++ b/cmd/frontend/internal/handlerutil/error_reporting.go @@ -9,10 +9,10 @@ import ( "reflect" "strings" + "github.com/cockroachdb/errors" "github.com/getsentry/raven-go" "github.com/gorilla/mux" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/env" diff --git a/cmd/frontend/internal/handlerutil/handler.go b/cmd/frontend/internal/handlerutil/handler.go index 652a46441f5..43e309cb3c9 100644 --- a/cmd/frontend/internal/handlerutil/handler.go +++ b/cmd/frontend/internal/handlerutil/handler.go @@ -10,7 +10,7 @@ import ( "github.com/inconshreveable/log15" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/neelance/parallel" diff --git a/cmd/frontend/internal/highlight/highlight.go b/cmd/frontend/internal/highlight/highlight.go index 04bce05c9c3..319d19d6a1b 100644 --- a/cmd/frontend/internal/highlight/highlight.go +++ b/cmd/frontend/internal/highlight/highlight.go @@ -11,9 +11,9 @@ import ( "time" "unicode/utf8" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sourcegraph/gosyntect" diff --git a/cmd/frontend/internal/httpapi/internal.go b/cmd/frontend/internal/httpapi/internal.go index e87fa550bc9..20e7899244b 100644 --- a/cmd/frontend/internal/httpapi/internal.go +++ b/cmd/frontend/internal/httpapi/internal.go @@ -10,9 +10,9 @@ import ( "path" "strconv" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" diff --git a/cmd/frontend/internal/httpapi/repo_shield.go b/cmd/frontend/internal/httpapi/repo_shield.go index 3b245572fd0..859db315db4 100644 --- a/cmd/frontend/internal/httpapi/repo_shield.go +++ b/cmd/frontend/internal/httpapi/repo_shield.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/routevar" diff --git a/cmd/frontend/internal/session/session.go b/cmd/frontend/internal/session/session.go index de06b5f4f6d..e4818c5ddad 100644 --- a/cmd/frontend/internal/session/session.go +++ b/cmd/frontend/internal/session/session.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/cmd/frontend/internal/vfsutil/gitserver.go b/cmd/frontend/internal/vfsutil/gitserver.go index 62929ce4688..1530d9cac67 100644 --- a/cmd/frontend/internal/vfsutil/gitserver.go +++ b/cmd/frontend/internal/vfsutil/gitserver.go @@ -7,8 +7,8 @@ import ( "os" "strings" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/ext" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/frontend/internal/vfsutil/zip.go b/cmd/frontend/internal/vfsutil/zip.go index 240c94d01f4..8c575aeb834 100644 --- a/cmd/frontend/internal/vfsutil/zip.go +++ b/cmd/frontend/internal/vfsutil/zip.go @@ -7,7 +7,7 @@ import ( "golang.org/x/net/context/ctxhttp" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/trace/ot" diff --git a/cmd/frontend/registry/client/client.go b/cmd/frontend/registry/client/client.go index 7b5d66d1d19..a1d1c20ce11 100644 --- a/cmd/frontend/registry/client/client.go +++ b/cmd/frontend/registry/client/client.go @@ -9,8 +9,8 @@ import ( "path" "strings" + "github.com/cockroachdb/errors" "github.com/google/uuid" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/httpcli" ) diff --git a/cmd/gitserver/main.go b/cmd/gitserver/main.go index f3e64630966..e225e672ea0 100644 --- a/cmd/gitserver/main.go +++ b/cmd/gitserver/main.go @@ -12,9 +12,9 @@ import ( "syscall" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" jsoniter "github.com/json-iterator/go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/gitserver/server" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/cmd/gitserver/server/cleanup.go b/cmd/gitserver/server/cleanup.go index 41baef9698b..bd17b13e221 100644 --- a/cmd/gitserver/server/cleanup.go +++ b/cmd/gitserver/server/cleanup.go @@ -17,9 +17,9 @@ import ( "syscall" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/gitserver/server/cleanup_test.go b/cmd/gitserver/server/cleanup_test.go index 29935111451..52b0c020d9a 100644 --- a/cmd/gitserver/server/cleanup_test.go +++ b/cmd/gitserver/server/cleanup_test.go @@ -16,8 +16,8 @@ import ( "testing/quick" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/gitserver/server/patch.go b/cmd/gitserver/server/patch.go index f8ddeed3c39..b7bbf545c17 100644 --- a/cmd/gitserver/server/patch.go +++ b/cmd/gitserver/server/patch.go @@ -14,8 +14,8 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/gitserver/protocol" "github.com/sourcegraph/sourcegraph/internal/vcs" diff --git a/cmd/gitserver/server/repo_info.go b/cmd/gitserver/server/repo_info.go index 834346743c7..2e3d5c66ea1 100644 --- a/cmd/gitserver/server/repo_info.go +++ b/cmd/gitserver/server/repo_info.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver/protocol" diff --git a/cmd/gitserver/server/server.go b/cmd/gitserver/server/server.go index 7d1154f79e6..5a122e88bae 100644 --- a/cmd/gitserver/server/server.go +++ b/cmd/gitserver/server/server.go @@ -22,11 +22,11 @@ import ( "syscall" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "golang.org/x/time/rate" diff --git a/cmd/gitserver/server/server_test.go b/cmd/gitserver/server/server_test.go index 6981317439d..f974308b56c 100644 --- a/cmd/gitserver/server/server_test.go +++ b/cmd/gitserver/server/server_test.go @@ -17,10 +17,10 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/cmd/gitserver/server/serverutil.go b/cmd/gitserver/server/serverutil.go index ff051325aee..9e23fa9ef30 100644 --- a/cmd/gitserver/server/serverutil.go +++ b/cmd/gitserver/server/serverutil.go @@ -16,8 +16,8 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/cmd/gitserver/server/ssh_agent.go b/cmd/gitserver/server/ssh_agent.go index 0897180d60f..ad388d99e92 100644 --- a/cmd/gitserver/server/ssh_agent.go +++ b/cmd/gitserver/server/ssh_agent.go @@ -9,8 +9,8 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" ) diff --git a/cmd/gitserver/server/vcs_syncer.go b/cmd/gitserver/server/vcs_syncer.go index 393fb2c8f8f..66fa959ef20 100644 --- a/cmd/gitserver/server/vcs_syncer.go +++ b/cmd/gitserver/server/vcs_syncer.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/vcs" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver/protocol" diff --git a/cmd/query-runner/all_saved_queries.go b/cmd/query-runner/all_saved_queries.go index 1725afc9906..cb30f07d77d 100644 --- a/cmd/query-runner/all_saved_queries.go +++ b/cmd/query-runner/all_saved_queries.go @@ -8,8 +8,8 @@ import ( "reflect" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/query-runner/queryrunnerapi" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/cmd/query-runner/email.go b/cmd/query-runner/email.go index 955dbe8e9f5..779a01d689f 100644 --- a/cmd/query-runner/email.go +++ b/cmd/query-runner/email.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/txemail" diff --git a/cmd/query-runner/graphql.go b/cmd/query-runner/graphql.go index 3c3a2a38a0f..5663a7c069f 100644 --- a/cmd/query-runner/graphql.go +++ b/cmd/query-runner/graphql.go @@ -14,7 +14,7 @@ import ( "golang.org/x/net/context/ctxhttp" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type graphQLQuery struct { diff --git a/cmd/query-runner/main.go b/cmd/query-runner/main.go index a253b1c0faa..fe8bd75bdb5 100644 --- a/cmd/query-runner/main.go +++ b/cmd/query-runner/main.go @@ -15,8 +15,8 @@ import ( "syscall" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/query-runner/queryrunnerapi" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/cmd/query-runner/queryrunnerapi/queryrunnerapi.go b/cmd/query-runner/queryrunnerapi/queryrunnerapi.go index e775991c58a..b7680442b35 100644 --- a/cmd/query-runner/queryrunnerapi/queryrunnerapi.go +++ b/cmd/query-runner/queryrunnerapi/queryrunnerapi.go @@ -10,7 +10,7 @@ import ( "net/url" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" diff --git a/cmd/repo-updater/repoupdater/observability.go b/cmd/repo-updater/repoupdater/observability.go index a78d8dec691..a0abae40e02 100644 --- a/cmd/repo-updater/repoupdater/observability.go +++ b/cmd/repo-updater/repoupdater/observability.go @@ -5,10 +5,10 @@ import ( "strconv" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing-contrib/go-stdlib/nethttp" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sourcegraph/sourcegraph/internal/metrics" diff --git a/cmd/repo-updater/repoupdater/server.go b/cmd/repo-updater/repoupdater/server.go index 4ecf565808b..bc6aac65fa3 100644 --- a/cmd/repo-updater/repoupdater/server.go +++ b/cmd/repo-updater/repoupdater/server.go @@ -9,9 +9,9 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/searcher/search/search.go b/cmd/searcher/search/search.go index 5509fca7434..66969d0345a 100644 --- a/cmd/searcher/search/search.go +++ b/cmd/searcher/search/search.go @@ -29,7 +29,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/store" "github.com/sourcegraph/sourcegraph/internal/trace/ot" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/gorilla/schema" "github.com/opentracing/opentracing-go/ext" diff --git a/cmd/server/shared/copy.go b/cmd/server/shared/copy.go index a18f832af55..003f33acb84 100644 --- a/cmd/server/shared/copy.go +++ b/cmd/server/shared/copy.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // copyConfigs will copy /etc/sourcegraph/{netrc,gitconfig} to locations read diff --git a/cmd/server/shared/nginx.go b/cmd/server/shared/nginx.go index 66067532966..ba35beaf588 100644 --- a/cmd/server/shared/nginx.go +++ b/cmd/server/shared/nginx.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/server/shared/assets" ) diff --git a/cmd/symbols/internal/symbols/parse.go b/cmd/symbols/internal/symbols/parse.go index 45691f695cf..db34aa59ef2 100644 --- a/cmd/symbols/internal/symbols/parse.go +++ b/cmd/symbols/internal/symbols/parse.go @@ -7,10 +7,10 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/ext" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" nettrace "golang.org/x/net/trace" diff --git a/dev/gqltest/access_token_test.go b/dev/gqltest/access_token_test.go index a7144a00302..71a40c5488f 100644 --- a/dev/gqltest/access_token_test.go +++ b/dev/gqltest/access_token_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestAccessToken(t *testing.T) { diff --git a/dev/repogen/main.go b/dev/repogen/main.go index 20b013330c8..71985bd2d92 100644 --- a/dev/repogen/main.go +++ b/dev/repogen/main.go @@ -13,7 +13,7 @@ import ( "os" "os/exec" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var numFiles = flag.Int("nf", 100, "number of files to write") diff --git a/dev/sg/config.go b/dev/sg/config.go index e0ccc2a0daa..8ed3ef33f2b 100644 --- a/dev/sg/config.go +++ b/dev/sg/config.go @@ -4,7 +4,7 @@ import ( "io" "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "gopkg.in/yaml.v2" ) diff --git a/dev/sg/go.mod b/dev/sg/go.mod index 715fdce96a7..d27390e9486 100644 --- a/dev/sg/go.mod +++ b/dev/sg/go.mod @@ -4,9 +4,9 @@ go 1.16 require ( github.com/Masterminds/semver v1.5.0 + github.com/cockroachdb/errors v1.8.4 github.com/hashicorp/go-multierror v1.1.1 github.com/peterbourgon/ff/v3 v3.0.0 - github.com/pkg/errors v0.9.1 github.com/rjeczalik/notify v0.9.2 github.com/sourcegraph/sourcegraph/lib v0.0.0-00010101000000-000000000000 gopkg.in/yaml.v2 v2.4.0 diff --git a/dev/sg/go.sum b/dev/sg/go.sum index 6cf12308390..d52be20aea3 100644 --- a/dev/sg/go.sum +++ b/dev/sg/go.sum @@ -1,28 +1,83 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= +github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/aphistic/sweet v0.0.0-20180618201346-68e18ab55a67/go.mod h1:iggGz3Cujwru5rGKuOi4u1rfI+38suzhVVJj8Ey7Q3M= -github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= -github.com/aphistic/sweet-junit v0.0.0-20190314030539-8d7e248096c2/go.mod h1:+eL69RqmiKF2Jm3poefxF/ZyVNGXFdSsPq3ScBFtX9s= -github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= +github.com/cockroachdb/errors v1.8.4 h1:41oZ1A4Eju6LviqkGpu5R2M39gHHVAFvOYsQjot1jNc= +github.com/cockroachdb/errors v1.8.4/go.mod h1:GScl7wnuvY335l6h0jbkHIKJ+8uEmUmJRVWKnenUbfI= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= +github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/derision-test/go-mockgen v0.0.0-20200916004441-cfcabc111002/go.mod h1:K2AZyo7TmaAzRhr4EvUaEHcpumiT0UEAARFnSBid7yE= -github.com/derision-test/go-mockgen v0.0.0-20210315170118-149556bc84f1 h1:vncjpXhy/j+Fub85i0mkTEpjt1JW/PVsBkBMbZwqeig= github.com/derision-test/go-mockgen v0.0.0-20210315170118-149556bc84f1/go.mod h1:FGP9Qq+gWtYK9ine/2Bzeww8SXS7mD1wypNl1Q3AKN0= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/efritz/go-genlib v0.0.0-20200420163202-9c3914df9594/go.mod h1:aMnaM7yzn10TOdj5sGpElY90l/XT3eL+Sj7z7D1V8q8= github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101/go.mod h1:5ALWO82UZwfAtNRUtwzsWimcrcuYzyieTyyXOXrP6EQ= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.11.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -30,113 +85,211 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY= github.com/hexops/autogold v1.3.0/go.mod h1:d4hwi2rid66Sag+BVuHgwakW/EmaFr8vdTSbWDbrDRI= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hexops/valast v1.4.0/go.mod h1:uVjKZ0smVuYlgCSPz9NRi5A04sl7lp6GtFWsROKDgEs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= +github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= +github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= +github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= +github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= +github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI= github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 h1:lh3PyZvY+B9nFliSGTn5uFuqQQJGuNrD0MLCokv09ag= github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/peterbourgon/ff/v3 v3.0.0 h1:eQzEmNahuOjQXfuegsKQTSTDbf4dNvr/eNLrmJhiH7M= github.com/peterbourgon/ff/v3 v3.0.0/go.mod h1:UILIFjRH5a/ar8TjXYLTkIvSvekZqPm5Eb/qbGk6CT0= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8= github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190428183149-804c0c7841b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210218084038-e8e29180ff58/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -145,19 +298,39 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190428024724-550556f78a90/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200420001825-978e26b7c37c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200624163319-25775e59acb7/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200916225323-c537a342ddf6/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -170,13 +343,16 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= mvdan.cc/gofumpt v0.0.0-20210107193838-d24d34e18d44/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= diff --git a/dev/sg/migration.go b/dev/sg/migration.go index 4038a3f0fa0..a38733489a1 100644 --- a/dev/sg/migration.go +++ b/dev/sg/migration.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/dev/sg/root" "github.com/sourcegraph/sourcegraph/lib/output" diff --git a/dev/sg/run.go b/dev/sg/run.go index 48f6a7dee93..8b415ca177e 100644 --- a/dev/sg/run.go +++ b/dev/sg/run.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/rjeczalik/notify" // TODO - deduplicate me diff --git a/dev/sg/util.go b/dev/sg/util.go index de0f71d8718..0460cf30e54 100644 --- a/dev/sg/util.go +++ b/dev/sg/util.go @@ -4,7 +4,7 @@ import ( "os/exec" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/dev/sg/root" ) diff --git a/dev/src-expose/serve.go b/dev/src-expose/serve.go index 51cabe2970a..9f8e570d049 100644 --- a/dev/src-expose/serve.go +++ b/dev/src-expose/serve.go @@ -15,7 +15,7 @@ import ( "strings" "sync/atomic" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type Serve struct { diff --git a/dev/src-expose/snapshot.go b/dev/src-expose/snapshot.go index a2630035241..661341ed81f 100644 --- a/dev/src-expose/snapshot.go +++ b/dev/src-expose/snapshot.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func snapshot(logger *log.Logger, src, dst string) error { diff --git a/doc/cli/references/doc.go b/doc/cli/references/doc.go index bc96cf85678..e927b26b0ce 100644 --- a/doc/cli/references/doc.go +++ b/doc/cli/references/doc.go @@ -11,7 +11,7 @@ import ( "path/filepath" "sort" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func clean(base string) error { diff --git a/enterprise/cmd/executor/internal/command/firecracker.go b/enterprise/cmd/executor/internal/command/firecracker.go index 3d23ac59f77..5791aee0e3e 100644 --- a/enterprise/cmd/executor/internal/command/firecracker.go +++ b/enterprise/cmd/executor/internal/command/firecracker.go @@ -10,8 +10,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/lazyregexp" ) diff --git a/enterprise/cmd/executor/internal/worker/handler.go b/enterprise/cmd/executor/internal/worker/handler.go index 3c3e9248773..5d835242790 100644 --- a/enterprise/cmd/executor/internal/worker/handler.go +++ b/enterprise/cmd/executor/internal/worker/handler.go @@ -9,11 +9,11 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/google/uuid" "github.com/hashicorp/go-multierror" "github.com/honeycombio/libhoney-go" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/cmd/executor/internal/command" "github.com/sourcegraph/sourcegraph/enterprise/internal/executor" diff --git a/enterprise/cmd/executor/internal/worker/workspace.go b/enterprise/cmd/executor/internal/worker/workspace.go index 53614a5da5d..86ad6d8a15d 100644 --- a/enterprise/cmd/executor/internal/worker/workspace.go +++ b/enterprise/cmd/executor/internal/worker/workspace.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/enterprise/cmd/executor/internal/command" ) diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/session.go b/enterprise/cmd/frontend/internal/auth/githuboauth/session.go index e9232d45e38..e410f5537d8 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/session.go +++ b/enterprise/cmd/frontend/internal/auth/githuboauth/session.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/dghubble/gologin/github" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/session_test.go b/enterprise/cmd/frontend/internal/auth/githuboauth/session_test.go index 6068ab73fec..1e37d1a8183 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/session_test.go +++ b/enterprise/cmd/frontend/internal/auth/githuboauth/session_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/davecgh/go-spew/spew" githublogin "github.com/dghubble/gologin/github" "github.com/google/go-cmp/cmp" "github.com/google/go-github/github" - "github.com/pkg/errors" "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/login.go b/enterprise/cmd/frontend/internal/auth/gitlaboauth/login.go index 00078ed700a..78cf33f249f 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/login.go +++ b/enterprise/cmd/frontend/internal/auth/gitlaboauth/login.go @@ -5,9 +5,9 @@ import ( "net/http" "net/url" + "github.com/cockroachdb/errors" "github.com/dghubble/gologin" oauth2Login "github.com/dghubble/gologin/oauth2" - "github.com/pkg/errors" "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/internal/extsvc/gitlab" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go b/enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go index ca307ef3212..818a182dca8 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go +++ b/enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" diff --git a/enterprise/cmd/frontend/internal/auth/oauth/middleware.go b/enterprise/cmd/frontend/internal/auth/oauth/middleware.go index 01771ff4c30..c2a04b16e22 100644 --- a/enterprise/cmd/frontend/internal/auth/oauth/middleware.go +++ b/enterprise/cmd/frontend/internal/auth/oauth/middleware.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/provider.go b/enterprise/cmd/frontend/internal/auth/openidconnect/provider.go index 40d4f5b63c1..9c6663c8683 100644 --- a/enterprise/cmd/frontend/internal/auth/openidconnect/provider.go +++ b/enterprise/cmd/frontend/internal/auth/openidconnect/provider.go @@ -9,8 +9,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/coreos/go-oidc" - "github.com/pkg/errors" "golang.org/x/net/context/ctxhttp" "golang.org/x/oauth2" diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/session.go b/enterprise/cmd/frontend/internal/auth/openidconnect/session.go index 20c312d35d8..95b7443164b 100644 --- a/enterprise/cmd/frontend/internal/auth/openidconnect/session.go +++ b/enterprise/cmd/frontend/internal/auth/openidconnect/session.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth/providers" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/user.go b/enterprise/cmd/frontend/internal/auth/openidconnect/user.go index 56bbd61bacb..d1540e53426 100644 --- a/enterprise/cmd/frontend/internal/auth/openidconnect/user.go +++ b/enterprise/cmd/frontend/internal/auth/openidconnect/user.go @@ -4,8 +4,8 @@ import ( "context" "fmt" + "github.com/cockroachdb/errors" "github.com/coreos/go-oidc" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/internal/actor" diff --git a/enterprise/cmd/frontend/internal/auth/saml/provider.go b/enterprise/cmd/frontend/internal/auth/saml/provider.go index 764400b00cb..4867df8e03b 100644 --- a/enterprise/cmd/frontend/internal/auth/saml/provider.go +++ b/enterprise/cmd/frontend/internal/auth/saml/provider.go @@ -15,7 +15,7 @@ import ( "time" "github.com/beevik/etree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" saml2 "github.com/russellhaering/gosaml2" "github.com/russellhaering/gosaml2/types" dsig "github.com/russellhaering/goxmldsig" diff --git a/enterprise/cmd/frontend/internal/auth/saml/session.go b/enterprise/cmd/frontend/internal/auth/saml/session.go index a8bd9844253..8c5d7903284 100644 --- a/enterprise/cmd/frontend/internal/auth/saml/session.go +++ b/enterprise/cmd/frontend/internal/auth/saml/session.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/beevik/etree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/schema" diff --git a/enterprise/cmd/frontend/internal/auth/saml/user.go b/enterprise/cmd/frontend/internal/auth/saml/user.go index f831fd03ad1..73652e56f67 100644 --- a/enterprise/cmd/frontend/internal/auth/saml/user.go +++ b/enterprise/cmd/frontend/internal/auth/saml/user.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" saml2 "github.com/russellhaering/gosaml2" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/resolver.go b/enterprise/cmd/frontend/internal/authz/resolvers/resolver.go index 35a4d3cb486..7da18683a13 100644 --- a/enterprise/cmd/frontend/internal/authz/resolvers/resolver.go +++ b/enterprise/cmd/frontend/internal/authz/resolvers/resolver.go @@ -7,9 +7,9 @@ import ( "time" "github.com/RoaringBitmap/roaring" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" diff --git a/enterprise/cmd/frontend/internal/codeintel/httpapi/auth_github.go b/enterprise/cmd/frontend/internal/codeintel/httpapi/auth_github.go index 8b43c8e0540..4babe2de856 100644 --- a/enterprise/cmd/frontend/internal/codeintel/httpapi/auth_github.go +++ b/enterprise/cmd/frontend/internal/codeintel/httpapi/auth_github.go @@ -7,8 +7,8 @@ import ( "net/url" "strings" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" "github.com/sourcegraph/sourcegraph/internal/extsvc/github" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/commit_checker.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/commit_checker.go index e47ea5ec96b..1f89f20f1cf 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/commit_checker.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/commit_checker.go @@ -3,7 +3,7 @@ package resolvers import ( "context" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type cachedCommitChecker struct { diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/exists.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/exists.go index c0fddaeee17..306ec2aa3f4 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/exists.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/exists.go @@ -4,8 +4,8 @@ import ( "context" "strings" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/gitserver" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query.go index eaa4b614b5f..4da183106a0 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query.go @@ -3,7 +3,7 @@ package graphql import ( "context" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" gql "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codeintel/resolvers" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query_documentation.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query_documentation.go index 6a599e811a9..b8e88849927 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query_documentation.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/query_documentation.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" gql "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" ) diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/resolver.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/resolver.go index a9d8034cb41..7cdf794ccbb 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/resolver.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/graphql/resolver.go @@ -4,8 +4,8 @@ import ( "context" "strings" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" gql "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_definitions.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_definitions.go index 167de00e6e2..41b447a2cf7 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_definitions.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_definitions.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/observation" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_diagnostics.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_diagnostics.go index 9287f2a753f..385130639a2 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_diagnostics.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_diagnostics.go @@ -5,8 +5,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/lsifstore" "github.com/sourcegraph/sourcegraph/internal/observation" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_hover.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_hover.go index 990104bce49..808d70a45f3 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_hover.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_hover.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/lsifstore" "github.com/sourcegraph/sourcegraph/internal/observation" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_ranges.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_ranges.go index f48690889b4..d5a45c86734 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_ranges.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_ranges.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/lsifstore" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_references.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_references.go index 671f76b2c3c..5ddc4ea8328 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_references.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_references.go @@ -6,9 +6,9 @@ import ( "sort" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" diff --git a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_util.go b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_util.go index 9010733f3b9..3091fdadb97 100644 --- a/enterprise/cmd/frontend/internal/codeintel/resolvers/query_util.go +++ b/enterprise/cmd/frontend/internal/codeintel/resolvers/query_util.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" diff --git a/enterprise/cmd/frontend/internal/dotcom/billing/customers.go b/enterprise/cmd/frontend/internal/dotcom/billing/customers.go index b08136a77ca..5b3ed9cdbe6 100644 --- a/enterprise/cmd/frontend/internal/dotcom/billing/customers.go +++ b/enterprise/cmd/frontend/internal/dotcom/billing/customers.go @@ -6,9 +6,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/stripe/stripe-go" "github.com/stripe/stripe-go/customer" diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/invoices_graphql.go b/enterprise/cmd/frontend/internal/dotcom/productsubscription/invoices_graphql.go index 11ad63d1b97..12f6923841b 100644 --- a/enterprise/cmd/frontend/internal/dotcom/productsubscription/invoices_graphql.go +++ b/enterprise/cmd/frontend/internal/dotcom/productsubscription/invoices_graphql.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stripe/stripe-go" "github.com/stripe/stripe-go/invoice" "github.com/stripe/stripe-go/plan" diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go b/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go index 7708f1c6f72..dbbd1f5890d 100644 --- a/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go +++ b/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/google/uuid" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go b/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go index 4fb69b02d2d..926870afd2f 100644 --- a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go +++ b/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go @@ -5,9 +5,9 @@ import ( "database/sql" "time" + "github.com/cockroachdb/errors" "github.com/google/uuid" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go b/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go index 0bfd275b9f5..c96b469bf02 100644 --- a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go +++ b/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go @@ -7,9 +7,9 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "github.com/pkg/errors" "github.com/stripe/stripe-go" "github.com/stripe/stripe-go/customer" "github.com/stripe/stripe-go/event" diff --git a/enterprise/cmd/frontend/internal/executor/internal_proxy_handler.go b/enterprise/cmd/frontend/internal/executor/internal_proxy_handler.go index a0848686dae..4ce2532174e 100644 --- a/enterprise/cmd/frontend/internal/executor/internal_proxy_handler.go +++ b/enterprise/cmd/frontend/internal/executor/internal_proxy_handler.go @@ -9,9 +9,9 @@ import ( "net/url" "path" + "github.com/cockroachdb/errors" "github.com/gorilla/mux" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/internal/env" diff --git a/enterprise/cmd/frontend/internal/registry/extensions_db.go b/enterprise/cmd/frontend/internal/registry/extensions_db.go index f0d0cc7aba8..84bcbdd2c16 100644 --- a/enterprise/cmd/frontend/internal/registry/extensions_db.go +++ b/enterprise/cmd/frontend/internal/registry/extensions_db.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/google/uuid" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" registry "github.com/sourcegraph/sourcegraph/cmd/frontend/registry/api" diff --git a/enterprise/cmd/precise-code-intel-worker/internal/worker/handler.go b/enterprise/cmd/precise-code-intel-worker/internal/worker/handler.go index 1c0427d22be..073782040a1 100644 --- a/enterprise/cmd/precise-code-intel-worker/internal/worker/handler.go +++ b/enterprise/cmd/precise-code-intel-worker/internal/worker/handler.go @@ -8,11 +8,11 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/errors" "github.com/honeycombio/libhoney-go" "github.com/inconshreveable/log15" "github.com/jackc/pgconn" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" diff --git a/enterprise/cmd/repo-updater/internal/authz/perms_syncer.go b/enterprise/cmd/repo-updater/internal/authz/perms_syncer.go index e6c6d588ca2..17a1a5d7302 100644 --- a/enterprise/cmd/repo-updater/internal/authz/perms_syncer.go +++ b/enterprise/cmd/repo-updater/internal/authz/perms_syncer.go @@ -9,9 +9,9 @@ import ( "time" "github.com/RoaringBitmap/roaring" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" diff --git a/enterprise/cmd/repo-updater/internal/authz/perms_syncer_test.go b/enterprise/cmd/repo-updater/internal/authz/perms_syncer_test.go index 315da499a0a..cb7ac67fca8 100644 --- a/enterprise/cmd/repo-updater/internal/authz/perms_syncer_test.go +++ b/enterprise/cmd/repo-updater/internal/authz/perms_syncer_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/enterprise/cmd/worker/internal/codeintel/commitgraph/updater.go b/enterprise/cmd/worker/internal/codeintel/commitgraph/updater.go index 23ad66a277d..801bbde38dd 100644 --- a/enterprise/cmd/worker/internal/codeintel/commitgraph/updater.go +++ b/enterprise/cmd/worker/internal/codeintel/commitgraph/updater.go @@ -4,10 +4,10 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/gitserver" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/cmd/worker/internal/codeintel/indexing/dependency_indexing_scheduler.go b/enterprise/cmd/worker/internal/codeintel/indexing/dependency_indexing_scheduler.go index 063fccc8540..8e38f41288d 100644 --- a/enterprise/cmd/worker/internal/codeintel/indexing/dependency_indexing_scheduler.go +++ b/enterprise/cmd/worker/internal/codeintel/indexing/dependency_indexing_scheduler.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/actor" diff --git a/enterprise/cmd/worker/internal/codeintel/indexing/index_scheduler.go b/enterprise/cmd/worker/internal/codeintel/indexing/index_scheduler.go index 68f6a5cde13..0851c61ab5a 100644 --- a/enterprise/cmd/worker/internal/codeintel/indexing/index_scheduler.go +++ b/enterprise/cmd/worker/internal/codeintel/indexing/index_scheduler.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" - "github.com/pkg/errors" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/enterprise/cmd/worker/internal/codeintel/indexing/indexability_updater.go b/enterprise/cmd/worker/internal/codeintel/indexing/indexability_updater.go index 8aa7e6da82c..49910f66591 100644 --- a/enterprise/cmd/worker/internal/codeintel/indexing/indexability_updater.go +++ b/enterprise/cmd/worker/internal/codeintel/indexing/indexability_updater.go @@ -6,10 +6,10 @@ import ( "os" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "golang.org/x/time/rate" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" diff --git a/enterprise/cmd/worker/internal/codeintel/janitor/abandoned_uploads.go b/enterprise/cmd/worker/internal/codeintel/janitor/abandoned_uploads.go index b6b2eb64efe..80f8e9726c7 100644 --- a/enterprise/cmd/worker/internal/codeintel/janitor/abandoned_uploads.go +++ b/enterprise/cmd/worker/internal/codeintel/janitor/abandoned_uploads.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/goroutine" ) diff --git a/enterprise/cmd/worker/internal/codeintel/janitor/deleted_repositories.go b/enterprise/cmd/worker/internal/codeintel/janitor/deleted_repositories.go index 13ecd7003eb..21741ab346d 100644 --- a/enterprise/cmd/worker/internal/codeintel/janitor/deleted_repositories.go +++ b/enterprise/cmd/worker/internal/codeintel/janitor/deleted_repositories.go @@ -5,8 +5,8 @@ import ( "sort" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/goroutine" ) diff --git a/enterprise/cmd/worker/internal/codeintel/janitor/hard_delete.go b/enterprise/cmd/worker/internal/codeintel/janitor/hard_delete.go index e7d683f5d1e..758e8ad91df 100644 --- a/enterprise/cmd/worker/internal/codeintel/janitor/hard_delete.go +++ b/enterprise/cmd/worker/internal/codeintel/janitor/hard_delete.go @@ -5,8 +5,8 @@ import ( "sort" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/cmd/worker/internal/codeintel/janitor/record_expirer.go b/enterprise/cmd/worker/internal/codeintel/janitor/record_expirer.go index 06cb3a2f891..3009d12dd41 100644 --- a/enterprise/cmd/worker/internal/codeintel/janitor/record_expirer.go +++ b/enterprise/cmd/worker/internal/codeintel/janitor/record_expirer.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/goroutine" ) diff --git a/enterprise/cmd/worker/internal/codeintel/janitor/unknown_commits.go b/enterprise/cmd/worker/internal/codeintel/janitor/unknown_commits.go index dfabbcbf86d..cc832bc2fd2 100644 --- a/enterprise/cmd/worker/internal/codeintel/janitor/unknown_commits.go +++ b/enterprise/cmd/worker/internal/codeintel/janitor/unknown_commits.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/derision-test/glock" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/enterprise/internal/authz/authz.go b/enterprise/internal/authz/authz.go index 5a7141f70ff..97d6c9e4180 100644 --- a/enterprise/internal/authz/authz.go +++ b/enterprise/internal/authz/authz.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/authz/bitbucketserver" diff --git a/enterprise/internal/authz/authz_test.go b/enterprise/internal/authz/authz_test.go index 362271fb41d..141299c8176 100644 --- a/enterprise/internal/authz/authz_test.go +++ b/enterprise/internal/authz/authz_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" jsoniter "github.com/json-iterator/go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth/providers" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/enterprise/internal/batches/background/bulk_processor.go b/enterprise/internal/batches/background/bulk_processor.go index e3d5c692591..45179d50f42 100644 --- a/enterprise/internal/batches/background/bulk_processor.go +++ b/enterprise/internal/batches/background/bulk_processor.go @@ -4,8 +4,8 @@ import ( "context" "fmt" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/global" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/service" diff --git a/enterprise/internal/batches/background/site_credential_migrator.go b/enterprise/internal/batches/background/site_credential_migrator.go index 0f3bf866d6f..f2c275e4d7b 100644 --- a/enterprise/internal/batches/background/site_credential_migrator.go +++ b/enterprise/internal/batches/background/site_credential_migrator.go @@ -3,9 +3,9 @@ package background import ( "context" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/background/spec_expire.go b/enterprise/internal/batches/background/spec_expire.go index 7112bc8d347..c7547afe7da 100644 --- a/enterprise/internal/batches/background/spec_expire.go +++ b/enterprise/internal/batches/background/spec_expire.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/internal/batches/background/user_credential_migrator.go b/enterprise/internal/batches/background/user_credential_migrator.go index 1f0b1fb1c15..5b63b153c93 100644 --- a/enterprise/internal/batches/background/user_credential_migrator.go +++ b/enterprise/internal/batches/background/user_credential_migrator.go @@ -3,9 +3,9 @@ package background import ( "context" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/internal/batches/reconciler/executor.go b/enterprise/internal/batches/reconciler/executor.go index c12228f9482..f4c7de12d5b 100644 --- a/enterprise/internal/batches/reconciler/executor.go +++ b/enterprise/internal/batches/reconciler/executor.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/sources" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/state" diff --git a/enterprise/internal/batches/reconciler/executor_test.go b/enterprise/internal/batches/reconciler/executor_test.go index f3b2d81fa0d..7cd8227be8e 100644 --- a/enterprise/internal/batches/reconciler/executor_test.go +++ b/enterprise/internal/batches/reconciler/executor_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/sources" diff --git a/enterprise/internal/batches/resolvers/batch_change.go b/enterprise/internal/batches/resolvers/batch_change.go index 1036d04c1f9..4657a2c8dd5 100644 --- a/enterprise/internal/batches/resolvers/batch_change.go +++ b/enterprise/internal/batches/resolvers/batch_change.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/state" diff --git a/enterprise/internal/batches/resolvers/batch_spec.go b/enterprise/internal/batches/resolvers/batch_spec.go index a91027941ac..fa3b4a20f46 100644 --- a/enterprise/internal/batches/resolvers/batch_spec.go +++ b/enterprise/internal/batches/resolvers/batch_spec.go @@ -6,9 +6,9 @@ import ( "strconv" "sync" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" diff --git a/enterprise/internal/batches/resolvers/changeset.go b/enterprise/internal/batches/resolvers/changeset.go index d40e5f03a40..0f40893fc67 100644 --- a/enterprise/internal/batches/resolvers/changeset.go +++ b/enterprise/internal/batches/resolvers/changeset.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" diff --git a/enterprise/internal/batches/resolvers/changeset_apply_preview.go b/enterprise/internal/batches/resolvers/changeset_apply_preview.go index d825a3675f6..39ee3288f81 100644 --- a/enterprise/internal/batches/resolvers/changeset_apply_preview.go +++ b/enterprise/internal/batches/resolvers/changeset_apply_preview.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/reconciler" diff --git a/enterprise/internal/batches/resolvers/changeset_apply_preview_connection.go b/enterprise/internal/batches/resolvers/changeset_apply_preview_connection.go index 78098a539ac..4336b0a3786 100644 --- a/enterprise/internal/batches/resolvers/changeset_apply_preview_connection.go +++ b/enterprise/internal/batches/resolvers/changeset_apply_preview_connection.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" diff --git a/enterprise/internal/batches/resolvers/changeset_apply_preview_connection_test.go b/enterprise/internal/batches/resolvers/changeset_apply_preview_connection_test.go index 48a4664f44c..a475f3d2e82 100644 --- a/enterprise/internal/batches/resolvers/changeset_apply_preview_connection_test.go +++ b/enterprise/internal/batches/resolvers/changeset_apply_preview_connection_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" diff --git a/enterprise/internal/batches/resolvers/credential.go b/enterprise/internal/batches/resolvers/credential.go index b90ddcbbec3..43a9cf2398b 100644 --- a/enterprise/internal/batches/resolvers/credential.go +++ b/enterprise/internal/batches/resolvers/credential.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" diff --git a/enterprise/internal/batches/resolvers/resolver.go b/enterprise/internal/batches/resolvers/resolver.go index 06288632de9..7bc4c5a3de0 100644 --- a/enterprise/internal/batches/resolvers/resolver.go +++ b/enterprise/internal/batches/resolvers/resolver.go @@ -6,8 +6,8 @@ import ( "fmt" "strconv" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" diff --git a/enterprise/internal/batches/resolvers/resolver_test.go b/enterprise/internal/batches/resolvers/resolver_test.go index 37fc123ba97..3d479e6671f 100644 --- a/enterprise/internal/batches/resolvers/resolver_test.go +++ b/enterprise/internal/batches/resolvers/resolver_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/graph-gophers/graphql-go" - "github.com/pkg/errors" "github.com/sourcegraph/batch-change-utils/overridable" diff --git a/enterprise/internal/batches/search/text.go b/enterprise/internal/batches/search/text.go index 58722678e80..f800e92d033 100644 --- a/enterprise/internal/batches/search/text.go +++ b/enterprise/internal/batches/search/text.go @@ -3,8 +3,8 @@ package search import ( "strings" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/search/syntax" ) diff --git a/enterprise/internal/batches/service/service.go b/enterprise/internal/batches/service/service.go index 4ea5efaa359..85717892174 100644 --- a/enterprise/internal/batches/service/service.go +++ b/enterprise/internal/batches/service/service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" diff --git a/enterprise/internal/batches/service/service_apply_batch_change.go b/enterprise/internal/batches/service/service_apply_batch_change.go index 60834b72e0a..24dc155a8b8 100644 --- a/enterprise/internal/batches/service/service_apply_batch_change.go +++ b/enterprise/internal/batches/service/service_apply_batch_change.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/rewirer" diff --git a/enterprise/internal/batches/sources/bitbucketserver.go b/enterprise/internal/batches/sources/bitbucketserver.go index 7484ddfb208..df0b3ec8025 100644 --- a/enterprise/internal/batches/sources/bitbucketserver.go +++ b/enterprise/internal/batches/sources/bitbucketserver.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" diff --git a/enterprise/internal/batches/sources/fake.go b/enterprise/internal/batches/sources/fake.go index c93c968a0eb..cc9de3610e1 100644 --- a/enterprise/internal/batches/sources/fake.go +++ b/enterprise/internal/batches/sources/fake.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/sources/github.go b/enterprise/internal/batches/sources/github.go index 11b0a076ebb..7575487850c 100644 --- a/enterprise/internal/batches/sources/github.go +++ b/enterprise/internal/batches/sources/github.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/enterprise/internal/batches/sources/gitlab.go b/enterprise/internal/batches/sources/gitlab.go index af8e2e6b716..a8fec3da69c 100644 --- a/enterprise/internal/batches/sources/gitlab.go +++ b/enterprise/internal/batches/sources/gitlab.go @@ -6,7 +6,7 @@ import ( "net/url" "strconv" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" @@ -203,7 +203,7 @@ func (s *GitLabSource) LoadChangeset(ctx context.Context, cs *Changeset) error { mr, err := s.client.GetMergeRequest(ctx, project, gitlab.ID(iid)) if err != nil { - if errors.Cause(err) == gitlab.ErrMergeRequestNotFound { + if errors.Is(err, gitlab.ErrMergeRequestNotFound) { return ChangesetNotFoundError{Changeset: cs} } return errors.Wrapf(err, "retrieving merge request %d", iid) diff --git a/enterprise/internal/batches/sources/gitlab_test.go b/enterprise/internal/batches/sources/gitlab_test.go index d0a9c44ccfa..eeb9ee6a384 100644 --- a/enterprise/internal/batches/sources/gitlab_test.go +++ b/enterprise/internal/batches/sources/gitlab_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/inconshreveable/log15" - "github.com/pkg/errors" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/extsvc" @@ -340,10 +340,16 @@ func TestGitLabSource_ChangesetSource(t *testing.T) { p.changeset.Changeset.Metadata = p.mr p.mockGetMergeRequest(43, nil, gitlab.ErrMergeRequestNotFound) + expected := ChangesetNotFoundError{ + Changeset: &Changeset{ + Changeset: &btypes.Changeset{ExternalID: "43"}, + }, + } + if err := p.source.LoadChangeset(p.ctx, p.changeset); err == nil { t.Fatal("unexpectedly no error for not found changeset") - } else if err.Error() != (ChangesetNotFoundError{Changeset: &Changeset{Changeset: &btypes.Changeset{ExternalID: "43"}}}).Error() { - t.Fatalf("unexpected error: %+v", err) + } else if !errors.Is(err, expected) { + t.Fatalf("unexpected error: %+v", errors.UnwrapAll(err)) } }) diff --git a/enterprise/internal/batches/sources/sources.go b/enterprise/internal/batches/sources/sources.go index 06c08581ee2..f736cfaa16e 100644 --- a/enterprise/internal/batches/sources/sources.go +++ b/enterprise/internal/batches/sources/sources.go @@ -6,7 +6,7 @@ import ( "net/url" "sort" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/state/changeset_history.go b/enterprise/internal/batches/state/changeset_history.go index b248373dfd1..512bae8d081 100644 --- a/enterprise/internal/batches/state/changeset_history.go +++ b/enterprise/internal/batches/state/changeset_history.go @@ -4,8 +4,8 @@ import ( "sort" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/extsvc/github" diff --git a/enterprise/internal/batches/state/state.go b/enterprise/internal/batches/state/state.go index f94ca180419..45210e46003 100644 --- a/enterprise/internal/batches/state/state.go +++ b/enterprise/internal/batches/state/state.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/go-diff/diff" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/store/batch_changes.go b/enterprise/internal/batches/store/batch_changes.go index c5f2205c27d..ac42e1918d0 100644 --- a/enterprise/internal/batches/store/batch_changes.go +++ b/enterprise/internal/batches/store/batch_changes.go @@ -4,8 +4,8 @@ import ( "context" "strconv" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/go-diff/diff" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/store/batch_specs.go b/enterprise/internal/batches/store/batch_specs.go index b51e46a553a..99b5998f2c0 100644 --- a/enterprise/internal/batches/store/batch_specs.go +++ b/enterprise/internal/batches/store/batch_specs.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/enterprise/internal/batches/store/changeset_events.go b/enterprise/internal/batches/store/changeset_events.go index 7095306ddd8..c7d0596a04e 100644 --- a/enterprise/internal/batches/store/changeset_events.go +++ b/enterprise/internal/batches/store/changeset_events.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" ) diff --git a/enterprise/internal/batches/store/changeset_specs.go b/enterprise/internal/batches/store/changeset_specs.go index 83dd57d94ac..074a148153b 100644 --- a/enterprise/internal/batches/store/changeset_specs.go +++ b/enterprise/internal/batches/store/changeset_specs.go @@ -5,8 +5,8 @@ import ( "encoding/json" "strconv" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/search" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/store/changesets.go b/enterprise/internal/batches/store/changesets.go index f82cbc218a1..fbdb37f1805 100644 --- a/enterprise/internal/batches/store/changesets.go +++ b/enterprise/internal/batches/store/changesets.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/search" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/store/store.go b/enterprise/internal/batches/store/store.go index 0af6a1a67a5..5aa2d196bef 100644 --- a/enterprise/internal/batches/store/store.go +++ b/enterprise/internal/batches/store/store.go @@ -9,9 +9,9 @@ import ( "strconv" "time" + "github.com/cockroachdb/errors" "github.com/dineshappavoo/basex" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/enterprise/internal/batches/syncer/syncer.go b/enterprise/internal/batches/syncer/syncer.go index ac5c0915d1f..9821bd95bab 100644 --- a/enterprise/internal/batches/syncer/syncer.go +++ b/enterprise/internal/batches/syncer/syncer.go @@ -6,8 +6,8 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/enterprise/internal/batches/syncer/syncer_test.go b/enterprise/internal/batches/syncer/syncer_test.go index c3941990bf0..640be43d0a7 100644 --- a/enterprise/internal/batches/syncer/syncer_test.go +++ b/enterprise/internal/batches/syncer/syncer_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/testing/mock_sync_state.go b/enterprise/internal/batches/testing/mock_sync_state.go index 59d8484acb7..0c7ef18e424 100644 --- a/enterprise/internal/batches/testing/mock_sync_state.go +++ b/enterprise/internal/batches/testing/mock_sync_state.go @@ -4,7 +4,7 @@ import ( "io" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/enterprise/internal/batches/types/changeset.go b/enterprise/internal/batches/types/changeset.go index 13b1836cac3..93df9ac7a7e 100644 --- a/enterprise/internal/batches/types/changeset.go +++ b/enterprise/internal/batches/types/changeset.go @@ -5,8 +5,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/enterprise/internal/batches/types/changeset_event.go b/enterprise/internal/batches/types/changeset_event.go index 820a8300b10..8117bc5dbbc 100644 --- a/enterprise/internal/batches/types/changeset_event.go +++ b/enterprise/internal/batches/types/changeset_event.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc/bitbucketserver" "github.com/sourcegraph/sourcegraph/internal/extsvc/github" diff --git a/enterprise/internal/batches/types/changeset_spec.go b/enterprise/internal/batches/types/changeset_spec.go index 8b6f9a732f8..0da7ee371b5 100644 --- a/enterprise/internal/batches/types/changeset_spec.go +++ b/enterprise/internal/batches/types/changeset_spec.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" jsonutil "github.com/sourcegraph/batch-change-utils/json" "github.com/sourcegraph/go-diff/diff" diff --git a/enterprise/internal/batches/types/changeset_spec_description.go b/enterprise/internal/batches/types/changeset_spec_description.go index 344a4811bae..c3db9a0dd01 100644 --- a/enterprise/internal/batches/types/changeset_spec_description.go +++ b/enterprise/internal/batches/types/changeset_spec_description.go @@ -1,8 +1,8 @@ package types import ( + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/lib/batches" ) diff --git a/enterprise/internal/batches/types/scheduler/window/config.go b/enterprise/internal/batches/types/scheduler/window/config.go index e55c0c8b38d..e2a91c07bf6 100644 --- a/enterprise/internal/batches/types/scheduler/window/config.go +++ b/enterprise/internal/batches/types/scheduler/window/config.go @@ -4,8 +4,8 @@ import ( "math" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/schema" ) diff --git a/enterprise/internal/batches/types/scheduler/window/rate.go b/enterprise/internal/batches/types/scheduler/window/rate.go index df6672302be..c71c79371e1 100644 --- a/enterprise/internal/batches/types/scheduler/window/rate.go +++ b/enterprise/internal/batches/types/scheduler/window/rate.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type rate struct { diff --git a/enterprise/internal/batches/types/scheduler/window/schedule.go b/enterprise/internal/batches/types/scheduler/window/schedule.go index a37acb782ee..0ec122c7073 100644 --- a/enterprise/internal/batches/types/scheduler/window/schedule.go +++ b/enterprise/internal/batches/types/scheduler/window/schedule.go @@ -3,7 +3,7 @@ package window import ( "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.uber.org/ratelimit" ) diff --git a/enterprise/internal/batches/types/scheduler/window/window.go b/enterprise/internal/batches/types/scheduler/window/window.go index dc22136ae15..c153b8a459d 100644 --- a/enterprise/internal/batches/types/scheduler/window/window.go +++ b/enterprise/internal/batches/types/scheduler/window/window.go @@ -5,8 +5,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/schema" ) diff --git a/enterprise/internal/batches/types/site_credential.go b/enterprise/internal/batches/types/site_credential.go index 62857b799bc..4aeb14b89ce 100644 --- a/enterprise/internal/batches/types/site_credential.go +++ b/enterprise/internal/batches/types/site_credential.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/encryption" diff --git a/enterprise/internal/batches/webhooks/bitbucketserver.go b/enterprise/internal/batches/webhooks/bitbucketserver.go index 836aa04ba6e..52c430039f8 100644 --- a/enterprise/internal/batches/webhooks/bitbucketserver.go +++ b/enterprise/internal/batches/webhooks/bitbucketserver.go @@ -6,10 +6,10 @@ import ( "net/http" "strconv" + "github.com/cockroachdb/errors" gh "github.com/google/go-github/v28/github" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/internal/batches/webhooks/gitlab.go b/enterprise/internal/batches/webhooks/gitlab.go index e9f869d4356..0d0530f88f8 100644 --- a/enterprise/internal/batches/webhooks/gitlab.go +++ b/enterprise/internal/batches/webhooks/gitlab.go @@ -7,8 +7,8 @@ import ( "net/http" "strconv" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" diff --git a/enterprise/internal/batches/webhooks/gitlab_test.go b/enterprise/internal/batches/webhooks/gitlab_test.go index 3c4b59e005a..9036fb67e50 100644 --- a/enterprise/internal/batches/webhooks/gitlab_test.go +++ b/enterprise/internal/batches/webhooks/gitlab_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" ct "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/testing" diff --git a/enterprise/internal/batches/webhooks/webhooks.go b/enterprise/internal/batches/webhooks/webhooks.go index 8ce82c40ddb..cf3ebf8a41a 100644 --- a/enterprise/internal/batches/webhooks/webhooks.go +++ b/enterprise/internal/batches/webhooks/webhooks.go @@ -8,8 +8,8 @@ import ( "net/url" "strconv" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/state" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" diff --git a/enterprise/internal/codeintel/autoindex/enqueuer/enqueuer.go b/enterprise/internal/codeintel/autoindex/enqueuer/enqueuer.go index 46a98e6f0b6..b4b84b0c1ce 100644 --- a/enterprise/internal/codeintel/autoindex/enqueuer/enqueuer.go +++ b/enterprise/internal/codeintel/autoindex/enqueuer/enqueuer.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/enterprise/internal/codeintel/autoindex/enqueuer/index_records.go b/enterprise/internal/codeintel/autoindex/enqueuer/index_records.go index 4536c17d2f8..180ed689eb8 100644 --- a/enterprise/internal/codeintel/autoindex/enqueuer/index_records.go +++ b/enterprise/internal/codeintel/autoindex/enqueuer/index_records.go @@ -3,8 +3,8 @@ package enqueuer import ( "context" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" store "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/lib/codeintel/autoindex/config" diff --git a/enterprise/internal/codeintel/gitserver/client.go b/enterprise/internal/codeintel/gitserver/client.go index 4d5adbd9b29..04cb2e19d9f 100644 --- a/enterprise/internal/codeintel/gitserver/client.go +++ b/enterprise/internal/codeintel/gitserver/client.go @@ -9,8 +9,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/enterprise/internal/codeintel/stores/dbstore/errors.go b/enterprise/internal/codeintel/stores/dbstore/errors.go index a997795c94a..5194ffd3db5 100644 --- a/enterprise/internal/codeintel/stores/dbstore/errors.go +++ b/enterprise/internal/codeintel/stores/dbstore/errors.go @@ -1,6 +1,6 @@ package dbstore -import "github.com/pkg/errors" +import "github.com/cockroachdb/errors" // ErrNotTransactable occurs when Transact is called on a store whose underlying // store handle does not support beginning a transaction. diff --git a/enterprise/internal/codeintel/stores/dbstore/migration/committed_at.go b/enterprise/internal/codeintel/stores/dbstore/migration/committed_at.go index e91b271713d..a2b19883265 100644 --- a/enterprise/internal/codeintel/stores/dbstore/migration/committed_at.go +++ b/enterprise/internal/codeintel/stores/dbstore/migration/committed_at.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/stores/dbstore" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/enterprise/internal/codeintel/stores/uploadstore/gcs_client.go b/enterprise/internal/codeintel/stores/uploadstore/gcs_client.go index ac1ec3fa6c1..6c20c88a309 100644 --- a/enterprise/internal/codeintel/stores/uploadstore/gcs_client.go +++ b/enterprise/internal/codeintel/stores/uploadstore/gcs_client.go @@ -7,10 +7,10 @@ import ( "time" "cloud.google.com/go/storage" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "google.golang.org/api/option" "github.com/sourcegraph/sourcegraph/internal/env" diff --git a/enterprise/internal/codeintel/stores/uploadstore/s3_client.go b/enterprise/internal/codeintel/stores/uploadstore/s3_client.go index 4e6f8009803..d152a60ea47 100644 --- a/enterprise/internal/codeintel/stores/uploadstore/s3_client.go +++ b/enterprise/internal/codeintel/stores/uploadstore/s3_client.go @@ -14,9 +14,9 @@ import ( "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/internal/codeintel/stores/uploadstore/s3_client_test.go b/enterprise/internal/codeintel/stores/uploadstore/s3_client_test.go index 2881f94e150..5ef6e3c5e64 100644 --- a/enterprise/internal/codeintel/stores/uploadstore/s3_client_test.go +++ b/enterprise/internal/codeintel/stores/uploadstore/s3_client_test.go @@ -14,8 +14,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/observation" ) diff --git a/enterprise/internal/codemonitors/background/graphql.go b/enterprise/internal/codemonitors/background/graphql.go index 26c93e8ecd1..73b1b7dff40 100644 --- a/enterprise/internal/codemonitors/background/graphql.go +++ b/enterprise/internal/codemonitors/background/graphql.go @@ -14,7 +14,7 @@ import ( "golang.org/x/net/context/ctxhttp" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type graphQLQuery struct { diff --git a/enterprise/internal/database/authz.go b/enterprise/internal/database/authz.go index 9692723e5b4..2bbfeb93b11 100644 --- a/enterprise/internal/database/authz.go +++ b/enterprise/internal/database/authz.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/enterprise/internal/database/perms_store.go b/enterprise/internal/database/perms_store.go index a130d9db94c..0b124db8b9a 100644 --- a/enterprise/internal/database/perms_store.go +++ b/enterprise/internal/database/perms_store.go @@ -11,10 +11,10 @@ import ( "github.com/sourcegraph/sourcegraph/internal/encryption/keyring" "github.com/RoaringBitmap/roaring" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" "github.com/lib/pq" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/enterprise/internal/insights/background/historical_enqueuer.go b/enterprise/internal/insights/background/historical_enqueuer.go index 1e0b35c734e..cc0bb44e522 100644 --- a/enterprise/internal/insights/background/historical_enqueuer.go +++ b/enterprise/internal/insights/background/historical_enqueuer.go @@ -10,9 +10,9 @@ import ( "golang.org/x/time/rate" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/xhit/go-str2duration/v2" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" diff --git a/enterprise/internal/insights/background/insight_enqueuer.go b/enterprise/internal/insights/background/insight_enqueuer.go index 9891d95dc81..8f439860254 100644 --- a/enterprise/internal/insights/background/insight_enqueuer.go +++ b/enterprise/internal/insights/background/insight_enqueuer.go @@ -5,8 +5,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/background/queryrunner" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/discovery" diff --git a/enterprise/internal/insights/background/queryrunner/graphql.go b/enterprise/internal/insights/background/queryrunner/graphql.go index 0811da1f4db..ad94ee46656 100644 --- a/enterprise/internal/insights/background/queryrunner/graphql.go +++ b/enterprise/internal/insights/background/queryrunner/graphql.go @@ -11,7 +11,7 @@ import ( "golang.org/x/net/context/ctxhttp" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // This file contains all the methods required to execute Sourcegraph searches using our GraphQL diff --git a/enterprise/internal/insights/background/queryrunner/work_handler.go b/enterprise/internal/insights/background/queryrunner/work_handler.go index 26361d18551..01d2a838548 100644 --- a/enterprise/internal/insights/background/queryrunner/work_handler.go +++ b/enterprise/internal/insights/background/queryrunner/work_handler.go @@ -7,9 +7,9 @@ import ( "golang.org/x/time/rate" + "github.com/cockroachdb/errors" "github.com/graph-gophers/graphql-go" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/store" diff --git a/enterprise/internal/insights/discovery/all_repos_iterator.go b/enterprise/internal/insights/discovery/all_repos_iterator.go index b6a85204f02..2c4898d72c6 100644 --- a/enterprise/internal/insights/discovery/all_repos_iterator.go +++ b/enterprise/internal/insights/discovery/all_repos_iterator.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/types" diff --git a/enterprise/internal/insights/store/store.go b/enterprise/internal/insights/store/store.go index 7fbea0a5f5b..2d5031598b1 100644 --- a/enterprise/internal/insights/store/store.go +++ b/enterprise/internal/insights/store/store.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/enterprise/internal/licensing/features.go b/enterprise/internal/licensing/features.go index a7f11dff9a4..64d9f1dd969 100644 --- a/enterprise/internal/licensing/features.go +++ b/enterprise/internal/licensing/features.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/errcode" diff --git a/enterprise/internal/licensing/licensing.go b/enterprise/internal/licensing/licensing.go index d114e616e0f..4daf4dff013 100644 --- a/enterprise/internal/licensing/licensing.go +++ b/enterprise/internal/licensing/licensing.go @@ -5,7 +5,7 @@ import ( "log" "sync" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/crypto/ssh" "github.com/sourcegraph/sourcegraph/enterprise/internal/license" diff --git a/enterprise/internal/licensing/plans.go b/enterprise/internal/licensing/plans.go index 8e44c8c0a67..df93fc93920 100644 --- a/enterprise/internal/licensing/plans.go +++ b/enterprise/internal/licensing/plans.go @@ -3,7 +3,7 @@ package licensing import ( "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // A Plan is a pricing plan, with an associated set of features that it offers. diff --git a/go.mod b/go.mod index 80df924f8d1..db63d53cd7a 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/beevik/etree v1.1.0 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect - github.com/cockroachdb/errors v1.8.2 + github.com/cockroachdb/errors v1.8.4 github.com/cockroachdb/redact v1.0.9 // indirect github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 github.com/containerd/containerd v1.4.0 // indirect @@ -61,7 +61,6 @@ require ( github.com/go-openapi/validate v0.19.11 // indirect github.com/go-redsync/redsync v1.4.2 github.com/gobwas/glob v0.2.3 - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-migrate/migrate/v4 v4.11.0 github.com/golang/gddo v0.0.0-20200831202555-721e228c7686 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e @@ -128,7 +127,6 @@ require ( github.com/opentracing/opentracing-go v1.2.0 github.com/peterbourgon/ff v1.7.0 github.com/peterhellberg/link v1.1.0 - github.com/pkg/errors v0.9.1 github.com/pquerna/cachecontrol v0.0.0-20200819021114-67c6ae64274f // indirect github.com/princjef/gomarkdoc v0.1.3 github.com/prometheus/alertmanager v0.21.0 diff --git a/go.sum b/go.sum index 7eb62076b6b..95f290780fc 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,8 @@ github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.2 h1:rnnWK9Nn5kEMOGz9531HuDx/FOleL4NVH20VsDexVC8= -github.com/cockroachdb/errors v1.8.2/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= +github.com/cockroachdb/errors v1.8.4 h1:41oZ1A4Eju6LviqkGpu5R2M39gHHVAFvOYsQjot1jNc= +github.com/cockroachdb/errors v1.8.4/go.mod h1:GScl7wnuvY335l6h0jbkHIKJ+8uEmUmJRVWKnenUbfI= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= @@ -553,6 +553,7 @@ github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= diff --git a/internal/authz/bitbucketserver/authz.go b/internal/authz/bitbucketserver/authz.go index c983a966f53..4e6721df7d2 100644 --- a/internal/authz/bitbucketserver/authz.go +++ b/internal/authz/bitbucketserver/authz.go @@ -3,8 +3,8 @@ package bitbucketserver import ( "fmt" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/internal/authz/bitbucketserver/provider.go b/internal/authz/bitbucketserver/provider.go index dc84e9c21ea..0a7ae849b18 100644 --- a/internal/authz/bitbucketserver/provider.go +++ b/internal/authz/bitbucketserver/provider.go @@ -8,8 +8,8 @@ import ( "strconv" "time" + "github.com/cockroachdb/errors" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/authz/github/github.go b/internal/authz/github/github.go index 9408ff110bb..79008024373 100644 --- a/internal/authz/github/github.go +++ b/internal/authz/github/github.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/authz/gitlab/oauth.go b/internal/authz/gitlab/oauth.go index 654570001e6..5cde748e586 100644 --- a/internal/authz/gitlab/oauth.go +++ b/internal/authz/gitlab/oauth.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/authz/gitlab/sudo.go b/internal/authz/gitlab/sudo.go index 62657f50dd0..4bef647de53 100644 --- a/internal/authz/gitlab/sudo.go +++ b/internal/authz/gitlab/sudo.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth/providers" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/internal/authz/header.go b/internal/authz/header.go index 270ea7567df..4ff14ed6094 100644 --- a/internal/authz/header.go +++ b/internal/authz/header.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" ) diff --git a/internal/authz/perforce/perforce.go b/internal/authz/perforce/perforce.go index bbdf82dd550..b5e9df5c4f4 100644 --- a/internal/authz/perforce/perforce.go +++ b/internal/authz/perforce/perforce.go @@ -9,10 +9,10 @@ import ( "net/url" "strings" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" jsoniter "github.com/json-iterator/go" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/authz/perms.go b/internal/authz/perms.go index be11e55aa49..19776ed4af9 100644 --- a/internal/authz/perms.go +++ b/internal/authz/perms.go @@ -5,8 +5,8 @@ import ( "time" "github.com/RoaringBitmap/roaring" + "github.com/cockroachdb/errors" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/internal/types" diff --git a/internal/cmd/precise-code-intel-tester/upload.go b/internal/cmd/precise-code-intel-tester/upload.go index d1a4b93a051..dc8d2ebc0f8 100644 --- a/internal/cmd/precise-code-intel-tester/upload.go +++ b/internal/cmd/precise-code-intel-tester/upload.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/cmd/precise-code-intel-tester/util" ) diff --git a/internal/cmd/tracking-issue/issue_loader.go b/internal/cmd/tracking-issue/issue_loader.go index e6667e444de..d69165a6faa 100644 --- a/internal/cmd/tracking-issue/issue_loader.go +++ b/internal/cmd/tracking-issue/issue_loader.go @@ -8,9 +8,9 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/machinebox/graphql" - "github.com/pkg/errors" ) const costPerSearch = 30 diff --git a/internal/cmd/tracking-issue/main.go b/internal/cmd/tracking-issue/main.go index 7f06b0c379d..d58d4a7ccfc 100644 --- a/internal/cmd/tracking-issue/main.go +++ b/internal/cmd/tracking-issue/main.go @@ -10,8 +10,8 @@ import ( "os" "strings" + "github.com/cockroachdb/errors" "github.com/machinebox/graphql" - "github.com/pkg/errors" "golang.org/x/oauth2" ) diff --git a/internal/cmd/tracking-issue/update.go b/internal/cmd/tracking-issue/update.go index f13bde4c7b7..5dfb8575cdb 100644 --- a/internal/cmd/tracking-issue/update.go +++ b/internal/cmd/tracking-issue/update.go @@ -6,9 +6,9 @@ import ( "runtime" "sync" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/machinebox/graphql" - "github.com/pkg/errors" ) // updateIssues will update the body of each of the given issues. Each issue update is performed diff --git a/internal/comby/comby.go b/internal/comby/comby.go index bf8fdba3e89..8e1a8bf7782 100644 --- a/internal/comby/comby.go +++ b/internal/comby/comby.go @@ -12,7 +12,7 @@ import ( "strings" "syscall" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" diff --git a/internal/conf/client.go b/internal/conf/client.go index fc5928ac697..1df01968ca0 100644 --- a/internal/conf/client.go +++ b/internal/conf/client.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" @@ -209,11 +209,16 @@ func (c *client) continuouslyUpdate(optOnlySetByTests *continuousUpdateOptions) } isFrontendUnreachableError := func(err error) bool { - if urlErr, ok := errors.Cause(err).(*url.Error); ok { - if netErr, ok := urlErr.Err.(*net.OpError); ok && netErr.Op == "dial" { + // Unwrap error one layer at a time to determine if any part of the chain is a + // dialing error until it reaches the root cause. + + var targetUrlErr *url.Error + if ok := errors.As(err, &targetUrlErr); ok { + if netErr, ok := targetUrlErr.Err.(*net.OpError); ok && netErr.Op == "dial" { return true } } + return false } diff --git a/internal/conf/client_test.go b/internal/conf/client_test.go index 4ea6fe9a2d6..f2fecc8ead4 100644 --- a/internal/conf/client_test.go +++ b/internal/conf/client_test.go @@ -9,6 +9,8 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" + "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" ) @@ -19,7 +21,10 @@ func TestClient_continuouslyUpdate(t *testing.T) { return conftypes.RawUnified{}, &url.Error{ Op: "Post", URL: "https://example.com", - Err: &net.OpError{Op: "dial"}, + Err: &net.OpError{ + Op: "dial", + Err: errors.New("connection reset"), + }, } } defer func() { api.MockInternalClientConfiguration = nil }() diff --git a/internal/conf/reposource/common.go b/internal/conf/reposource/common.go index 11469b96637..a487dd17d2c 100644 --- a/internal/conf/reposource/common.go +++ b/internal/conf/reposource/common.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/conf/server.go b/internal/conf/server.go index 4c8c14a55c4..6c892cadc42 100644 --- a/internal/conf/server.go +++ b/internal/conf/server.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/jsonx" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" diff --git a/internal/conf/store.go b/internal/conf/store.go index 15405cc3869..da41fc64b99 100644 --- a/internal/conf/store.go +++ b/internal/conf/store.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" ) diff --git a/internal/database/access_tokens.go b/internal/database/access_tokens.go index aa1354f2703..36ab071cf67 100644 --- a/internal/database/access_tokens.go +++ b/internal/database/access_tokens.go @@ -8,9 +8,9 @@ import ( "encoding/hex" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/authenticator.go b/internal/database/authenticator.go index 90042c1a374..b9a9c622d71 100644 --- a/internal/database/authenticator.go +++ b/internal/database/authenticator.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" diff --git a/internal/database/authenticator_test.go b/internal/database/authenticator_test.go index 42e2342d87f..2bef916f62c 100644 --- a/internal/database/authenticator_test.go +++ b/internal/database/authenticator_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/encryption" et "github.com/sourcegraph/sourcegraph/internal/encryption/testing" diff --git a/internal/database/batch/batch.go b/internal/database/batch/batch.go index 5e89a60663d..f0c41f8c7ba 100644 --- a/internal/database/batch/batch.go +++ b/internal/database/batch/batch.go @@ -7,8 +7,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbconn" diff --git a/internal/database/dbcache/cached_default_repos.go b/internal/database/dbcache/cached_default_repos.go index 698363918f0..ecf3920245d 100644 --- a/internal/database/dbcache/cached_default_repos.go +++ b/internal/database/dbcache/cached_default_repos.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/types" diff --git a/internal/database/dbconn/dbconn.go b/internal/database/dbconn/dbconn.go index cc2e9685f9a..81dde23ef03 100644 --- a/internal/database/dbconn/dbconn.go +++ b/internal/database/dbconn/dbconn.go @@ -15,12 +15,12 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/gchaincl/sqlhooks/v2" "github.com/inconshreveable/log15" "github.com/jackc/pgx/v4" "github.com/jackc/pgx/v4/stdlib" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sourcegraph/sourcegraph/internal/env" diff --git a/internal/database/dbconn/migration.go b/internal/database/dbconn/migration.go index f30b1759d41..7066b617051 100644 --- a/internal/database/dbconn/migration.go +++ b/internal/database/dbconn/migration.go @@ -8,11 +8,11 @@ import ( "os" "time" + "github.com/cockroachdb/errors" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/postgres" "github.com/golang-migrate/migrate/v4/source/httpfs" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/migrations" ) diff --git a/internal/database/dbtesting/dbtesting.go b/internal/database/dbtesting/dbtesting.go index 982e070be4e..c8cad5236c5 100644 --- a/internal/database/dbtesting/dbtesting.go +++ b/internal/database/dbtesting/dbtesting.go @@ -15,7 +15,7 @@ import ( "sync" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database/dbconn" ) diff --git a/internal/database/dbutil/dbutil.go b/internal/database/dbutil/dbutil.go index c6d73728260..21405e01f68 100644 --- a/internal/database/dbutil/dbutil.go +++ b/internal/database/dbutil/dbutil.go @@ -11,10 +11,10 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/jackc/pgconn" "github.com/opentracing/opentracing-go/ext" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/trace/ot" ) diff --git a/internal/database/event_logs.go b/internal/database/event_logs.go index 92887f20faf..255e6527bf5 100644 --- a/internal/database/event_logs.go +++ b/internal/database/event_logs.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/external_services.go b/internal/database/external_services.go index 2019ef9df72..a2fa1f9b49d 100644 --- a/internal/database/external_services.go +++ b/internal/database/external_services.go @@ -10,11 +10,11 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" "github.com/keegancsmith/sqlf" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/tidwall/gjson" "github.com/xeipuuv/gojsonschema" diff --git a/internal/database/feature_flags.go b/internal/database/feature_flags.go index e310a29f30e..4d33219c096 100644 --- a/internal/database/feature_flags.go +++ b/internal/database/feature_flags.go @@ -4,8 +4,8 @@ import ( "context" "database/sql" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "golang.org/x/sync/errgroup" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/internal/database/gitserver_repos.go b/internal/database/gitserver_repos.go index 3df05120471..fdc22d0eb67 100644 --- a/internal/database/gitserver_repos.go +++ b/internal/database/gitserver_repos.go @@ -5,8 +5,8 @@ import ( "database/sql" "strings" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/internal/database/namespaces.go b/internal/database/namespaces.go index b78fe6b0d7d..466680faac2 100644 --- a/internal/database/namespaces.go +++ b/internal/database/namespaces.go @@ -4,8 +4,8 @@ import ( "context" "database/sql" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/oob_migrate.go b/internal/database/oob_migrate.go index 83e24364bee..68f2f4cf03b 100644 --- a/internal/database/oob_migrate.go +++ b/internal/database/oob_migrate.go @@ -4,8 +4,8 @@ import ( "context" "database/sql" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/phabricator.go b/internal/database/phabricator.go index 0d656404343..2f2b0cdaa59 100644 --- a/internal/database/phabricator.go +++ b/internal/database/phabricator.go @@ -5,8 +5,8 @@ import ( "database/sql" "fmt" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/internal/database/query/query_test.go b/internal/database/query/query_test.go index b13b1f287b1..3d5c9cf6110 100644 --- a/internal/database/query/query_test.go +++ b/internal/database/query/query_test.go @@ -5,8 +5,8 @@ import ( "log" "testing" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/query" ) diff --git a/internal/database/repos.go b/internal/database/repos.go index d8b465013a6..c029269922b 100644 --- a/internal/database/repos.go +++ b/internal/database/repos.go @@ -10,9 +10,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/internal/database/repos_perm.go b/internal/database/repos_perm.go index 78694df0c29..2b87d7103aa 100644 --- a/internal/database/repos_perm.go +++ b/internal/database/repos_perm.go @@ -3,8 +3,8 @@ package database import ( "context" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" "github.com/sourcegraph/sourcegraph/internal/actor" diff --git a/internal/database/saved_queries.go b/internal/database/saved_queries.go index 32f622cf1b9..103d40c88c8 100644 --- a/internal/database/saved_queries.go +++ b/internal/database/saved_queries.go @@ -5,7 +5,7 @@ import ( "database/sql" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/saved_searches.go b/internal/database/saved_searches.go index eed2f5c6641..20a7201a982 100644 --- a/internal/database/saved_searches.go +++ b/internal/database/saved_searches.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database/basestore" diff --git a/internal/database/schemadoc/main.go b/internal/database/schemadoc/main.go index c5c52aed069..5305ca60c08 100644 --- a/internal/database/schemadoc/main.go +++ b/internal/database/schemadoc/main.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database/dbconn" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/user_credentials.go b/internal/database/user_credentials.go index d87b6633357..8e67d8c294e 100644 --- a/internal/database/user_credentials.go +++ b/internal/database/user_credentials.go @@ -6,8 +6,8 @@ import ( "fmt" "time" + "github.com/cockroachdb/errors" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/database/user_credentials_test.go b/internal/database/user_credentials_test.go index 6bd9f3bff21..fe642dbd02a 100644 --- a/internal/database/user_credentials_test.go +++ b/internal/database/user_credentials_test.go @@ -10,10 +10,10 @@ import ( "reflect" "testing" + "github.com/cockroachdb/errors" "github.com/gomodule/oauth1/oauth" "github.com/google/go-cmp/cmp" "github.com/keegancsmith/sqlf" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" "github.com/sourcegraph/sourcegraph/internal/encryption" diff --git a/internal/database/users.go b/internal/database/users.go index 03c3e31ba86..5b338621a0e 100644 --- a/internal/database/users.go +++ b/internal/database/users.go @@ -10,12 +10,12 @@ import ( "sync" "unicode/utf8" + "github.com/cockroachdb/errors" "github.com/google/uuid" "github.com/inconshreveable/log15" "github.com/jackc/pgconn" "github.com/keegancsmith/sqlf" "github.com/lib/pq" - "github.com/pkg/errors" "golang.org/x/crypto/bcrypt" "github.com/sourcegraph/sourcegraph/internal/actor" diff --git a/internal/diskcache/cache.go b/internal/diskcache/cache.go index adc8385e82f..5939757ad69 100644 --- a/internal/diskcache/cache.go +++ b/internal/diskcache/cache.go @@ -13,8 +13,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go/ext" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/trace/ot" ) diff --git a/internal/encryption/awskms/aws_kms.go b/internal/encryption/awskms/aws_kms.go index 97a3ae8654f..fe7ef694d17 100644 --- a/internal/encryption/awskms/aws_kms.go +++ b/internal/encryption/awskms/aws_kms.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/encryption" "github.com/sourcegraph/sourcegraph/schema" diff --git a/internal/encryption/rsa.go b/internal/encryption/rsa.go index 59127042326..7f8ee86017e 100644 --- a/internal/encryption/rsa.go +++ b/internal/encryption/rsa.go @@ -6,8 +6,8 @@ import ( "crypto/x509" "encoding/pem" + "github.com/cockroachdb/errors" "github.com/google/uuid" - "github.com/pkg/errors" "golang.org/x/crypto/ssh" ) diff --git a/internal/endpoint/endpoint.go b/internal/endpoint/endpoint.go index f3a8eb1a9a2..8737a8ca6c7 100644 --- a/internal/endpoint/endpoint.go +++ b/internal/endpoint/endpoint.go @@ -12,8 +12,8 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" corev1 "k8s.io/api/core/v1" diff --git a/internal/errcode/presentation_error_test.go b/internal/errcode/presentation_error_test.go index 37489a68819..6fed509bb7a 100644 --- a/internal/errcode/presentation_error_test.go +++ b/internal/errcode/presentation_error_test.go @@ -3,7 +3,7 @@ package errcode import ( "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestPresentationError(t *testing.T) { diff --git a/internal/extsvc/awscodecommit/client.go b/internal/extsvc/awscodecommit/client.go index 52726776ad6..ec1bde27f72 100644 --- a/internal/extsvc/awscodecommit/client.go +++ b/internal/extsvc/awscodecommit/client.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" codecommittypes "github.com/aws/aws-sdk-go-v2/service/codecommit/types" "github.com/aws/smithy-go" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/rcache" ) diff --git a/internal/extsvc/bitbucketcloud/client.go b/internal/extsvc/bitbucketcloud/client.go index 0ee34171c79..9da6dab0a32 100644 --- a/internal/extsvc/bitbucketcloud/client.go +++ b/internal/extsvc/bitbucketcloud/client.go @@ -11,9 +11,9 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing-contrib/go-stdlib/nethttp" - "github.com/pkg/errors" "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/httpcli" diff --git a/internal/extsvc/bitbucketserver/client.go b/internal/extsvc/bitbucketserver/client.go index 61569f016c9..7675f9be9b3 100644 --- a/internal/extsvc/bitbucketserver/client.go +++ b/internal/extsvc/bitbucketserver/client.go @@ -17,10 +17,10 @@ import ( "time" "github.com/RoaringBitmap/roaring" + "github.com/cockroachdb/errors" "github.com/gomodule/oauth1/oauth" "github.com/inconshreveable/log15" "github.com/opentracing-contrib/go-stdlib/nethttp" - "github.com/pkg/errors" "github.com/segmentio/fasthash/fnv1" "golang.org/x/time/rate" diff --git a/internal/extsvc/github/common.go b/internal/extsvc/github/common.go index 06f0e29f067..e15e465d192 100644 --- a/internal/extsvc/github/common.go +++ b/internal/extsvc/github/common.go @@ -15,8 +15,8 @@ import ( "time" "github.com/Masterminds/semver" + "github.com/cockroachdb/errors" "github.com/google/go-github/github" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/segmentio/fasthash/fnv1" diff --git a/internal/extsvc/github/v3.go b/internal/extsvc/github/v3.go index 67077b74354..8c9858839bb 100644 --- a/internal/extsvc/github/v3.go +++ b/internal/extsvc/github/v3.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" diff --git a/internal/extsvc/github/v4.go b/internal/extsvc/github/v4.go index 6fdd7f88c0c..78dbeaf9130 100644 --- a/internal/extsvc/github/v4.go +++ b/internal/extsvc/github/v4.go @@ -12,11 +12,11 @@ import ( "time" "github.com/Masterminds/semver" + "github.com/cockroachdb/errors" "github.com/graphql-go/graphql/language/ast" "github.com/graphql-go/graphql/language/parser" "github.com/graphql-go/graphql/language/visitor" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" diff --git a/internal/extsvc/github/v4_test.go b/internal/extsvc/github/v4_test.go index ce4c74c5d25..be8c162a59d 100644 --- a/internal/extsvc/github/v4_test.go +++ b/internal/extsvc/github/v4_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" "github.com/sourcegraph/sourcegraph/internal/httptestutil" diff --git a/internal/extsvc/gitlab/client.go b/internal/extsvc/gitlab/client.go index 781467214da..365161cd661 100644 --- a/internal/extsvc/gitlab/client.go +++ b/internal/extsvc/gitlab/client.go @@ -13,8 +13,8 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/internal/extsvc/gitlab/merge_requests.go b/internal/extsvc/gitlab/merge_requests.go index 4fdc4ec205a..bca7df2d0a8 100644 --- a/internal/extsvc/gitlab/merge_requests.go +++ b/internal/extsvc/gitlab/merge_requests.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type ID int64 diff --git a/internal/extsvc/gitlab/notes.go b/internal/extsvc/gitlab/notes.go index 283bedd7228..fd82bea3d49 100644 --- a/internal/extsvc/gitlab/notes.go +++ b/internal/extsvc/gitlab/notes.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // GetMergeRequestNotes retrieves the notes for the given merge request. As the diff --git a/internal/extsvc/gitlab/pipelines.go b/internal/extsvc/gitlab/pipelines.go index 737d881f614..4959b6a5130 100644 --- a/internal/extsvc/gitlab/pipelines.go +++ b/internal/extsvc/gitlab/pipelines.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // GetMergeRequestPipelines retrieves the pipelines that have been executed as diff --git a/internal/extsvc/gitlab/repositories.go b/internal/extsvc/gitlab/repositories.go index 3bad7814896..57aaa81f8ae 100644 --- a/internal/extsvc/gitlab/repositories.go +++ b/internal/extsvc/gitlab/repositories.go @@ -7,7 +7,7 @@ import ( "net/url" "strconv" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type Tree struct { diff --git a/internal/extsvc/gitlab/resource_state_events.go b/internal/extsvc/gitlab/resource_state_events.go index c854745f17b..d3eba2e9b22 100644 --- a/internal/extsvc/gitlab/resource_state_events.go +++ b/internal/extsvc/gitlab/resource_state_events.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // GetMergeRequestResourceStateEvents retrieves the events for the given merge request. As the diff --git a/internal/extsvc/gitlab/webhooks/events.go b/internal/extsvc/gitlab/webhooks/events.go index e37235699df..8602e6cdf9b 100644 --- a/internal/extsvc/gitlab/webhooks/events.go +++ b/internal/extsvc/gitlab/webhooks/events.go @@ -3,7 +3,7 @@ package webhooks import ( "encoding/json" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc/gitlab" ) diff --git a/internal/extsvc/gitlab/webhooks/merge_requests.go b/internal/extsvc/gitlab/webhooks/merge_requests.go index 7a09e643a1b..b08e00f2366 100644 --- a/internal/extsvc/gitlab/webhooks/merge_requests.go +++ b/internal/extsvc/gitlab/webhooks/merge_requests.go @@ -1,7 +1,7 @@ package webhooks import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc/gitlab" ) diff --git a/internal/extsvc/phabricator/client.go b/internal/extsvc/phabricator/client.go index 510d343e0cc..e3f238a3d9b 100644 --- a/internal/extsvc/phabricator/client.go +++ b/internal/extsvc/phabricator/client.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/uber/gonduit" diff --git a/internal/extsvc/types.go b/internal/extsvc/types.go index ce686341335..99315e36ec4 100644 --- a/internal/extsvc/types.go +++ b/internal/extsvc/types.go @@ -8,8 +8,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "golang.org/x/time/rate" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/gitserver/client.go b/internal/gitserver/client.go index aef0ab49c49..9238ecdf7aa 100644 --- a/internal/gitserver/client.go +++ b/internal/gitserver/client.go @@ -17,13 +17,13 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" "github.com/neelance/parallel" "github.com/opentracing-contrib/go-stdlib/nethttp" "github.com/opentracing/opentracing-go/ext" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/internal/gitserver/client_test.go b/internal/gitserver/client_test.go index 3450de41e56..84845b4f1e6 100644 --- a/internal/gitserver/client_test.go +++ b/internal/gitserver/client_test.go @@ -16,9 +16,9 @@ import ( "sort" "testing" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/gitserver/server" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/gqltestutil/access_token.go b/internal/gqltestutil/access_token.go index d5e062eaca5..6128b0cf3d3 100644 --- a/internal/gqltestutil/access_token.go +++ b/internal/gqltestutil/access_token.go @@ -1,7 +1,7 @@ package gqltestutil import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // CreateAccessToken creates a new access token with given note and scopes for the diff --git a/internal/gqltestutil/client.go b/internal/gqltestutil/client.go index 72fcceafeb7..bf70af3057f 100644 --- a/internal/gqltestutil/client.go +++ b/internal/gqltestutil/client.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/lazyregexp" ) diff --git a/internal/gqltestutil/external_service.go b/internal/gqltestutil/external_service.go index e140f181854..35b3387a717 100644 --- a/internal/gqltestutil/external_service.go +++ b/internal/gqltestutil/external_service.go @@ -1,7 +1,7 @@ package gqltestutil import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type AddExternalServiceInput struct { diff --git a/internal/gqltestutil/git_blob.go b/internal/gqltestutil/git_blob.go index f1c8c6858fe..09a272ad574 100644 --- a/internal/gqltestutil/git_blob.go +++ b/internal/gqltestutil/git_blob.go @@ -1,7 +1,7 @@ package gqltestutil import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // GitBlob returns blob content of the file in given repository at given revision. diff --git a/internal/gqltestutil/helper.go b/internal/gqltestutil/helper.go index 77547cce523..e4358d79a1f 100644 --- a/internal/gqltestutil/helper.go +++ b/internal/gqltestutil/helper.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ErrContinueRetry = errors.New("continue Retry") diff --git a/internal/gqltestutil/organization.go b/internal/gqltestutil/organization.go index 6a111ea2109..9dd86cc25ab 100644 --- a/internal/gqltestutil/organization.go +++ b/internal/gqltestutil/organization.go @@ -1,7 +1,7 @@ package gqltestutil import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Organization contains basic information of an organization. diff --git a/internal/gqltestutil/permissions.go b/internal/gqltestutil/permissions.go index d455a786c2e..430ccd40ffc 100644 --- a/internal/gqltestutil/permissions.go +++ b/internal/gqltestutil/permissions.go @@ -1,6 +1,6 @@ package gqltestutil -import "github.com/pkg/errors" +import "github.com/cockroachdb/errors" // ScheduleRepositoryPermissionsSync schedules a permissions syncing request for // the given repository. diff --git a/internal/gqltestutil/repository.go b/internal/gqltestutil/repository.go index dcb6f69f9ab..32283053b44 100644 --- a/internal/gqltestutil/repository.go +++ b/internal/gqltestutil/repository.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // WaitForReposToBeCloned waits (up to two minutes) for all repositories diff --git a/internal/gqltestutil/search.go b/internal/gqltestutil/search.go index 94902c19473..7a429377776 100644 --- a/internal/gqltestutil/search.go +++ b/internal/gqltestutil/search.go @@ -6,7 +6,7 @@ import ( "net/http" "sort" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/search/streaming/api" streamhttp "github.com/sourcegraph/sourcegraph/internal/search/streaming/http" diff --git a/internal/gqltestutil/search_context.go b/internal/gqltestutil/search_context.go index d5b77cb101c..bc44c362212 100644 --- a/internal/gqltestutil/search_context.go +++ b/internal/gqltestutil/search_context.go @@ -1,7 +1,7 @@ package gqltestutil import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type CreateSearchContextInput struct { diff --git a/internal/gqltestutil/settings.go b/internal/gqltestutil/settings.go index c8d3e9543db..f98971b12fb 100644 --- a/internal/gqltestutil/settings.go +++ b/internal/gqltestutil/settings.go @@ -1,8 +1,8 @@ package gqltestutil import ( + "github.com/cockroachdb/errors" jsoniter "github.com/json-iterator/go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/jsonc" "github.com/sourcegraph/sourcegraph/schema" diff --git a/internal/gqltestutil/user.go b/internal/gqltestutil/user.go index a99cd41e941..35c55bbf8c1 100644 --- a/internal/gqltestutil/user.go +++ b/internal/gqltestutil/user.go @@ -1,7 +1,7 @@ package gqltestutil import ( - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // CreateUser creates a new user with the given username and email. diff --git a/internal/httpcli/client.go b/internal/httpcli/client.go index 74777fee347..c293f0426b5 100644 --- a/internal/httpcli/client.go +++ b/internal/httpcli/client.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/gregjones/httpcache" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/rcache" "github.com/sourcegraph/sourcegraph/internal/trace/ot" diff --git a/internal/inventory/entries.go b/internal/inventory/entries.go index db856647578..b16f40e4fcd 100644 --- a/internal/inventory/entries.go +++ b/internal/inventory/entries.go @@ -5,7 +5,7 @@ import ( "io/fs" "sort" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // fileReadBufferSize is the size of the buffer we'll use while reading file contents diff --git a/internal/inventory/inventory.go b/internal/inventory/inventory.go index cc25afa4615..ee63097fc43 100644 --- a/internal/inventory/inventory.go +++ b/internal/inventory/inventory.go @@ -9,9 +9,9 @@ import ( "io/fs" "log" + "github.com/cockroachdb/errors" "github.com/go-enry/go-enry/v2" "github.com/go-enry/go-enry/v2/data" - "github.com/pkg/errors" ) // Inventory summarizes a tree's contents (e.g., which programming diff --git a/internal/jsonc/jsonc.go b/internal/jsonc/jsonc.go index 38edd699a13..f9bcab4aa3f 100644 --- a/internal/jsonc/jsonc.go +++ b/internal/jsonc/jsonc.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/jsonx" ) diff --git a/internal/repos/awscodecommit.go b/internal/repos/awscodecommit.go index 0c72eb8e934..d0a56f55be4 100644 --- a/internal/repos/awscodecommit.go +++ b/internal/repos/awscodecommit.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/config" awscredentials "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/codecommit" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/net/http2" "github.com/sourcegraph/sourcegraph/internal/conf/reposource" diff --git a/internal/repos/bitbucketcloud.go b/internal/repos/bitbucketcloud.go index 808f9fdb2a8..d6a29acd5a5 100644 --- a/internal/repos/bitbucketcloud.go +++ b/internal/repos/bitbucketcloud.go @@ -6,8 +6,8 @@ import ( "net/url" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/reposource" diff --git a/internal/repos/bitbucketserver.go b/internal/repos/bitbucketserver.go index b62ecf0ddfc..3c1b13fb877 100644 --- a/internal/repos/bitbucketserver.go +++ b/internal/repos/bitbucketserver.go @@ -8,8 +8,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/reposource" diff --git a/internal/repos/clone_url.go b/internal/repos/clone_url.go index 7e9d8a381c3..18efefae082 100644 --- a/internal/repos/clone_url.go +++ b/internal/repos/clone_url.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/awscodecommit" diff --git a/internal/repos/github.go b/internal/repos/github.go index 27b6cc5744a..3dd4e1d184a 100644 --- a/internal/repos/github.go +++ b/internal/repos/github.go @@ -9,8 +9,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/internal/repos/github_test.go b/internal/repos/github_test.go index c2622deed0e..54c28d7229c 100644 --- a/internal/repos/github_test.go +++ b/internal/repos/github_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/repos/gitlab.go b/internal/repos/gitlab.go index 1b1a7d1a350..0ded2bca656 100644 --- a/internal/repos/gitlab.go +++ b/internal/repos/gitlab.go @@ -9,8 +9,8 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/internal/repos/gitolite.go b/internal/repos/gitolite.go index 9faedc91f68..a00ccb2c3fb 100644 --- a/internal/repos/gitolite.go +++ b/internal/repos/gitolite.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "golang.org/x/sync/semaphore" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/repos/integration_test.go b/internal/repos/integration_test.go index e1296e36c49..90927184a42 100644 --- a/internal/repos/integration_test.go +++ b/internal/repos/integration_test.go @@ -5,9 +5,9 @@ import ( "flag" "testing" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/dbconn" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/internal/repos/other.go b/internal/repos/other.go index 5c44abfed27..116ec6769ac 100644 --- a/internal/repos/other.go +++ b/internal/repos/other.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/conf/reposource" diff --git a/internal/repos/phabricator.go b/internal/repos/phabricator.go index 0a8a58babd8..b1ad46937a5 100644 --- a/internal/repos/phabricator.go +++ b/internal/repos/phabricator.go @@ -5,9 +5,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/goware/urlx" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/internal/repos/sources.go b/internal/repos/sources.go index f945e8293d9..1fd16b8a753 100644 --- a/internal/repos/sources.go +++ b/internal/repos/sources.go @@ -6,8 +6,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/auth" diff --git a/internal/repos/status_messages.go b/internal/repos/status_messages.go index 1f268a5319d..724d47b7ee4 100644 --- a/internal/repos/status_messages.go +++ b/internal/repos/status_messages.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/repos/status_messages_test.go b/internal/repos/status_messages_test.go index 5eabf069468..e16b188d8e7 100644 --- a/internal/repos/status_messages_test.go +++ b/internal/repos/status_messages_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/google/uuid" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/internal/repos/store.go b/internal/repos/store.go index cf6b4f9d00b..62cbeb4a055 100644 --- a/internal/repos/store.go +++ b/internal/repos/store.go @@ -7,12 +7,12 @@ import ( "io" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/keegancsmith/sqlf" "github.com/lib/pq" "github.com/opentracing/opentracing-go" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/internal/repos/syncer.go b/internal/repos/syncer.go index 8cf5e29c5e1..ce2820d67c1 100644 --- a/internal/repos/syncer.go +++ b/internal/repos/syncer.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/repos/types.go b/internal/repos/types.go index a8cdf226517..26b8ea99765 100644 --- a/internal/repos/types.go +++ b/internal/repos/types.go @@ -7,7 +7,7 @@ import ( "hash/fnv" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/internal/repoupdater/client.go b/internal/repoupdater/client.go index 3f079fc929e..422755d66ed 100644 --- a/internal/repoupdater/client.go +++ b/internal/repoupdater/client.go @@ -9,9 +9,9 @@ import ( "net/http" "net/url" + "github.com/cockroachdb/errors" "github.com/opentracing-contrib/go-stdlib/nethttp" "github.com/opentracing/opentracing-go/ext" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/env" diff --git a/internal/search/query/parser_test.go b/internal/search/query/parser_test.go index 6124c1a8da2..a10d2c9a818 100644 --- a/internal/search/query/parser_test.go +++ b/internal/search/query/parser_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" + "github.com/cockroachdb/errors" "github.com/hexops/autogold" - "github.com/pkg/errors" ) func collectLabels(nodes []Node) (result labels) { diff --git a/internal/search/query/validate.go b/internal/search/query/validate.go index 2b45280c0bc..231439fae31 100644 --- a/internal/search/query/validate.go +++ b/internal/search/query/validate.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/cockroachdb/errors" "github.com/go-enry/go-enry/v2" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/search/filter" ) diff --git a/internal/search/repos/repos.go b/internal/search/repos/repos.go index f543d582cc0..3928edf11e0 100644 --- a/internal/search/repos/repos.go +++ b/internal/search/repos/repos.go @@ -12,9 +12,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/neelance/parallel" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/search/run/aggregator.go b/internal/search/run/aggregator.go index 9b13453adcd..b3ccd192b84 100644 --- a/internal/search/run/aggregator.go +++ b/internal/search/run/aggregator.go @@ -4,9 +4,9 @@ import ( "context" "sync" + "github.com/cockroachdb/errors" "github.com/hashicorp/go-multierror" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" "github.com/sourcegraph/sourcegraph/internal/search" searchrepos "github.com/sourcegraph/sourcegraph/internal/search/repos" diff --git a/internal/search/run/commit.go b/internal/search/run/commit.go index f67d238dcf9..2889c92bf0f 100644 --- a/internal/search/run/commit.go +++ b/internal/search/run/commit.go @@ -13,7 +13,7 @@ import ( otlog "github.com/opentracing/opentracing-go/log" "golang.org/x/sync/errgroup" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbutil" diff --git a/internal/search/run/symbol.go b/internal/search/run/symbol.go index e9fb0535112..71759f141d1 100644 --- a/internal/search/run/symbol.go +++ b/internal/search/run/symbol.go @@ -7,12 +7,12 @@ import ( "sort" "time" + "github.com/cockroachdb/errors" "github.com/google/zoekt" zoektquery "github.com/google/zoekt/query" "github.com/neelance/parallel" "github.com/opentracing/opentracing-go/ext" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/search/run/textsearch.go b/internal/search/run/textsearch.go index a3a1836c505..94c80d603f8 100644 --- a/internal/search/run/textsearch.go +++ b/internal/search/run/textsearch.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" "github.com/sourcegraph/sourcegraph/internal/search/streaming" diff --git a/internal/search/run/textsearch_test.go b/internal/search/run/textsearch_test.go index 98f0c6560c2..263a3af43af 100644 --- a/internal/search/run/textsearch_test.go +++ b/internal/search/run/textsearch_test.go @@ -12,8 +12,8 @@ import ( "testing/quick" "time" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/searcher/protocol" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/search/run/zoekt.go b/internal/search/run/zoekt.go index 5af01db00f5..6f9d4535f8c 100644 --- a/internal/search/run/zoekt.go +++ b/internal/search/run/zoekt.go @@ -11,11 +11,11 @@ import ( "go.uber.org/atomic" "golang.org/x/sync/errgroup" + "github.com/cockroachdb/errors" "github.com/google/zoekt" zoektquery "github.com/google/zoekt/query" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/search/searcher/client.go b/internal/search/searcher/client.go index d8f0ea1fecd..a68630271be 100644 --- a/internal/search/searcher/client.go +++ b/internal/search/searcher/client.go @@ -12,8 +12,8 @@ import ( "strconv" "time" + "github.com/cockroachdb/errors" "github.com/opentracing-contrib/go-stdlib/nethttp" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/cmd/searcher/protocol" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/slack/slack.go b/internal/slack/slack.go index 3330e9d12c5..d9c0024298c 100644 --- a/internal/slack/slack.go +++ b/internal/slack/slack.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Client is capable of posting a message to a Slack webhook diff --git a/internal/src-cli/version.go b/internal/src-cli/version.go index b6248a57dec..1511886190a 100644 --- a/internal/src-cli/version.go +++ b/internal/src-cli/version.go @@ -8,7 +8,7 @@ import ( "sort" "github.com/Masterminds/semver" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/linkheader" ) diff --git a/internal/store/retry_test.go b/internal/store/retry_test.go index 09753db0578..2f6fc5609fe 100644 --- a/internal/store/retry_test.go +++ b/internal/store/retry_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestGetZipFileWithRetry(t *testing.T) { diff --git a/internal/store/store.go b/internal/store/store.go index 4f15c98350d..2bb32e2a041 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -16,10 +16,10 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/internal/store/store_test.go b/internal/store/store_test.go index 9f2abacee52..50742b9fdbf 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" ) @@ -88,7 +88,7 @@ func TestPrepareZip_fetchTarFail(t *testing.T) { return nil, fetchErr } _, err := s.PrepareZip(context.Background(), "foo", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef") - if errors.Cause(err) != fetchErr { + if !errors.Is(err, fetchErr) { t.Fatalf("expected PrepareZip to fail with %v, failed with %v", fetchErr, err) } } diff --git a/internal/store/zipcache.go b/internal/store/zipcache.go index f1a746e8bb5..e16f6e9cbb0 100644 --- a/internal/store/zipcache.go +++ b/internal/store/zipcache.go @@ -12,7 +12,7 @@ import ( "sync" "syscall" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sys/unix" ) diff --git a/internal/symbols/client.go b/internal/symbols/client.go index ad2b09def6d..239e08a38e5 100644 --- a/internal/symbols/client.go +++ b/internal/symbols/client.go @@ -9,11 +9,11 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/neelance/parallel" "github.com/opentracing-contrib/go-stdlib/nethttp" "github.com/opentracing/opentracing-go/ext" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "golang.org/x/net/context/ctxhttp" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/tracer/tracer.go b/internal/tracer/tracer.go index 14b2699de97..3539e87426d 100644 --- a/internal/tracer/tracer.go +++ b/internal/tracer/tracer.go @@ -12,8 +12,8 @@ import ( "strings" "sync" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "go.uber.org/automaxprocs/maxprocs" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/internal/vcs/git/blame.go b/internal/vcs/git/blame.go index 8710493c7aa..8b701d3489c 100644 --- a/internal/vcs/git/blame.go +++ b/internal/vcs/git/blame.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/trace/ot" diff --git a/internal/vcs/git/blob.go b/internal/vcs/git/blob.go index 2a26ebcb3b8..b6a0404d8fe 100644 --- a/internal/vcs/git/blob.go +++ b/internal/vcs/git/blob.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/vcs/git/commits.go b/internal/vcs/git/commits.go index fbc64514931..69c516a6313 100644 --- a/internal/vcs/git/commits.go +++ b/internal/vcs/git/commits.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/vcs/git/diff.go b/internal/vcs/git/diff.go index f9021843fde..40fe99c6c0b 100644 --- a/internal/vcs/git/diff.go +++ b/internal/vcs/git/diff.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/vcs/git/diff_search.go b/internal/vcs/git/diff_search.go index 1813cc3e6e8..1a9d6510145 100644 --- a/internal/vcs/git/diff_search.go +++ b/internal/vcs/git/diff_search.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/vcs/git/exec.go b/internal/vcs/git/exec.go index c45593ef462..a113202e43d 100644 --- a/internal/vcs/git/exec.go +++ b/internal/vcs/git/exec.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/vcs/git/merge_base.go b/internal/vcs/git/merge_base.go index 5b67ca33e03..66608ed6e05 100644 --- a/internal/vcs/git/merge_base.go +++ b/internal/vcs/git/merge_base.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/vcs/git/object.go b/internal/vcs/git/object.go index 0f44a36530d..d8eca535fd4 100644 --- a/internal/vcs/git/object.go +++ b/internal/vcs/git/object.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/vcs/git/refs.go b/internal/vcs/git/refs.go index 9ac864aedeb..9a95494cbd5 100644 --- a/internal/vcs/git/refs.go +++ b/internal/vcs/git/refs.go @@ -10,7 +10,7 @@ import ( "time" "github.com/avelino/slugify" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/rainycape/unidecode" "github.com/sourcegraph/sourcegraph/internal/api" diff --git a/internal/vcs/git/revisions.go b/internal/vcs/git/revisions.go index 80dc5a6462f..a6e1c91c750 100644 --- a/internal/vcs/git/revisions.go +++ b/internal/vcs/git/revisions.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/vcs/git/tree.go b/internal/vcs/git/tree.go index 4e219357c24..2b38c11ec6b 100644 --- a/internal/vcs/git/tree.go +++ b/internal/vcs/git/tree.go @@ -15,8 +15,8 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/format/config" + "github.com/cockroachdb/errors" "github.com/golang/groupcache/lru" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/gitserver" diff --git a/internal/workerutil/worker.go b/internal/workerutil/worker.go index d14c07accb2..5e502ac1467 100644 --- a/internal/workerutil/worker.go +++ b/internal/workerutil/worker.go @@ -5,9 +5,9 @@ import ( "sync" "time" + "github.com/cockroachdb/errors" "github.com/derision-test/glock" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/internal/errcode" "github.com/sourcegraph/sourcegraph/internal/observation" diff --git a/lib/codeintel/lsif/conversion/correlate.go b/lib/codeintel/lsif/conversion/correlate.go index ea161fa1647..401437a429e 100644 --- a/lib/codeintel/lsif/conversion/correlate.go +++ b/lib/codeintel/lsif/conversion/correlate.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" + "github.com/cockroachdb/errors" "github.com/inconshreveable/log15" - "github.com/pkg/errors" "github.com/sourcegraph/sourcegraph/lib/codeintel/lsif/conversion/datastructures" "github.com/sourcegraph/sourcegraph/lib/codeintel/lsif/protocol" diff --git a/lib/codeintel/lsif/conversion/group.go b/lib/codeintel/lsif/conversion/group.go index 3005336fc8a..a9e47046388 100644 --- a/lib/codeintel/lsif/conversion/group.go +++ b/lib/codeintel/lsif/conversion/group.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/sourcegraph/sourcegraph/lib/codeintel/bloomfilter" "github.com/sourcegraph/sourcegraph/lib/codeintel/lsif/conversion/datastructures" diff --git a/lib/codeintel/pathexistence/git.go b/lib/codeintel/pathexistence/git.go index 3534980a570..6f5b498a2a1 100644 --- a/lib/codeintel/pathexistence/git.go +++ b/lib/codeintel/pathexistence/git.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type GitFunc func(args ...string) (string, error) diff --git a/lib/codeintel/tools/lsif-index-tester/main.go b/lib/codeintel/tools/lsif-index-tester/main.go index 1c402a1dd48..50e75345eb1 100644 --- a/lib/codeintel/tools/lsif-index-tester/main.go +++ b/lib/codeintel/tools/lsif-index-tester/main.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/inconshreveable/log15" diff --git a/lib/codeintel/upload/indexer_name.go b/lib/codeintel/upload/indexer_name.go index b2e198a60fe..e65f146c0a9 100644 --- a/lib/codeintel/upload/indexer_name.go +++ b/lib/codeintel/upload/indexer_name.go @@ -5,7 +5,7 @@ import ( "encoding/json" "io" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // MaxBufferSize is the maximum size of the metaData line in the dump. This should be large enough diff --git a/lib/codeintel/upload/request.go b/lib/codeintel/upload/request.go index 8774430da0f..023ea02bc47 100644 --- a/lib/codeintel/upload/request.go +++ b/lib/codeintel/upload/request.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type uploadRequestOptions struct { diff --git a/lib/go.mod b/lib/go.mod index 2bece8b51df..2b370a8e796 100644 --- a/lib/go.mod +++ b/lib/go.mod @@ -5,7 +5,8 @@ go 1.16 require ( github.com/alecthomas/kingpin v2.2.6+incompatible github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect - github.com/derision-test/go-mockgen v0.0.0-20210315170118-149556bc84f1 // indirect + github.com/cockroachdb/errors v1.8.4 + github.com/derision-test/go-mockgen v0.0.0-20210315170118-149556bc84f1 github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101 github.com/fatih/color v1.11.0 github.com/go-stack/stack v1.8.0 // indirect @@ -21,7 +22,6 @@ require ( github.com/mattn/go-isatty v0.0.12 github.com/mattn/go-runewidth v0.0.12 github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 - github.com/pkg/errors v0.9.1 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf golang.org/x/sys v0.0.0-20210423082822-04245dca01da gopkg.in/yaml.v2 v2.4.0 diff --git a/lib/go.sum b/lib/go.sum index ce6cdabb7ae..09c0d6919ee 100644 --- a/lib/go.sum +++ b/lib/go.sum @@ -1,3 +1,12 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= +github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/alecthomas/kingpin v2.2.6+incompatible h1:5svnBTFgJjZvGKyYBtMB0+m5wvrbUHiqye8wRJMlnYI= github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= @@ -5,57 +14,106 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 h1:AUNCr9CiJuwrRYS3XieqF+Z9B9gNxo/eANAJCF2eiN4= github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/aphistic/sweet v0.0.0-20180618201346-68e18ab55a67/go.mod h1:iggGz3Cujwru5rGKuOi4u1rfI+38suzhVVJj8Ey7Q3M= -github.com/aphistic/sweet v0.2.0 h1:I4z+fAUqvKfvZV/CHi5dV0QuwbmIvYYFDjG0Ss5QpAs= -github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= -github.com/aphistic/sweet-junit v0.0.0-20190314030539-8d7e248096c2 h1:qDCG/a4+mCcRqj+QHTc1RNncar6rpg0oGz9ynH4IRME= -github.com/aphistic/sweet-junit v0.0.0-20190314030539-8d7e248096c2/go.mod h1:+eL69RqmiKF2Jm3poefxF/ZyVNGXFdSsPq3ScBFtX9s= -github.com/dave/jennifer v1.4.0 h1:tNJFJmLDVTLu+v05mVZ88RINa3vQqnyyWkTKWYz0CwE= -github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= +github.com/cockroachdb/errors v1.8.4 h1:41oZ1A4Eju6LviqkGpu5R2M39gHHVAFvOYsQjot1jNc= +github.com/cockroachdb/errors v1.8.4/go.mod h1:GScl7wnuvY335l6h0jbkHIKJ+8uEmUmJRVWKnenUbfI= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= +github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw= github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/derision-test/go-mockgen v0.0.0-20210315170118-149556bc84f1 h1:vncjpXhy/j+Fub85i0mkTEpjt1JW/PVsBkBMbZwqeig= github.com/derision-test/go-mockgen v0.0.0-20210315170118-149556bc84f1/go.mod h1:FGP9Qq+gWtYK9ine/2Bzeww8SXS7mD1wypNl1Q3AKN0= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/efritz/go-genlib v0.0.0-20200420163202-9c3914df9594 h1:wAEx9E0qHx43LRLQqP5VFTijgLnvvNM53FqLu7G+VQI= -github.com/efritz/go-genlib v0.0.0-20200420163202-9c3914df9594/go.mod h1:aMnaM7yzn10TOdj5sGpElY90l/XT3eL+Sj7z7D1V8q8= github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101 h1:RylpU+KNJJNEJIk3o8gZ70uPTlutxaYnikKNPko39LA= github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101/go.mod h1:5ALWO82UZwfAtNRUtwzsWimcrcuYzyieTyyXOXrP6EQ= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.11.0 h1:l4iX0RqNnx/pU7rY2DB/I+znuYY0K3x6Ywac6EIr0PA= github.com/fatih/color v1.11.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY= github.com/hexops/autogold v1.3.0 h1:IEtGNPxBeBu8RMn8eKWh/Ll9dVNgSnJ7bp/qHgMQ14o= github.com/hexops/autogold v1.3.0/go.mod h1:d4hwi2rid66Sag+BVuHgwakW/EmaFr8vdTSbWDbrDRI= @@ -63,116 +121,194 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hexops/valast v1.4.0 h1:sFzyxPDP0riFQUzSBXTCCrAbbIndHPWMndxuEjXdZlc= github.com/hexops/valast v1.4.0/go.mod h1:uVjKZ0smVuYlgCSPz9NRi5A04sl7lp6GtFWsROKDgEs= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac h1:n1DqxAo4oWPMvH1+v+DLYlMCecgumhhgnxAPdqDIFHI= github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= +github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= +github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= +github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= +github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.12.2 h1:2KCfW3I9M7nSc5wOqXAlW2v2U6v+w6cbjvbfp+OykW8= github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= +github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAmxBiA= github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI= github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 h1:lh3PyZvY+B9nFliSGTn5uFuqQQJGuNrD0MLCokv09ag= github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 h1:lRAUE0dIvigSSFAmaM2dfg7OH8T+a8zJ5smEh09a/GI= github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190428183149-804c0c7841b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210218084038-e8e29180ff58/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -180,16 +316,24 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZOR golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190428024724-550556f78a90/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200420001825-978e26b7c37c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200624163319-25775e59acb7/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200916225323-c537a342ddf6/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -197,6 +341,16 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -207,19 +361,19 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= mvdan.cc/gofumpt v0.0.0-20210107193838-d24d34e18d44/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/gofumpt v0.1.0 h1:hsVv+Y9UsZ/mFZTxJZuHVI6shSQCtzZ11h1JEFPAZLw= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= diff --git a/ui/assets/load_manifest_dev.go b/ui/assets/load_manifest_dev.go index dccb78b45c3..9e195cb8886 100644 --- a/ui/assets/load_manifest_dev.go +++ b/ui/assets/load_manifest_dev.go @@ -6,7 +6,7 @@ import ( "encoding/json" "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var MockLoadWebpackManifest func() (*WebpackManifest, error) diff --git a/ui/assets/load_manifest_dist.go b/ui/assets/load_manifest_dist.go index 6d91003c8ca..52786bc4f37 100644 --- a/ui/assets/load_manifest_dist.go +++ b/ui/assets/load_manifest_dist.go @@ -7,7 +7,7 @@ import ( "encoding/json" "sync" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var (