Revert "Bump Go to 1.17, use golangci-lint instead of make lint, deve…

…lop v2 module (#106)" (#111)

This reverts commit bd08ed9.

.github/workflows/test.yml

@@ -26,14 +26,13 @@ jobs:
       - name: Set Up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.14.6'
       - run: mkdir -p $GOPATH/bin
       - run: wget "https://github.com/protocolbuffers/protobuf/releases/download/v${{ matrix.protoc-version }}/protoc-${{ matrix.protoc-version }}-linux-x86_64.zip" -O /tmp/protoc.zip
       - run: unzip /tmp/protoc.zip -d /tmp
       - run: sudo mv /tmp/bin/protoc /usr/local/bin/protoc
       - run: sudo mv /tmp/include/google /usr/local/include/google
       - name: Generate Testdata
         run: make testdata
-      - name: Run Tests
-        run: make tests
-
+      - name: Lint
+        run: make lint tests

Makefile

@@ -5,6 +5,16 @@ PROTOC_VER := $(shell protoc --version | cut -d' ' -f2)
 .PHONY: bootstrap
 bootstrap: testdata # set up the project for development
 
+.PHONY: lint
+lint: # lints the package for common code smells
+	set -e; for f in `find . -name "*.go" -not -name "*.pb.go"`; do \
+		out=`gofmt -s -d $$f`; \
+		test -z "$$out" || (echo $$out && exit 1); \
+	done
+	which golint || go get -u golang.org/x/lint/golint
+	golint -set_exit_status ./...
+	go vet -all
+
 .PHONY: quick
 quick: testdata # runs all tests without the race detector or coverage
 ifeq ($(PROTOC_VER), 3.17.0)

artifact_test.go

@@ -13,8 +13,6 @@ var (
 	artifactTpl    = template.Must(template.New("foo").Parse("{{ . }}"))
 )
 
-const fName = "foo"
-
 func TestGeneratorFile_ProtoFile(t *testing.T) {
 	t.Parallel()
 
@@ -27,7 +25,7 @@ func TestGeneratorFile_ProtoFile(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, pb)
 
-	f.Name = fName
+	f.Name = "foo"
 	pb, err = f.ProtoFile()
 	assert.NoError(t, err)
 	assert.Equal(t, f.Name, pb.GetName())
@@ -49,7 +47,7 @@ func TestGeneratorTemplateFile_ProtoFile(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, pb)
 
-	f.Name = fName
+	f.Name = "foo"
 	pb, err = f.ProtoFile()
 	assert.Error(t, err)
 	assert.Nil(t, pb)
@@ -73,7 +71,7 @@ func TestGeneratorAppend_ProtoFile(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, pb)
 
-	f.FileName = fName
+	f.FileName = "foo"
 	pb, err = f.ProtoFile()
 	assert.NoError(t, err)
 	assert.Empty(t, pb.GetName())
@@ -95,7 +93,7 @@ func TestGeneratorTemplateAppend_ProtoFile(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, pb)
 
-	f.FileName = fName
+	f.FileName = "foo"
 	pb, err = f.ProtoFile()
 	assert.Error(t, err)
 	assert.Nil(t, pb)
@@ -120,7 +118,7 @@ func TestGeneratorInjection_ProtoFile(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, pb)
 
-	f.FileName = fName
+	f.FileName = "foo"
 	pb, err = f.ProtoFile()
 	assert.NoError(t, err)
 	assert.Equal(t, f.FileName, pb.GetName())
@@ -144,7 +142,7 @@ func TestGeneratorTemplateInjection_ProtoFile(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, pb)
 
-	f.FileName = fName
+	f.FileName = "foo"
 	pb, err = f.ProtoFile()
 	assert.Error(t, err)
 	assert.Nil(t, pb)

field_test.go

@@ -251,7 +251,8 @@ func dummyOneOfField(synthetic bool) *field {
 	m := dummyMsg()
 	o := dummyOneof()
 	str := descriptor.FieldDescriptorProto_TYPE_STRING
-	var oIndex int32 = 1
+	var oIndex int32
+	oIndex = 1
 	f := &field{desc: &descriptor.FieldDescriptorProto{
 		Name:           proto.String("field"),
 		Type:           &str,

field_type_test.go

@@ -304,8 +304,9 @@ func TestMapT_Key(t *testing.T) {
 
 type mockT struct {
 	FieldType
-	i []File
-	f Field
+	i   []File
+	f   Field
+	err error
 }
 
 func (t *mockT) Imports() []File { return t.i }

lang/go/name.go

@@ -22,7 +22,7 @@ func (c context) Name(node pgs.Node) pgs.Name {
 		return c.PackageName(en)
 	case ChildEntity: // Message or Enum types, which may be nested
 		if p, ok := en.Parent().(pgs.Message); ok {
-			return joinChild(c.Name(p), en.Name())
+			return pgs.Name(joinChild(c.Name(p), en.Name()))
 		}
 		return PGGUpperCamelCase(en.Name())
 	case pgs.Field: // field names cannot conflict with other generated methods
@@ -31,9 +31,9 @@ func (c context) Name(node pgs.Node) pgs.Name {
 		return replaceProtected(PGGUpperCamelCase(en.Name()))
 	case pgs.EnumValue: // EnumValue are prefixed with the enum name
 		if _, ok := en.Enum().Parent().(pgs.File); ok {
-			return joinNames(c.Name(en.Enum()), en.Name())
+			return pgs.Name(joinNames(c.Name(en.Enum()), en.Name()))
 		}
-		return joinNames(c.Name(en.Enum().Parent()), en.Name())
+		return pgs.Name(joinNames(c.Name(en.Enum().Parent()), en.Name()))
 	case pgs.Service: // always return the server name
 		return c.ServerName(en)
 	case pgs.Entity: // any other entity should be just upper-camel-cased
@@ -44,7 +44,7 @@ func (c context) Name(node pgs.Node) pgs.Name {
 }
 
 func (c context) OneofOption(field pgs.Field) pgs.Name {
-	n := joinNames(c.Name(field.Message()), c.Name(field))
+	n := pgs.Name(joinNames(c.Name(field.Message()), c.Name(field)))
 
 	for _, msg := range field.Message().Messages() {
 		if c.Name(msg) == n {

lang/go/type_name_p2_presence_test.go

@@ -1,4 +1,3 @@
-//go:build !proto3_presence
 // +build !proto3_presence
 
 package pgsgo

method.go

@@ -93,4 +93,4 @@ func (m *method) childAtPath(path []int32) Entity {
 
 func (m *method) addSourceCodeInfo(info SourceCodeInfo) { m.info = info }
 
-var _ Method = (*method)(nil)
+var m Method = (*method)(nil)