Skip to content

HTTP over gRPC & associated middleware.#10

Merged
tomwilkie merged 5 commits intomasterfrom
http-over-grpc
Jan 26, 2017
Merged

HTTP over gRPC & associated middleware.#10
tomwilkie merged 5 commits intomasterfrom
http-over-grpc

Conversation

@tomwilkie
Copy link
Contributor

No description provided.

03cc598 Don't lint generated protobuf code.
2b55c2d Merge pull request #66 from weaveworks/reduce-test-timeout
d4e163c Make timeout a flag
49a8609 Reduce test timeout
8fa15cb Merge pull request #63 from weaveworks/test-defaults
b783528 Tweak test script so it can be run on a mca
a3b18bf Merge pull request #65 from weaveworks/fix-integration-tests
ecb5602 Fix integration tests
f9dcbf6 ... without tab (clearly not my day)
a6215c3 Add break I forgot
0e6832d Remove incorrectly added tab
eb26c68 Merge pull request #64 from weaveworks/remove-test-package-linting
f088e83 Review feedback
2c6e83e Remove test package linting
2b3a1bb Merge pull request #62 from weaveworks/revert-61-test-defaults
8c3883a Revert "Make no-go-get the default, and don't assume -tags netgo"
e75c226 Fix bug in GC of firewall rules.
e49754e Merge pull request #51 from weaveworks/gc-firewall-rules
191f487 Add flag to enale/disable firewall rules' GC.
567905c Add GC of firewall rules for weave-net-tests to scheduler.
03119e1 Fix typo in GC of firewall rules.
bbe3844 Fix regular expression for firewall rules.
c5c23ce Pre-change refactoring: splitted gc_project function into smaller methods for better readability.
ed5529f GC firewall rules
ed8e757 Merge pull request #61 from weaveworks/test-defaults
57856e6 Merge pull request #56 from weaveworks/remove-wcloud
dd5f3e6 Add -p flag to test, run test in parallel
62f6f94 Make no-go-get the default, and don't assume -tags netgo
8946588 Merge pull request #60 from weaveworks/2647-gc-weave-net-tests
4085df9 Scheduler now also garbage-collects VMs from weave-net-tests.
4b7d5c6 Merge pull request #59 from weaveworks/57-fix-lint-properly
b7f0e69 Merge pull request #58 from weaveworks/fix-lint
794702c Pin version of shfmt
ab1b11d Fix lint
d1a5e46 Remove wcloud cli tool
81d80f3 Merge pull request #55 from weaveworks/lint-tf
05ad5f2 Review feedback
4c0d046 Use hclfmt to lint terraform.

git-subtree-dir: tools
git-subtree-split: 03cc5989769d93aa03f8aed3784ddfdb1fffc1c6
@tomwilkie tomwilkie changed the title HTTP over gRPC & associated middleware. [WIP] HTTP over gRPC & associated middleware. Jan 25, 2017
@tomwilkie tomwilkie self-assigned this Jan 25, 2017
@tomwilkie tomwilkie force-pushed the http-over-grpc branch 3 times, most recently from 82609a9 to 0afde6e Compare January 25, 2017 20:34
@tomwilkie tomwilkie changed the title [WIP] HTTP over gRPC & associated middleware. HTTP over gRPC & associated middleware. Jan 25, 2017
@tomwilkie tomwilkie removed their assignment Jan 25, 2017
@tomwilkie tomwilkie requested a review from paulbellamy January 25, 2017 21:05
@@ -0,0 +1,5 @@
To rebuild generated protobuf code, run:

protoc -I ./ --go_out=plugins=grpc:./ ./httpgrpc.proto

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.


protoc -I ./ --go_out=plugins=grpc:./ ./httpgrpc.proto

Follow the insturctions here to get a working protoc: https://github.com/golang/protobuf No newline at end of file

This comment was marked as abuse.

)

// HTTPoGRPCServer is a HTTPServer (ie gRPC) implementation
type HTTPoGRPCServer struct {

This comment was marked as abuse.

This comment was marked as abuse.

"github.com/weaveworks/common/middleware"
)

// HTTPoGRPCServer is a HTTPServer (ie gRPC) implementation

This comment was marked as abuse.

This comment was marked as abuse.

return resp, nil
}

// HTTPoGRPCClient is a http.Handler that forward the request over gRPC

This comment was marked as abuse.

@@ -0,0 +1,5 @@
To rebuild generated protobuf code, run:

This comment was marked as abuse.

This comment was marked as abuse.

@@ -0,0 +1,25 @@
syntax = "proto3";

package httpgrpc;

This comment was marked as abuse.

user/id.go Outdated
const UserIDHeaderName = "X-Scope-OrgID"

// LowerUserIDHeaderName as gRPC / HTTP2.0 headers are lowercased.
const LowerUserIDHeaderName = "x-scope-orgid"

This comment was marked as abuse.

user/id.go Outdated

// TODO(jml): typedef for userid, maybe even put in a weaveworks library, so
// that there's a shared language around the multiple ways of identifying
// entitiies.

This comment was marked as abuse.

@tomwilkie tomwilkie removed the request for review from paulbellamy January 26, 2017 12:41
@tomwilkie
Copy link
Contributor Author

@jml I can haz LGTM?

@tomwilkie tomwilkie merged commit f7d1a7f into master Jan 26, 2017
@tomwilkie tomwilkie deleted the http-over-grpc branch January 26, 2017 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants