Move httprule back into the public API

Fixes grpc-ecosystem#1168
BuildingRobotics · Apr 29, 2020 · 629e644 · 629e644
1 parent 5a1ffa1
commit 629e644
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -33,10 +33,10 @@ GATEWAY_PLUGIN_SRC= utilities/doc.go \
 		    protoc-gen-grpc-gateway/internal/gengateway/doc.go \
 		    protoc-gen-grpc-gateway/internal/gengateway/generator.go \
 		    protoc-gen-grpc-gateway/internal/gengateway/template.go \
-		    internal/httprule \
-		    internal/httprule/compile.go \
-		    internal/httprule/parse.go \
-		    internal/httprule/types.go \
+		    protoc-gen-grpc-gateway/httprule \
+		    protoc-gen-grpc-gateway/httprule/compile.go \
+		    protoc-gen-grpc-gateway/httprule/parse.go \
+		    protoc-gen-grpc-gateway/httprule/types.go \
 		    protoc-gen-grpc-gateway/main.go
 GATEWAY_PLUGIN_FLAGS?=
 SWAGGER_PLUGIN_FLAGS?=

diff --git a/fuzzit.sh b/fuzzit.sh
@@ -9,9 +9,9 @@ cd go-fuzz
 go get ./...
 go build ./...
 
-#go get -v -u ./internal/httprule
+#go get -v -u ./protoc-gen-grpc-gateway/httprule
 cd /src/grpc-gateway
-go-fuzz-build -libfuzzer -o parse-http-rule.a ./internal/httprule
+go-fuzz-build -libfuzzer -o parse-http-rule.a ./protoc-gen-grpc-gateway/httprule
 clang-9 -fsanitize=fuzzer parse-http-rule.a -o parse-http-rule
 
 wget -q -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/download/v2.4.29/fuzzit_Linux_x86_64

diff --git a/protoc-gen-grpc-gateway/descriptor/BUILD.bazel b/protoc-gen-grpc-gateway/descriptor/BUILD.bazel
@@ -13,7 +13,7 @@ go_library(
     ],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor",
     deps = [
-        "//internal/httprule:go_default_library",
+        "//protoc-gen-grpc-gateway/httprule:go_default_library",
         "@com_github_ghodss_yaml//:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
@@ -36,7 +36,7 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//internal/httprule:go_default_library",
+        "//protoc-gen-grpc-gateway/httprule:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",

diff --git a/protoc-gen-grpc-gateway/descriptor/services.go b/protoc-gen-grpc-gateway/descriptor/services.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/internal/httprule"
+	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 	options "google.golang.org/genproto/googleapis/api/annotations"
 )
 

diff --git a/protoc-gen-grpc-gateway/descriptor/services_test.go b/protoc-gen-grpc-gateway/descriptor/services_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/internal/httprule"
+	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 )
 
 func compilePath(t *testing.T, path string) httprule.Template {

diff --git a/protoc-gen-grpc-gateway/descriptor/types.go b/protoc-gen-grpc-gateway/descriptor/types.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
 	gogen "github.com/golang/protobuf/protoc-gen-go/generator"
-	"github.com/grpc-ecosystem/grpc-gateway/internal/httprule"
+	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 )
 
 // IsWellKnownType returns true if the provided fully qualified type name is considered 'well-known'.

diff --git a/internal/httprule/BUILD.bazel → protoc-gen-grpc-gateway/httprule/BUILD.bazel b/internal/httprule/BUILD.bazel → protoc-gen-grpc-gateway/httprule/BUILD.bazel
@@ -9,7 +9,7 @@ go_library(
         "parse.go",
         "types.go",
     ],
-    importpath = "github.com/grpc-ecosystem/grpc-gateway/internal/httprule",
+    importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule",
     deps = [
         "//utilities:go_default_library",
         "@com_github_golang_glog//:go_default_library",

diff --git a/internal/httprule/compile.go → protoc-gen-grpc-gateway/httprule/compile.go b/internal/httprule/compile.go → protoc-gen-grpc-gateway/httprule/compile.go
diff --git a/internal/httprule/compile_test.go → ...gen-grpc-gateway/httprule/compile_test.go b/internal/httprule/compile_test.go → ...gen-grpc-gateway/httprule/compile_test.go
diff --git a/internal/httprule/fuzz.go → protoc-gen-grpc-gateway/httprule/fuzz.go b/internal/httprule/fuzz.go → protoc-gen-grpc-gateway/httprule/fuzz.go
diff --git a/internal/httprule/parse.go → protoc-gen-grpc-gateway/httprule/parse.go b/internal/httprule/parse.go → protoc-gen-grpc-gateway/httprule/parse.go
diff --git a/internal/httprule/parse_test.go → ...c-gen-grpc-gateway/httprule/parse_test.go b/internal/httprule/parse_test.go → ...c-gen-grpc-gateway/httprule/parse_test.go
diff --git a/internal/httprule/types.go → protoc-gen-grpc-gateway/httprule/types.go b/internal/httprule/types.go → protoc-gen-grpc-gateway/httprule/types.go
diff --git a/internal/httprule/types_test.go → ...c-gen-grpc-gateway/httprule/types_test.go b/internal/httprule/types_test.go → ...c-gen-grpc-gateway/httprule/types_test.go
diff --git a/protoc-gen-grpc-gateway/internal/gengateway/BUILD.bazel b/protoc-gen-grpc-gateway/internal/gengateway/BUILD.bazel
@@ -30,8 +30,8 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//internal/httprule:go_default_library",
         "//protoc-gen-grpc-gateway/descriptor:go_default_library",
+        "//protoc-gen-grpc-gateway/httprule:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
     ],

diff --git a/protoc-gen-grpc-gateway/internal/gengateway/template_test.go b/protoc-gen-grpc-gateway/internal/gengateway/template_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	protodescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/internal/httprule"
 	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
+	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 )
 
 func crossLinkFixture(f *descriptor.File) *descriptor.File {

diff --git a/protoc-gen-swagger/genswagger/BUILD.bazel b/protoc-gen-swagger/genswagger/BUILD.bazel
@@ -36,8 +36,8 @@ go_test(
     srcs = ["template_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//internal/httprule:go_default_library",
         "//protoc-gen-grpc-gateway/descriptor:go_default_library",
+        "//protoc-gen-grpc-gateway/httprule:go_default_library",
         "//protoc-gen-swagger/options:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@io_bazel_rules_go//proto/wkt:any_go_proto",

diff --git a/protoc-gen-swagger/genswagger/template_test.go b/protoc-gen-swagger/genswagger/template_test.go
@@ -12,8 +12,8 @@ import (
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
 	"github.com/golang/protobuf/ptypes/any"
 	structpb "github.com/golang/protobuf/ptypes/struct"
-	"github.com/grpc-ecosystem/grpc-gateway/internal/httprule"
 	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
+	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 	swagger_options "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
 )