*: use patched stringer instead of upstream

The patched `stringer` is identical to the upstream, except we don't paste the entire command-line into the generated file. This helps avoid spurious diffs when doing `dev build --hoist-generated-code`. See cockroachdb/tools@642e514 Release note: None
cockroachdb · Nov 12, 2021 · 403313f · 403313f
1 parent ab18b70
commit 403313f
Show file tree

Hide file tree

Showing 53 changed files with 67 additions and 54 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1254,6 +1254,16 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20170808184505-29b5d31b4c3a.zip",
         ],
     )
+    go_repository(
+        name = "com_github_cockroachdb_tools",
+        build_file_proto_mode = "disable_global",
+        importpath = "github.com/cockroachdb/tools",
+        sha256 = "37a3737dd23768b4997b2f0341d625658f5862cdbf808f7fbf3a7f9fd25913a7",
+        strip_prefix = "github.com/cockroachdb/[email protected]",
+        urls = [
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tools/com_github_cockroachdb_tools-v0.0.0-20211112185054-642e51449b40.zip",
+        ],
+    )
     go_repository(
         name = "com_github_cockroachdb_ttycolor",
         build_file_proto_mode = "disable_global",

diff --git a/Makefile b/Makefile
@@ -387,6 +387,7 @@ bin/.bootstrap: $(GITHOOKS) vendor/modules.txt | bin/.submodules-initialized
 		github.com/cockroachdb/gostdlib/x/tools/cmd/goimports \
 		github.com/golang/mock/mockgen \
 		github.com/cockroachdb/stress \
+		github.com/cockroachdb/tools/cmd/stringer \
 		github.com/goware/modvendor \
 		github.com/go-swagger/go-swagger/cmd/swagger \
 		github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \
@@ -400,7 +401,6 @@ bin/.bootstrap: $(GITHOOKS) vendor/modules.txt | bin/.submodules-initialized
 		golang.org/x/lint/golint \
 		golang.org/x/perf/cmd/benchstat \
 		golang.org/x/tools/cmd/goyacc \
-		golang.org/x/tools/cmd/stringer \
 		golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow \
 		honnef.co/go/tools/cmd/staticcheck \
 		github.com/bufbuild/buf/cmd/buf

diff --git a/build/STRINGER.bzl b/build/STRINGER.bzl
@@ -14,10 +14,10 @@ def stringer(src, typ, name):
          GO_ABS_PATH=`cd $$GO_REL_PATH && pwd`
          # Set GOPATH to something to workaround https://github.com/golang/go/issues/43938
          env PATH=$$GO_ABS_PATH HOME=$(GENDIR) GOPATH=/nonexist-gopath \
-         $(location @org_golang_x_tools//cmd/stringer:stringer) -output=$@ -type={} $<
+         $(location @com_github_cockroachdb_tools//cmd/stringer:stringer) -output=$@ -type={} $<
       """.format(typ),
         tools = [
             "@go_sdk//:bin/go",
-            "@org_golang_x_tools//cmd/stringer",
+            "@com_github_cockroachdb_tools//cmd/stringer",
         ],
     )
diff --git a/go.mod b/go.mod
@@ -49,6 +49,7 @@ require (
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2
 	github.com/cockroachdb/stress v0.0.0-20170808184505-29b5d31b4c3a
+	github.com/cockroachdb/tools v0.0.0-20211112185054-642e51449b40
 	github.com/cockroachdb/ttycolor v0.0.0-20210902133924-c7d7dcdde4e8
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd
 	github.com/containerd/containerd v1.5.4

diff --git a/go.sum b/go.sum
@@ -404,6 +404,8 @@ github.com/cockroachdb/tablewriter v0.0.5-0.20200105123400-bd15540e8847 h1:c7yLg
 github.com/cockroachdb/tablewriter v0.0.5-0.20200105123400-bd15540e8847/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/cockroachdb/teamcity v0.0.0-20180905144921-8ca25c33eb11 h1:UAqRo5xPCyTtZznAJ9iPVpDUFxGI0a6QWtQ8E+zwJRg=
 github.com/cockroachdb/teamcity v0.0.0-20180905144921-8ca25c33eb11/go.mod h1:3299Mt0Q7PkqGqbsxhvbrTpMqRyIcZ6OMw4IEmiO09g=
+github.com/cockroachdb/tools v0.0.0-20211112185054-642e51449b40 h1:qVTb3XEv+7VVjPetop8yGbN95HfCeqZx+VMveeSJPZw=
+github.com/cockroachdb/tools v0.0.0-20211112185054-642e51449b40/go.mod h1:cllxeV+TYc387/XzQRnDg6YThHoDzFewovWffzAm37Q=
 github.com/cockroachdb/ttycolor v0.0.0-20180709150743-a1d5aaeb377d/go.mod h1:NltwFG0VBANi1jHKpn5KL9AbsHTE+8fPaAHT0TzL20k=
 github.com/cockroachdb/ttycolor v0.0.0-20210902133924-c7d7dcdde4e8 h1:Hli+oX84dKq44sLVCcsGKqifm5Lg9J8VoJ2P3h9iPdI=
 github.com/cockroachdb/ttycolor v0.0.0-20210902133924-c7d7dcdde4e8/go.mod h1:75wnig8+TF6vst9hChkpcFO7YrRLddouJ5is8uqpfv0=

diff --git a/pkg/base/testclusterreplicationmode_string.go b/pkg/base/testclusterreplicationmode_string.go
diff --git a/pkg/ccl/sqlproxyccl/errorcode_string.go b/pkg/ccl/sqlproxyccl/errorcode_string.go
diff --git a/pkg/cli/keytype_string.go b/pkg/cli/keytype_string.go
diff --git a/pkg/clusterversion/key_string.go b/pkg/clusterversion/key_string.go
diff --git a/pkg/cmd/import-tools/main.go b/pkg/cmd/import-tools/main.go
@@ -27,6 +27,7 @@ import (
 	_ "github.com/cockroachdb/gostdlib/cmd/gofmt"
 	_ "github.com/cockroachdb/gostdlib/x/tools/cmd/goimports"
 	_ "github.com/cockroachdb/stress"
+	_ "github.com/cockroachdb/tools/cmd/stringer"
 	_ "github.com/go-swagger/go-swagger/cmd/swagger"
 	_ "github.com/golang/mock/mockgen"
 	_ "github.com/goware/modvendor"
@@ -41,7 +42,6 @@ import (
 	_ "golang.org/x/lint/golint"
 	_ "golang.org/x/perf/cmd/benchstat"
 	_ "golang.org/x/tools/cmd/goyacc"
-	_ "golang.org/x/tools/cmd/stringer"
 	_ "golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow"
 	_ "honnef.co/go/tools/cmd/staticcheck"
 )

diff --git a/pkg/kv/kvclient/kvcoord/txnstate_string.go b/pkg/kv/kvclient/kvcoord/txnstate_string.go
diff --git a/pkg/kv/kvserver/closedts/sidetransport/cantclosereason_string.go b/pkg/kv/kvserver/closedts/sidetransport/cantclosereason_string.go
diff --git a/pkg/kv/kvserver/refreshraftreason_string.go b/pkg/kv/kvserver/refreshraftreason_string.go
diff --git a/pkg/roachpb/errordetailtype_string.go b/pkg/roachpb/errordetailtype_string.go
diff --git a/pkg/roachpb/method_string.go b/pkg/roachpb/method_string.go
diff --git a/pkg/sql/advancecode_string.go b/pkg/sql/advancecode_string.go
diff --git a/pkg/sql/catalog/descpb/formatversion_string.go b/pkg/sql/catalog/descpb/formatversion_string.go
diff --git a/pkg/sql/catalog/descpb/privilegedescversion_string.go b/pkg/sql/catalog/descpb/privilegedescversion_string.go
diff --git a/pkg/sql/colfetcher/fetcherstate_string.go b/pkg/sql/colfetcher/fetcherstate_string.go
diff --git a/pkg/sql/execinfra/consumerstatus_string.go b/pkg/sql/execinfra/consumerstatus_string.go
diff --git a/pkg/sql/execinfra/procstate_string.go b/pkg/sql/execinfra/procstate_string.go
diff --git a/pkg/sql/nodestatus_string.go b/pkg/sql/nodestatus_string.go
diff --git a/pkg/sql/opt/BUILD.bazel b/pkg/sql/opt/BUILD.bazel
@@ -116,11 +116,11 @@ genrule(
       GO_ABS_PATH=`cd $$GO_REL_PATH && pwd`
       # Set GOPATH to something to workaround https://github.com/golang/go/issues/43938
       env PATH=$$GO_ABS_PATH HOME=$(GENDIR) GOPATH=/nonexist-gopath \
-      $(location @org_golang_x_tools//cmd/stringer:stringer) -output=$@ \
+      $(location @com_github_cockroachdb_tools//cmd/stringer:stringer) -output=$@ \
       -type=RuleName `dirname $(location :gen-rulenames)`/rule_name.go $(location :gen-rulenames)
     """,
     exec_tools = [
         "@go_sdk//:bin/go",
-        "@org_golang_x_tools//cmd/stringer",
+        "@com_github_cockroachdb_tools//cmd/stringer",
     ],
 )
diff --git a/pkg/sql/opt/optgen/lang/operator_string.go b/pkg/sql/opt/optgen/lang/operator_string.go
diff --git a/pkg/sql/opt/optgen/lang/token_string.go b/pkg/sql/opt/optgen/lang/token_string.go
diff --git a/pkg/sql/pgwire/pgwirebase/clientmessagetype_string.go b/pkg/sql/pgwire/pgwirebase/clientmessagetype_string.go
diff --git a/pkg/sql/pgwire/pgwirebase/formatcode_string.go b/pkg/sql/pgwire/pgwirebase/formatcode_string.go
diff --git a/pkg/sql/pgwire/pgwirebase/pgnumericsign_string.go b/pkg/sql/pgwire/pgwirebase/pgnumericsign_string.go
diff --git a/pkg/sql/pgwire/pgwirebase/preparetype_string.go b/pkg/sql/pgwire/pgwirebase/preparetype_string.go
diff --git a/pkg/sql/pgwire/pgwirebase/servererrfieldtype_string.go b/pkg/sql/pgwire/pgwirebase/servererrfieldtype_string.go
diff --git a/pkg/sql/pgwire/pgwirebase/servermessagetype_string.go b/pkg/sql/pgwire/pgwirebase/servermessagetype_string.go
diff --git a/pkg/sql/privilege/kind_string.go b/pkg/sql/privilege/kind_string.go
diff --git a/pkg/sql/roleoption/option_string.go b/pkg/sql/roleoption/option_string.go
diff --git a/pkg/sql/schemachange/BUILD.bazel b/pkg/sql/schemachange/BUILD.bazel
@@ -60,10 +60,10 @@ genrule(
        GO_ABS_PATH=`cd $$GO_REL_PATH && pwd`
        # Set GOPATH to something to workaround https://github.com/golang/go/issues/43938
        env PATH=$$GO_ABS_PATH HOME=$(GENDIR) GOPATH=/nonexist-gopath \
-       $(location @org_golang_x_tools//cmd/stringer:stringer) -output=$@ -type=ColumnConversionKind -trimprefix ColumnConversion $<
+       $(location @com_github_cockroachdb_tools//cmd/stringer:stringer) -output=$@ -type=ColumnConversionKind -trimprefix ColumnConversion $<
     """,
     exec_tools = [
         "@go_sdk//:bin/go",
-        "@org_golang_x_tools//cmd/stringer",
+        "@com_github_cockroachdb_tools//cmd/stringer",
     ],
 )
diff --git a/pkg/sql/schemachange/columnconversionkind_string.go b/pkg/sql/schemachange/columnconversionkind_string.go
diff --git a/pkg/sql/schemachanger/rel/internal/comparetest/testattr_string.go b/pkg/sql/schemachanger/rel/internal/comparetest/testattr_string.go
diff --git a/pkg/sql/schemachanger/rel/internal/cyclegraphtest/testattr_string.go b/pkg/sql/schemachanger/rel/internal/cyclegraphtest/testattr_string.go
diff --git a/pkg/sql/schemachanger/rel/internal/entitynodetest/testattr_string.go b/pkg/sql/schemachanger/rel/internal/entitynodetest/testattr_string.go
diff --git a/pkg/sql/schemachanger/rel/systemattribute_string.go b/pkg/sql/schemachanger/rel/systemattribute_string.go
diff --git a/pkg/sql/schemachanger/scop/phase_string.go b/pkg/sql/schemachanger/scop/phase_string.go
diff --git a/pkg/sql/schemachanger/scop/type_string.go b/pkg/sql/schemachanger/scop/type_string.go
diff --git a/pkg/sql/schemachanger/screl/attr_string.go b/pkg/sql/schemachanger/screl/attr_string.go
diff --git a/pkg/sql/sem/tree/createtypevariety_string.go b/pkg/sql/sem/tree/createtypevariety_string.go
diff --git a/pkg/sql/sem/tree/statementreturntype_string.go b/pkg/sql/sem/tree/statementreturntype_string.go
diff --git a/pkg/sql/sem/tree/statementtype_string.go b/pkg/sql/sem/tree/statementtype_string.go
diff --git a/pkg/sql/txnevent_string.go b/pkg/sql/txnevent_string.go
diff --git a/pkg/sql/txntype_string.go b/pkg/sql/txntype_string.go
diff --git a/pkg/storage/resourcelimitreached_string.go b/pkg/storage/resourcelimitreached_string.go
diff --git a/pkg/util/encoding/BUILD.bazel b/pkg/util/encoding/BUILD.bazel
@@ -86,10 +86,10 @@ genrule(
        # Set GOPATH to something to workaround https://github.com/golang/go/issues/43938
        sed -e 's/type Type encodingtype.T/type Type int/' $(location encoding.go) > encoding_tmp.go && \
        env PATH=$$GO_ABS_PATH HOME=$(GENDIR) GOPATH=/nonexist-gopath \
-         $(location @org_golang_x_tools//cmd/stringer:stringer) -output=$@ -type=Type encoding_tmp.go
+         $(location @com_github_cockroachdb_tools//cmd/stringer:stringer) -output=$@ -type=Type encoding_tmp.go
     """,
     exec_tools = [
         "@go_sdk//:bin/go",
-        "@org_golang_x_tools//cmd/stringer",
+        "@com_github_cockroachdb_tools//cmd/stringer",
     ],
 )
diff --git a/pkg/util/encoding/type_string.go b/pkg/util/encoding/type_string.go
diff --git a/pkg/util/timeutil/pgdate/field_string.go b/pkg/util/timeutil/pgdate/field_string.go
diff --git a/pkg/workload/schemachange/optype_string.go b/pkg/workload/schemachange/optype_string.go
diff --git a/vendor b/vendor
+27 −0		github.com/cockroachdb/tools/LICENSE
+22 −0		github.com/cockroachdb/tools/PATENTS
+1 −1		github.com/cockroachdb/tools/cmd/stringer/stringer.go
+3 −1		modules.txt