Revert "Add supporting response_body field in the google.api.HttpRule (#712)"

This reverts commit e679739.

Author: ivucica

Gopkg.lock

@@ -23,11 +23,6 @@ required = [
   revision = "6724a57986aff9bff1a1770e9347036def7c89f6"
   name = "github.com/rogpeppe/fastuuid"
 
-[[constraint]]
-  # Also defined in WORKSPACE
-  revision = "383e8b2c3b9e36c4076b235b32537292176bae20"
-  name = "google.golang.org/genproto"
-
 [[override]]
   # Also defined in WORKSPACE
   revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"
@@ -53,6 +48,12 @@ required = [
   version = "1.10.3"
   name = "google.golang.org/grpc"
 
+[[constraint]]
+  # Also defined in bazelbuild/rules_go
+  # https://github.com/bazelbuild/rules_go/blob/436452edc29a2f1e0edc22d180fbb57c27e6d0af/go/private/repositories.bzl#L131
+  revision = "86e600f69ee4704c6efbf6a2a40a5c10700e76c2"
+  name = "google.golang.org/genproto"
+
 [[constraint]]
   # Also defined in bazelbuild/rules_go
   # https://github.com/bazelbuild/rules_go/blob/436452edc29a2f1e0edc22d180fbb57c27e6d0af/go/private/repositories.bzl#L138

Gopkg.toml

@@ -63,17 +63,13 @@ endif
 SWAGGER_EXAMPLES=examples/proto/examplepb/echo_service.proto \
 	 examples/proto/examplepb/a_bit_of_everything.proto \
 	 examples/proto/examplepb/wrappers.proto \
-	 examples/proto/examplepb/unannotated_echo_service.proto \
-	 examples/proto/examplepb/response_body_service.proto
-
+	 examples/proto/examplepb/unannotated_echo_service.proto
 EXAMPLES=examples/proto/examplepb/echo_service.proto \
 	 examples/proto/examplepb/a_bit_of_everything.proto \
 	 examples/proto/examplepb/stream.proto \
 	 examples/proto/examplepb/flow_combination.proto \
 	 examples/proto/examplepb/wrappers.proto \
-	 examples/proto/examplepb/unannotated_echo_service.proto \
-	 examples/proto/examplepb/response_body_service.proto
-
+	 examples/proto/examplepb/unannotated_echo_service.proto
 EXAMPLE_SVCSRCS=$(EXAMPLES:.proto=.pb.go)
 EXAMPLE_GWSRCS=$(EXAMPLES:.proto=.pb.gw.go)
 EXAMPLE_SWAGGERSRCS=$(SWAGGER_EXAMPLES:.proto=.swagger.json)
@@ -109,14 +105,7 @@ UNANNOTATED_ECHO_EXAMPLE_SRCS=$(EXAMPLE_CLIENT_DIR)/unannotatedecho/api_client.g
 		 $(EXAMPLE_CLIENT_DIR)/unannotatedecho/configuration.go \
 		 $(EXAMPLE_CLIENT_DIR)/unannotatedecho/examplepb_unannotated_simple_message.go \
 		 $(EXAMPLE_CLIENT_DIR)/unannotatedecho/unannotated_echo_service_api.go
-RESPONSE_BODY_EXAMPLE_SPEC=examples/proto/examplepb/response_body_service.swagger.json
-RESPONSE_BODY_EXAMPLE_SRCS=$(EXAMPLE_CLIENT_DIR)/responsebody/api_client.go \
-		 $(EXAMPLE_CLIENT_DIR)/responsebody/api_response.go \
-		 $(EXAMPLE_CLIENT_DIR)/responsebody/configuration.go \
-		 $(EXAMPLE_CLIENT_DIR)/responsebody/examplepb_response_body.go \
-		 $(EXAMPLE_CLIENT_DIR)/responsebody/response_body_service_api.go
-
-EXAMPLE_CLIENT_SRCS=$(ECHO_EXAMPLE_SRCS) $(ABE_EXAMPLE_SRCS) $(UNANNOTATED_ECHO_EXAMPLE_SRCS) $(RESPONSE_BODY_EXAMPLE_SRCS)
+EXAMPLE_CLIENT_SRCS=$(ECHO_EXAMPLE_SRCS) $(ABE_EXAMPLE_SRCS) $(UNANNOTATED_ECHO_EXAMPLE_SRCS)
 SWAGGER_CODEGEN=swagger-codegen
 
 PROTOC_INC_PATH=$(dir $(shell which protoc))/../include
@@ -175,12 +164,6 @@ $(UNANNOTATED_ECHO_EXAMPLE_SRCS): $(UNANNOTATED_ECHO_EXAMPLE_SPEC)
 	@rm -f $(EXAMPLE_CLIENT_DIR)/unannotatedecho/README.md \
 		$(EXAMPLE_CLIENT_DIR)/unannotatedecho/git_push.sh \
 		$(EXAMPLE_CLIENT_DIR)/unannotatedecho/.travis.yml
-$(RESPONSE_BODY_EXAMPLE_SRCS): $(RESPONSE_BODY_EXAMPLE_SPEC)
-	$(SWAGGER_CODEGEN) generate -i $(RESPONSE_BODY_EXAMPLE_SPEC) \
-	    -l go -o examples/clients/responsebody --additional-properties packageName=responsebody
-	@rm -f $(EXAMPLE_CLIENT_DIR)/responsebody/README.md \
-		$(EXAMPLE_CLIENT_DIR)/responsebody/git_push.sh \
-		$(EXAMPLE_CLIENT_DIR)/responsebody/.travis.yml
 
 examples: $(EXAMPLE_SVCSRCS) $(EXAMPLE_GWSRCS) $(EXAMPLE_DEPSRCS) $(EXAMPLE_SWAGGERSRCS) $(EXAMPLE_CLIENT_SRCS)
 test: examples

Makefile

@@ -12,51 +12,42 @@ http_archive(
     sha256 = "d03625db67e9fb0905bbd206fa97e32ae9da894fe234a493e7517fd25faec914",
 )
 
-load("@io_bazel_rules_go//go:def.bzl", "go_repository")
-load("//:repositories.bzl", "repositories")
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
 
-# Also define in Gopkg.toml
-go_repository(
-    name = "org_golang_google_genproto",
-    commit = "383e8b2c3b9e36c4076b235b32537292176bae20",
-    importpath = "google.golang.org/genproto",
-)
+go_rules_dependencies()
+
+go_register_toolchains()
+
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+
+gazelle_dependencies()
+
+load("@io_bazel_rules_go//go:def.bzl", "go_repository")
 
-# Also define in Gopkg.toml
 go_repository(
     name = "com_github_rogpeppe_fastuuid",
     commit = "6724a57986aff9bff1a1770e9347036def7c89f6",
     importpath = "github.com/rogpeppe/fastuuid",
 )
 
-# Also define in Gopkg.toml
 go_repository(
     name = "com_github_go_resty_resty",
     commit = "f8815663de1e64d57cdd4ee9e2b2fa96977a030e",
     importpath = "github.com/go-resty/resty",
 )
 
-# Also define in Gopkg.toml
 go_repository(
 	name = "com_github_ghodss_yaml",
 	commit = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7",
 	importpath = "github.com/ghodss/yaml",
 )
 
-# Also define in Gopkg.toml
 go_repository(
 	name = "in_gopkg_yaml_v2",
 	commit = "eb3733d160e74a9c7e442f435eb3bea458e1d19f",
 	importpath = "gopkg.in/yaml.v2",
 )
 
-repositories()
-
-go_rules_dependencies()
-
-go_register_toolchains()
-
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+load("//:repositories.bzl", "repositories")
 
-gazelle_dependencies()
+repositories()