From a4ad6eda5d162ea55ae72639d81986888683ae18 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Tue, 10 May 2022 11:48:59 -0300 Subject: [PATCH] s/masterminds/mattermost for squirrel (#20162) Our fork of https://github.com/Masterminds/squirrel at https://github.com/mattermost/squirrel (previously https://github.com/lieut-data/squirrel) isn't compatible with the upstream project, and causes issues for repositories importing mattermost-server and using squirrel. Sidestep this by adopting the `mattermost/squirrel` fork explicitly. (Downstream repos can either switch, or keep using the upstream version from `Masterminds`.) --- go.mod | 4 +--- go.sum | 2 ++ store/sqlstore/audit_store.go | 2 +- store/sqlstore/channel_member_history_store.go | 2 +- store/sqlstore/channel_store.go | 2 +- store/sqlstore/channel_store_categories.go | 2 +- store/sqlstore/cluster_discovery_store.go | 2 +- store/sqlstore/command_store.go | 2 +- store/sqlstore/command_webhook_store.go | 2 +- store/sqlstore/compliance_store.go | 2 +- store/sqlstore/file_info_store.go | 2 +- store/sqlstore/group_store.go | 2 +- store/sqlstore/integrity.go | 2 +- store/sqlstore/job_store.go | 2 +- store/sqlstore/license_store.go | 2 +- store/sqlstore/link_metadata_store.go | 2 +- store/sqlstore/plugin_store.go | 2 +- store/sqlstore/post_store.go | 2 +- store/sqlstore/preference_store.go | 2 +- store/sqlstore/product_notices_store.go | 2 +- store/sqlstore/reaction_store.go | 2 +- store/sqlstore/remote_cluster_store.go | 2 +- store/sqlstore/retention_policy_store.go | 2 +- store/sqlstore/role_store.go | 2 +- store/sqlstore/scheme_store.go | 2 +- store/sqlstore/session_store.go | 2 +- store/sqlstore/shared_channel_store.go | 2 +- store/sqlstore/status_store.go | 2 +- store/sqlstore/store.go | 2 +- store/sqlstore/system_store.go | 2 +- store/sqlstore/team_store.go | 2 +- store/sqlstore/thread_store.go | 2 +- store/sqlstore/tokens_store.go | 2 +- store/sqlstore/upload_session_store.go | 2 +- store/sqlstore/user_store.go | 2 +- store/sqlstore/webhook_store.go | 2 +- 36 files changed, 37 insertions(+), 37 deletions(-) diff --git a/go.mod b/go.mod index 7afa1a69c3..927f3669c6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.18 require ( code.sajari.com/docconv v1.2.0 github.com/Masterminds/semver/v3 v3.1.1 - github.com/Masterminds/squirrel v1.5.2 github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1 github.com/aws/aws-sdk-go v1.44.9 github.com/blang/semver v3.5.1+incompatible @@ -40,6 +39,7 @@ require ( github.com/mattermost/logr/v2 v2.0.15 github.com/mattermost/morph v0.0.0-20220401091636-39f834798da8 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 + github.com/mattermost/squirrel v0.2.0 github.com/mholt/archiver/v3 v3.5.1 github.com/microcosm-cc/bluemonday v1.0.18 github.com/minio/minio-go/v7 v7.0.26 @@ -178,8 +178,6 @@ require ( gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) -replace github.com/Masterminds/squirrel v1.5.2 => github.com/lieut-data/squirrel v1.5.4 - // Hack to prevent the willf/bitset module from being upgraded to 1.2.0. // They changed the module path from github.com/willf/bitset to // github.com/bits-and-blooms/bitset and a couple of dependent repos are yet diff --git a/go.sum b/go.sum index 6954661a93..2298b8f37a 100644 --- a/go.sum +++ b/go.sum @@ -988,6 +988,8 @@ github.com/mattermost/morph v0.0.0-20220401091636-39f834798da8 h1:gwliVjCTqAC01m github.com/mattermost/morph v0.0.0-20220401091636-39f834798da8/go.mod h1:jxM3g1bx+k2Thz7jofcHguBS8TZn5Pc+o5MGmORObhw= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0/go.mod h1:nV5bfVpT//+B1RPD2JvRnxbkLmJEYXmRaaVl15fsXjs= +github.com/mattermost/squirrel v0.2.0 h1:8ZWeyf+MWQ2cL7hu9REZgLtz2IJi51qqZEovI3T3TT8= +github.com/mattermost/squirrel v0.2.0/go.mod h1:NPPtk+CdpWre4GxMGoOpzEVFVc0ZoEFyJBZGCtn9nSU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go index 8b99f13475..a63d82f1da 100644 --- a/store/sqlstore/audit_store.go +++ b/store/sqlstore/audit_store.go @@ -4,7 +4,7 @@ package sqlstore import ( - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/channel_member_history_store.go b/store/sqlstore/channel_member_history_store.go index 07e46f5aa3..5182e79658 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -7,7 +7,7 @@ import ( "database/sql" "fmt" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index cbad73ccc3..c97fd3075e 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -12,7 +12,7 @@ import ( "strings" "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/einterfaces" diff --git a/store/sqlstore/channel_store_categories.go b/store/sqlstore/channel_store_categories.go index 5dae1da97b..0b50d0f62a 100644 --- a/store/sqlstore/channel_store_categories.go +++ b/store/sqlstore/channel_store_categories.go @@ -6,7 +6,7 @@ package sqlstore import ( "fmt" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/cluster_discovery_store.go b/store/sqlstore/cluster_discovery_store.go index 818ed39701..8b9a0fbdab 100644 --- a/store/sqlstore/cluster_discovery_store.go +++ b/store/sqlstore/cluster_discovery_store.go @@ -4,7 +4,7 @@ package sqlstore import ( - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/command_store.go b/store/sqlstore/command_store.go index f72b8c100c..4e6f2f758d 100644 --- a/store/sqlstore/command_store.go +++ b/store/sqlstore/command_store.go @@ -7,7 +7,7 @@ import ( "database/sql" "fmt" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/command_webhook_store.go b/store/sqlstore/command_webhook_store.go index f53c97dff2..f745b3a9df 100644 --- a/store/sqlstore/command_webhook_store.go +++ b/store/sqlstore/command_webhook_store.go @@ -6,7 +6,7 @@ package sqlstore import ( "database/sql" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/compliance_store.go b/store/sqlstore/compliance_store.go index 7b6d4b515a..cf25f8cf7a 100644 --- a/store/sqlstore/compliance_store.go +++ b/store/sqlstore/compliance_store.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/file_info_store.go b/store/sqlstore/file_info_store.go index c22584df0f..ae14ad0a10 100644 --- a/store/sqlstore/file_info_store.go +++ b/store/sqlstore/file_info_store.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/einterfaces" diff --git a/store/sqlstore/group_store.go b/store/sqlstore/group_store.go index 5911720792..0f410315e3 100644 --- a/store/sqlstore/group_store.go +++ b/store/sqlstore/group_store.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/integrity.go b/store/sqlstore/integrity.go index a1e3a6c918..a0a1f4396d 100644 --- a/store/sqlstore/integrity.go +++ b/store/sqlstore/integrity.go @@ -4,7 +4,7 @@ package sqlstore import ( - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/shared/mlog" diff --git a/store/sqlstore/job_store.go b/store/sqlstore/job_store.go index 0d2e8ec026..cd93be1cf7 100644 --- a/store/sqlstore/job_store.go +++ b/store/sqlstore/job_store.go @@ -10,7 +10,7 @@ import ( "strings" "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/license_store.go b/store/sqlstore/license_store.go index d7e61bb98c..f85f889e52 100644 --- a/store/sqlstore/license_store.go +++ b/store/sqlstore/license_store.go @@ -4,7 +4,7 @@ package sqlstore import ( - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/link_metadata_store.go b/store/sqlstore/link_metadata_store.go index 4273d958a6..86e9abc1b8 100644 --- a/store/sqlstore/link_metadata_store.go +++ b/store/sqlstore/link_metadata_store.go @@ -7,7 +7,7 @@ import ( "database/sql" "encoding/json" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/plugin_store.go b/store/sqlstore/plugin_store.go index d0cda29b48..2de981e5f1 100644 --- a/store/sqlstore/plugin_store.go +++ b/store/sqlstore/plugin_store.go @@ -8,7 +8,7 @@ import ( "database/sql" "fmt" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index cc271e09e1..dfa4b62d1e 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/einterfaces" diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go index 68d0c4e5cd..beea133fa5 100644 --- a/store/sqlstore/preference_store.go +++ b/store/sqlstore/preference_store.go @@ -4,7 +4,7 @@ package sqlstore import ( - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/product_notices_store.go b/store/sqlstore/product_notices_store.go index 8e146ef214..631f541bf4 100644 --- a/store/sqlstore/product_notices_store.go +++ b/store/sqlstore/product_notices_store.go @@ -6,7 +6,7 @@ package sqlstore import ( "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/reaction_store.go b/store/sqlstore/reaction_store.go index 3248bc3e63..ce7a644410 100644 --- a/store/sqlstore/reaction_store.go +++ b/store/sqlstore/reaction_store.go @@ -4,7 +4,7 @@ package sqlstore import ( - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/shared/mlog" diff --git a/store/sqlstore/remote_cluster_store.go b/store/sqlstore/remote_cluster_store.go index 9fc518658e..2d3cd5b076 100644 --- a/store/sqlstore/remote_cluster_store.go +++ b/store/sqlstore/remote_cluster_store.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/retention_policy_store.go b/store/sqlstore/retention_policy_store.go index eae017ce5c..0f798c54e1 100644 --- a/store/sqlstore/retention_policy_store.go +++ b/store/sqlstore/retention_policy_store.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - sq "github.com/Masterminds/squirrel" "github.com/go-sql-driver/mysql" "github.com/lib/pq" "github.com/mattermost/mattermost-server/v6/einterfaces" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/store" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" ) diff --git a/store/sqlstore/role_store.go b/store/sqlstore/role_store.go index 9d8c91c468..ae22126d2d 100644 --- a/store/sqlstore/role_store.go +++ b/store/sqlstore/role_store.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/scheme_store.go b/store/sqlstore/scheme_store.go index 856262d9b8..5a3fb69c31 100644 --- a/store/sqlstore/scheme_store.go +++ b/store/sqlstore/scheme_store.go @@ -7,7 +7,7 @@ import ( "database/sql" "fmt" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index daaff5e577..d931b8205f 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/shared_channel_store.go b/store/sqlstore/shared_channel_store.go index 1b0f083fbe..29aed5cdeb 100644 --- a/store/sqlstore/shared_channel_store.go +++ b/store/sqlstore/shared_channel_store.go @@ -10,7 +10,7 @@ import ( "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/store" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" ) diff --git a/store/sqlstore/status_store.go b/store/sqlstore/status_store.go index 8f97e862a3..67c7c3de44 100644 --- a/store/sqlstore/status_store.go +++ b/store/sqlstore/status_store.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go index f09390eb9e..744d0891ff 100644 --- a/store/sqlstore/store.go +++ b/store/sqlstore/store.go @@ -16,8 +16,8 @@ import ( "sync/atomic" "time" - sq "github.com/Masterminds/squirrel" "github.com/mattermost/morph" + sq "github.com/mattermost/squirrel" "github.com/mattermost/morph/drivers" ms "github.com/mattermost/morph/drivers/mysql" diff --git a/store/sqlstore/system_store.go b/store/sqlstore/system_store.go index 091ef2831a..b6a394bb25 100644 --- a/store/sqlstore/system_store.go +++ b/store/sqlstore/system_store.go @@ -10,7 +10,7 @@ import ( "strings" "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 4ac0500b4f..baa88b1bb4 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/thread_store.go b/store/sqlstore/thread_store.go index 39549271c6..2147701df2 100644 --- a/store/sqlstore/thread_store.go +++ b/store/sqlstore/thread_store.go @@ -10,7 +10,7 @@ import ( "sync" "time" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/tokens_store.go b/store/sqlstore/tokens_store.go index a2971eb324..3d098bf9c4 100644 --- a/store/sqlstore/tokens_store.go +++ b/store/sqlstore/tokens_store.go @@ -7,7 +7,7 @@ import ( "database/sql" "fmt" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/upload_session_store.go b/store/sqlstore/upload_session_store.go index 6860f3fddb..e22b2056f3 100644 --- a/store/sqlstore/upload_session_store.go +++ b/store/sqlstore/upload_session_store.go @@ -6,7 +6,7 @@ package sqlstore import ( "database/sql" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/model" diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go index 887abef0ac..ecf1e33b80 100644 --- a/store/sqlstore/user_store.go +++ b/store/sqlstore/user_store.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/store/sqlstore/webhook_store.go b/store/sqlstore/webhook_store.go index a069bc4708..d9f08120ac 100644 --- a/store/sqlstore/webhook_store.go +++ b/store/sqlstore/webhook_store.go @@ -6,7 +6,7 @@ package sqlstore import ( "database/sql" - sq "github.com/Masterminds/squirrel" + sq "github.com/mattermost/squirrel" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v6/einterfaces"