thriftrw · r-hang · Apr 4, 2023 · Sep 9, 2021 · Sep 9, 2021 · Sep 9, 2021
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ["1.15.x", "1.16.x"]
+        go: ["1.17.x", "1.18.x"]
         include:
-        - go: 1.16.x
+        - go: 1.18.x
           latest: true
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -8,12 +8,3 @@ cover.full.out
 cover.html
 .idea/
 
-# We will explicitly whitelist vendored libraries that we want to check in.
-vendor/*
-!vendor/github.com/
-
-/vendor/github.com/*
-!vendor/github.com/fatih/
-
-vendor/github.com/fatih/*
-!vendor/github.com/fatih/structtag
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.30.0] - 2023-04-04
+### Added
+- AddTemplate template option.
+- thriftbreak: support for changed types, new files, and optional JSON output.
+### Changed
+- String() performance improvements for string type definitions.
+
 ## [1.29.2] - 2021-09-09
 ### Fixed
 - Streaming now handles unrecongized fields and non-matching field types when
@@ -427,6 +434,7 @@ this release.
 ### Added
 - Initial release.
 
+[1.30.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.2...v1.30.0
 [1.29.2]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.1...v1.29.2
 [1.29.1]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.0...v1.29.1
 [1.29.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.28.0...v1.29.0

diff --git a/Makefile b/Makefile
@@ -15,8 +15,7 @@ LINT_EXCLUDES = \
 	plugin/api/plugin.go \
 	plugin/api/plugin_client.go \
 	plugin/api/servicegenerator.go \
-	plugin/api/servicegenerator_client.go \
-	vendor/
+	plugin/api/servicegenerator_client.go
 
 # For tests on generated code, ignore deprecated warnings.
 LINT_EXCLUDES += gen/.*_test.go:.*deprecated
@@ -33,20 +32,20 @@ LINT_EXCLUDES += unknown.*JSON.*option.*required
 RAGEL_TAR = $(BUILD_DIR)/src/ragel-$(RAGEL_VERSION).tar.gz
 
 GO_FILES := $(shell \
-	find . '(' -path '*/.*' -o -path './vendor' ')' -prune \
+	find . -path '*/.*' -prune \
 	-o -name '*.go' -print | cut -b3-)
 
-# Installs dependencies listed in tools_test.go.
-.PHONY: tools
-tools:
-	go list -json tools_test.go | jq -r '.TestImports | .[]' | xargs -n1 go install
-
 .PHONY: build
 build: $(THRIFTRW)
 
 .PHONY: ragel
 ragel: $(RAGEL)
 
+# Installs dependencies listed in tools_test.go.
+.PHONY: tools
+tools:
+	go list -json tools_test.go | jq -r '.TestImports | .[]' | xargs -n1 go install
+
 $(THRIFTRW): $(GO_FILES)
 	go install .
 
@@ -122,8 +121,7 @@ COVER_IGNORE_FILES = \
 	 $(wildcard plugin/api/*.go)
 
 # literal space
-space :=
-space +=
+space := $(subst ,, )
 
 .PHONY: cover
 cover:
@@ -133,4 +131,5 @@ cover:
 
 .PHONY: clean
 clean:
+	rm $(THRIFTRW)
 	go clean
diff --git a/ast/annotation.go b/ast/annotation.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/basetypeid_string.go b/ast/basetypeid_string.go
diff --git a/ast/constant.go b/ast/constant.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/definition.go b/ast/definition.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/doc.go b/ast/doc.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/header.go b/ast/header.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/mock_visitor_test.go b/ast/mock_visitor_test.go
diff --git a/ast/node.go b/ast/node.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/position.go b/ast/position.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/program.go b/ast/program.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/type.go b/ast/type.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/visitor.go b/ast/visitor.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/ast/walk.go b/ast/walk.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Uber Technologies, Inc.
+// Copyright (c) 2023 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/cmd/thriftbreak/main.go b/cmd/thriftbreak/main.go
@@ -0,0 +1,109 @@
+// Copyright (c) 2023 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"os"
+
+	"go.uber.org/thriftrw/internal/compare"
+	"go.uber.org/thriftrw/internal/git"
+)
+
+func main() {
+	if err := run(os.Args[1:]); err != nil && !errors.Is(err, flag.ErrHelp) {
+		log.Fatalf("%+v", err)
+	}
+}
+
+// readableOutput prints every lint error on a separate line.
+func readableOutput(w io.Writer) func(compare.Diagnostic) error {
+	return func(diagnostic compare.Diagnostic) error {
+		if _, err := fmt.Fprintln(w, &diagnostic); err != nil {
+			return fmt.Errorf("failed to output a lint error: %v", err)
+		}
+
+		return nil
+	}
+}
+
+// jsonOutput prints out every lint error in JSON format.
+func jsonOutput(w io.Writer) func(compare.Diagnostic) error {
+	enc := json.NewEncoder(w)
+
+	return func(diagnostic compare.Diagnostic) error {
+		// Encode adds a trailing newline.
+		if err := enc.Encode(diagnostic); err != nil {
+			return fmt.Errorf("encode as JSON: %v", err)
+		}
+
+		return nil
+	}
+}
+
+func run(args []string) error {
+	flag := flag.NewFlagSet("thriftbreak", flag.ContinueOnError)
+	gitRepo := flag.String("C", "",
+		"location of git repository. Defaults to current directory.")
+	jsonOut := flag.Bool("json", false,
+		"output as a list of newline-delimited JSON objects with the following fields: FilePath and Message")
+	if err := flag.Parse(args); err != nil {
+		return err
+	}
+
+	if *gitRepo == "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			return fmt.Errorf("cannot determine current directory: %v", err)
+		}
+		*gitRepo = cwd
+	}
+
+	pass, err := git.Compare(*gitRepo)
+	// Errors in compiling phase, but not in backwards compatibility.
+	if err != nil {
+		return err
+	}
+
+	var write func(compare.Diagnostic) error
+	if *jsonOut {
+		write = jsonOutput(os.Stdout)
+	} else {
+		write = readableOutput(os.Stdout)
+	}
+	lints := pass.Lints()
+	for _, l := range lints {
+		if err := write(l); err != nil {
+			return fmt.Errorf("failed to output error: %v", err)
+		}
+	}
+
+	if len(lints) > 0 {
+		return fmt.Errorf("found %d issues", len(lints))
+	}
+
+	return nil
+}