gofmt -s -w

bufbuild · Dec 25, 2019 · 8ad4735 · 8ad4735
1 parent 2070df6
commit 8ad4735
Show file tree

Hide file tree

Showing 10 changed files with 134 additions and 129 deletions.
diff --git a/go.mod b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/golang/protobuf v1.3.2
 	github.com/jhump/protoreflect v1.6.0
 	github.com/pkg/profile v1.4.0 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
@@ -16,9 +17,9 @@ require (
 	golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 // indirect
 	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
 	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
-	golang.org/x/sys v0.0.0-20191220220014-0732a990476f // indirect
-	golang.org/x/tools v0.0.0-20191220234730-f13409bbebaf // indirect
-	google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1 // indirect
+	golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 // indirect
+	golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40 // indirect
+	google.golang.org/genproto v0.0.0-20191223191004-3caeed10a8bf // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v2 v2.2.7 // indirect

diff --git a/go.sum b/go.sum
@@ -71,6 +71,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 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 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
@@ -143,8 +145,8 @@ golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191220220014-0732a990476f h1:72l8qCJ1nGxMGH26QVBVIxKd/D34cfGt0OvrPtpemyY=
-golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -159,23 +161,24 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98 h1:tZwpOHmF1OEL9wJGSgBALnhFg/8VKjQTtctCX51GLNI=
 golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191220234730-f13409bbebaf h1:K7C8vSrr0PeD/cgNkkjpByDFJqzjr2YDmm3VPRjGfJM=
-golang.org/x/tools v0.0.0-20191220234730-f13409bbebaf/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40 h1:UyP2XDSgSc8ldYCxAK735zQxeH3Gd81sK7Iy7AoaVxk=
+golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 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=
 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-20170818010345-ee236bd376b0 h1:ZvI3lsq5AIkr7axxmT3tfwFlJVRFLqe6Fp0W03+MJ38=
 google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1 h1:PlscBL5CvF+v1mNR82G+i4kACGq2JQvKDnNq7LSS65o=
-google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191223191004-3caeed10a8bf h1:1x8rC5/IgdLMPbPTvlQTN28+rcy8XL9Q19UWUMDyqYs=
+google.golang.org/genproto v0.0.0-20191223191004-3caeed10a8bf/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 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/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
 gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
@@ -187,6 +190,7 @@ gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 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.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2 h1:XZx7nhd5GMaZpmDaEHFVafUZC7ya0fuo7cSJ3UCKYmM=

diff --git a/internal/buf/bufcheck/bufbreaking/vars.go b/internal/buf/bufcheck/bufbreaking/vars.go
@@ -77,234 +77,234 @@ var (
 	}
 	// v1IDToCategories are the revision 1 ID to categories.
 	v1IDToCategories = map[string][]string{
-		"ENUM_NO_DELETE": []string{
+		"ENUM_NO_DELETE": {
 			"FILE",
 		},
-		"ENUM_VALUE_NO_DELETE": []string{
+		"ENUM_VALUE_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"ENUM_VALUE_NO_DELETE_UNLESS_NAME_RESERVED": []string{
+		"ENUM_VALUE_NO_DELETE_UNLESS_NAME_RESERVED": {
 			"WIRE_JSON",
 		},
-		"ENUM_VALUE_NO_DELETE_UNLESS_NUMBER_RESERVED": []string{
+		"ENUM_VALUE_NO_DELETE_UNLESS_NUMBER_RESERVED": {
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"ENUM_VALUE_SAME_NAME": []string{
+		"ENUM_VALUE_SAME_NAME": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 		},
-		"EXTENSION_MESSAGE_NO_DELETE": []string{
+		"EXTENSION_MESSAGE_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FIELD_NO_DELETE": []string{
+		"FIELD_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FIELD_NO_DELETE_UNLESS_NAME_RESERVED": []string{
+		"FIELD_NO_DELETE_UNLESS_NAME_RESERVED": {
 			"WIRE_JSON",
 		},
-		"FIELD_NO_DELETE_UNLESS_NUMBER_RESERVED": []string{
+		"FIELD_NO_DELETE_UNLESS_NUMBER_RESERVED": {
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"FIELD_SAME_CTYPE": []string{
+		"FIELD_SAME_CTYPE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FIELD_SAME_JSON_NAME": []string{
+		"FIELD_SAME_JSON_NAME": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 		},
-		"FIELD_SAME_JSTYPE": []string{
+		"FIELD_SAME_JSTYPE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FIELD_SAME_LABEL": []string{
+		"FIELD_SAME_LABEL": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"FIELD_SAME_NAME": []string{
+		"FIELD_SAME_NAME": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 		},
-		"FIELD_SAME_ONEOF": []string{
+		"FIELD_SAME_ONEOF": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"FIELD_SAME_TYPE": []string{
+		"FIELD_SAME_TYPE": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"FILE_NO_DELETE": []string{
+		"FILE_NO_DELETE": {
 			"FILE",
 		},
-		"FILE_SAME_CSHARP_NAMESPACE": []string{
+		"FILE_SAME_CSHARP_NAMESPACE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_GO_PACKAGE": []string{
+		"FILE_SAME_GO_PACKAGE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_JAVA_MULTIPLE_FILES": []string{
+		"FILE_SAME_JAVA_MULTIPLE_FILES": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_JAVA_OUTER_CLASSNAME": []string{
+		"FILE_SAME_JAVA_OUTER_CLASSNAME": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_JAVA_PACKAGE": []string{
+		"FILE_SAME_JAVA_PACKAGE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_JAVA_STRING_CHECK_UTF8": []string{
+		"FILE_SAME_JAVA_STRING_CHECK_UTF8": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_OBJC_CLASS_PREFIX": []string{
+		"FILE_SAME_OBJC_CLASS_PREFIX": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_PACKAGE": []string{
+		"FILE_SAME_PACKAGE": {
 			"FILE",
 		},
-		"FILE_SAME_PHP_CLASS_PREFIX": []string{
+		"FILE_SAME_PHP_CLASS_PREFIX": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_PHP_METADATA_NAMESPACE": []string{
+		"FILE_SAME_PHP_METADATA_NAMESPACE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_PHP_NAMESPACE": []string{
+		"FILE_SAME_PHP_NAMESPACE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_RUBY_PACKAGE": []string{
+		"FILE_SAME_RUBY_PACKAGE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_SWIFT_PREFIX": []string{
+		"FILE_SAME_SWIFT_PREFIX": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_OPTIMIZE_FOR": []string{
+		"FILE_SAME_OPTIMIZE_FOR": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_CC_GENERIC_SERVICES": []string{
+		"FILE_SAME_CC_GENERIC_SERVICES": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_JAVA_GENERIC_SERVICES": []string{
+		"FILE_SAME_JAVA_GENERIC_SERVICES": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_PY_GENERIC_SERVICES": []string{
+		"FILE_SAME_PY_GENERIC_SERVICES": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_PHP_GENERIC_SERVICES": []string{
+		"FILE_SAME_PHP_GENERIC_SERVICES": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_CC_ENABLE_ARENAS": []string{
+		"FILE_SAME_CC_ENABLE_ARENAS": {
 			"FILE",
 			"PACKAGE",
 		},
-		"FILE_SAME_SYNTAX": []string{
+		"FILE_SAME_SYNTAX": {
 			"FILE",
 			"PACKAGE",
 		},
-		"MESSAGE_NO_DELETE": []string{
+		"MESSAGE_NO_DELETE": {
 			"FILE",
 		},
-		"MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR": []string{
+		"MESSAGE_NO_REMOVE_STANDARD_DESCRIPTOR_ACCESSOR": {
 			"FILE",
 			"PACKAGE",
 		},
-		"MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT": []string{
+		"MESSAGE_SAME_MESSAGE_SET_WIRE_FORMAT": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"ONEOF_NO_DELETE": []string{
+		"ONEOF_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"PACKAGE_ENUM_NO_DELETE": []string{
+		"PACKAGE_ENUM_NO_DELETE": {
 			"PACKAGE",
 		},
-		"PACKAGE_MESSAGE_NO_DELETE": []string{
+		"PACKAGE_MESSAGE_NO_DELETE": {
 			"PACKAGE",
 		},
-		"PACKAGE_NO_DELETE": []string{
+		"PACKAGE_NO_DELETE": {
 			"PACKAGE",
 		},
-		"PACKAGE_SERVICE_NO_DELETE": []string{
+		"PACKAGE_SERVICE_NO_DELETE": {
 			"PACKAGE",
 		},
-		"RESERVED_ENUM_NO_DELETE": []string{
+		"RESERVED_ENUM_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"RESERVED_MESSAGE_NO_DELETE": []string{
+		"RESERVED_MESSAGE_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"RPC_NO_DELETE": []string{
+		"RPC_NO_DELETE": {
 			"FILE",
 			"PACKAGE",
 		},
-		"RPC_SAME_CLIENT_STREAMING": []string{
+		"RPC_SAME_CLIENT_STREAMING": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"RPC_SAME_IDEMPOTENCY_LEVEL": []string{
+		"RPC_SAME_IDEMPOTENCY_LEVEL": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"RPC_SAME_REQUEST_TYPE": []string{
+		"RPC_SAME_REQUEST_TYPE": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"RPC_SAME_RESPONSE_TYPE": []string{
+		"RPC_SAME_RESPONSE_TYPE": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"RPC_SAME_SERVER_STREAMING": []string{
+		"RPC_SAME_SERVER_STREAMING": {
 			"FILE",
 			"PACKAGE",
 			"WIRE_JSON",
 			"WIRE",
 		},
-		"SERVICE_NO_DELETE": []string{
+		"SERVICE_NO_DELETE": {
 			"FILE",
 		},
 	}

diff --git a/internal/buf/bufcheck/buflint/buflint_ext_test.go b/internal/buf/bufcheck/buflint/buflint_ext_test.go
@@ -692,15 +692,15 @@ func TestRunIgnores3(t *testing.T) {
 		"ignores",
 		func(externalConfig *bufconfig.ExternalConfig) {
 			externalConfig.Lint.IgnoreOnly = map[string][]string{
-				"ENUM_PASCAL_CASE": []string{
+				"ENUM_PASCAL_CASE": {
 					"buf/bar/bar.proto",
 					"buf/foo/bar",
 					"buf/foo/bar",
 				},
-				"MESSAGE_PASCAL_CASE": []string{
+				"MESSAGE_PASCAL_CASE": {
 					"buf/bar/bar.proto",
 				},
-				"STYLE_BASIC": []string{
+				"STYLE_BASIC": {
 					"buf/foo/bar",
 				},
 			}