utilities: move package to public API

This was made internal, but it's actually used by the generated files.
whockey · May 25, 2020 · 877d598 · 877d598
1 parent cc95ab4
commit 877d598
Show file tree

Hide file tree

Showing 34 changed files with 39 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -8,18 +8,18 @@ GO_PROTOBUF_REPO=github.com/golang/protobuf
 GO_PLUGIN_PKG=$(GO_PROTOBUF_REPO)/protoc-gen-go
 GO_PTYPES_ANY_PKG=$(GO_PROTOBUF_REPO)/ptypes/any
 OPENAPI_PLUGIN=bin/protoc-gen-openapiv2
-OPENAPI_PLUGIN_SRC= ./internal/utilities/doc.go \
-			./internal/utilities/pattern.go \
-			./internal/utilities/trie.go \
+OPENAPI_PLUGIN_SRC= ./utilities/doc.go \
+			./utilities/pattern.go \
+			./utilities/trie.go \
 			protoc-gen-openapiv2/internal/genopenapi/generator.go \
 			protoc-gen-openapiv2/internal/genopenapi/template.go \
 			protoc-gen-openapiv2/main.go
 OPENAPI_PLUGIN_PKG=./protoc-gen-openapiv2
 GATEWAY_PLUGIN=bin/protoc-gen-grpc-gateway
 GATEWAY_PLUGIN_PKG=./protoc-gen-grpc-gateway
-GATEWAY_PLUGIN_SRC= ./internal/utilities/doc.go \
-			./internal/utilities/pattern.go \
-			./internal/utilities/trie.go \
+GATEWAY_PLUGIN_SRC= ./utilities/doc.go \
+			./utilities/pattern.go \
+			./utilities/trie.go \
 			./internal/descriptor \
 			./internal/descriptor/registry.go \
 			./internal/descriptor/services.go \
@@ -232,11 +232,11 @@ changelog:
 				--future-release=v2.0.0-beta1
 lint:
 	golint --set_exit_status ./runtime
-	golint --set_exit_status ./internal/utilities/...
+	golint --set_exit_status ./utilities/...
 	golint --set_exit_status ./protoc-gen-grpc-gateway/...
 	golint --set_exit_status ./protoc-gen-openapiv2/...
 	go vet ./runtime || true
-	go vet ./internal/utilities/...
+	go vet ./utilities/...
 	go vet ./protoc-gen-grpc-gateway/...
 	go vet ./protoc-gen-openapiv2/...
 

diff --git a/examples/internal/helloworld/BUILD.bazel b/examples/internal/helloworld/BUILD.bazel
@@ -28,8 +28,8 @@ go_library(
     importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/helloworld",
     visibility = ["//visibility:public"],
     deps = [
-        "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
+        "//utilities:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//grpclog:go_default_library",

diff --git a/examples/internal/helloworld/helloworld.pb.gw.go b/examples/internal/helloworld/helloworld.pb.gw.go
diff --git a/examples/internal/proto/examplepb/BUILD.bazel b/examples/internal/proto/examplepb/BUILD.bazel
@@ -79,8 +79,8 @@ go_library(
     embed = [":examplepb_go_proto"],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb",
     deps = [
-        "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
+        "//utilities:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//grpclog:go_default_library",

diff --git a/examples/internal/proto/examplepb/a_bit_of_everything.pb.gw.go b/examples/internal/proto/examplepb/a_bit_of_everything.pb.gw.go
diff --git a/examples/internal/proto/examplepb/echo_service.pb.gw.go b/examples/internal/proto/examplepb/echo_service.pb.gw.go
diff --git a/examples/internal/proto/examplepb/flow_combination.pb.gw.go b/examples/internal/proto/examplepb/flow_combination.pb.gw.go
diff --git a/examples/internal/proto/examplepb/non_standard_names.pb.gw.go b/examples/internal/proto/examplepb/non_standard_names.pb.gw.go
diff --git a/examples/internal/proto/examplepb/response_body_service.pb.gw.go b/examples/internal/proto/examplepb/response_body_service.pb.gw.go
diff --git a/examples/internal/proto/examplepb/stream.pb.gw.go b/examples/internal/proto/examplepb/stream.pb.gw.go
diff --git a/examples/internal/proto/examplepb/unannotated_echo_service.pb.gw.go b/examples/internal/proto/examplepb/unannotated_echo_service.pb.gw.go
diff --git a/examples/internal/proto/examplepb/use_go_template.pb.gw.go b/examples/internal/proto/examplepb/use_go_template.pb.gw.go
diff --git a/examples/internal/proto/examplepb/wrappers.pb.gw.go b/examples/internal/proto/examplepb/wrappers.pb.gw.go
diff --git a/examples/internal/proto/standalone/BUILD.bazel b/examples/internal/proto/standalone/BUILD.bazel
@@ -7,8 +7,8 @@ go_library(
     visibility = ["//examples:__subpackages__"],
     deps = [
         "//examples/internal/proto/examplepb:go_default_library",
-        "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
+        "//utilities:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//grpclog:go_default_library",

diff --git a/examples/internal/proto/standalone/unannotated_echo_service.pb.gw.go b/examples/internal/proto/standalone/unannotated_echo_service.pb.gw.go
diff --git a/internal/httprule/BUILD.bazel b/internal/httprule/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
     ],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule",
     deps = [
-        "//internal/utilities:go_default_library",
+        "//utilities:go_default_library",
         "@com_github_golang_glog//:go_default_library",
     ],
 )
@@ -26,7 +26,7 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//internal/utilities:go_default_library",
+        "//utilities:go_default_library",
         "@com_github_golang_glog//:go_default_library",
     ],
 )
diff --git a/internal/httprule/compile.go b/internal/httprule/compile.go
@@ -1,7 +1,7 @@
 package httprule
 
 import (
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 )
 
 const (

diff --git a/internal/httprule/compile_test.go b/internal/httprule/compile_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 )
 
 const (

diff --git a/protoc-gen-grpc-gateway/BUILD.bazel b/protoc-gen-grpc-gateway/BUILD.bazel
@@ -33,8 +33,8 @@ go_proto_compiler(
     suffix = ".pb.gw.go",
     visibility = ["//visibility:public"],
     deps = [
-        "//internal/utilities:go_default_library",
         "//runtime:go_default_library",
+        "//utilities:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",

diff --git a/protoc-gen-grpc-gateway/internal/gengateway/BUILD.bazel b/protoc-gen-grpc-gateway/internal/gengateway/BUILD.bazel
@@ -14,7 +14,7 @@ go_library(
         "//internal/casing:go_default_library",
         "//internal/descriptor:go_default_library",
         "//internal/generator:go_default_library",
-        "//internal/utilities:go_default_library",
+        "//utilities:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
         "@org_golang_google_protobuf//proto:go_default_library",

diff --git a/protoc-gen-grpc-gateway/internal/gengateway/generator.go b/protoc-gen-grpc-gateway/internal/gengateway/generator.go
@@ -45,7 +45,7 @@ func New(reg *descriptor.Registry, useRequestContext bool, registerFuncSuffix, p
 		"io",
 		"net/http",
 		"github.com/grpc-ecosystem/grpc-gateway/v2/runtime",
-		"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities",
+		"github.com/grpc-ecosystem/grpc-gateway/v2/utilities",
 		"google.golang.org/protobuf/proto",
 		"google.golang.org/grpc",
 		"google.golang.org/grpc/codes",

diff --git a/protoc-gen-grpc-gateway/internal/gengateway/template.go b/protoc-gen-grpc-gateway/internal/gengateway/template.go
@@ -10,7 +10,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/casing"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 )
 
 type param struct {

diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel
@@ -24,7 +24,7 @@ go_library(
     ],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/runtime",
     deps = [
-        "//internal/utilities:go_default_library",
+        "//utilities:go_default_library",
         "@com_github_golang_protobuf//ptypes:go_default_library_gen",
         "@go_googleapis//google/api:httpbody_go_proto",
         "@io_bazel_rules_go//proto/wkt:duration_go_proto",
@@ -62,8 +62,8 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//internal/utilities:go_default_library",
         "//runtime/internal/examplepb:go_default_library",
+        "//utilities:go_default_library",
         "@com_github_golang_protobuf//ptypes:go_default_library_gen",
         "@com_github_google_go_cmp//cmp:go_default_library",
         "@com_github_google_go_cmp//cmp/cmpopts:go_default_library",

diff --git a/runtime/mux_test.go b/runtime/mux_test.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 )
 
 func TestMuxServeHTTP(t *testing.T) {

diff --git a/runtime/pattern.go b/runtime/pattern.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 	"google.golang.org/grpc/grpclog"
 )
 

diff --git a/runtime/pattern_test.go b/runtime/pattern_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 )
 
 const (

diff --git a/runtime/query.go b/runtime/query.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes"
 	wrapperspb "github.com/golang/protobuf/ptypes/wrappers"
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 	"google.golang.org/genproto/protobuf/field_mask"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/protobuf/proto"

diff --git a/runtime/query_test.go b/runtime/query_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	wrapperspb "github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/google/go-cmp/cmp"
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime/internal/examplepb"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 	"google.golang.org/genproto/protobuf/field_mask"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"

diff --git a/internal/utilities/BUILD.bazel → utilities/BUILD.bazel b/internal/utilities/BUILD.bazel → utilities/BUILD.bazel
@@ -10,7 +10,7 @@ go_library(
         "readerfactory.go",
         "trie.go",
     ],
-    importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities",
+    importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/utilities",
 )
 
 go_test(

diff --git a/internal/utilities/doc.go → utilities/doc.go b/internal/utilities/doc.go → utilities/doc.go
diff --git a/internal/utilities/pattern.go → utilities/pattern.go b/internal/utilities/pattern.go → utilities/pattern.go
diff --git a/internal/utilities/readerfactory.go → utilities/readerfactory.go b/internal/utilities/readerfactory.go → utilities/readerfactory.go
diff --git a/internal/utilities/trie.go → utilities/trie.go b/internal/utilities/trie.go → utilities/trie.go
diff --git a/internal/utilities/trie_test.go → utilities/trie_test.go b/internal/utilities/trie_test.go → utilities/trie_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/grpc-ecosystem/grpc-gateway/v2/internal/utilities"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
 )
 
 func TestMaxCommonPrefix(t *testing.T) {