Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[supervisor] Update to grpc-gateway v2 #2262

Merged
merged 4 commits into from
Nov 24, 2020
Merged

[supervisor] Update to grpc-gateway v2 #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3af95b9
[supervisor-api] Move to latest grpc-gateway
Nov 23, 2020
27690b0
[license] Add missing license header
Nov 23, 2020
67416ef
[supervisor] Adapt to updated grpc-gateway
Nov 23, 2020
715682b
[supervisor-api] Correct path for `TasksStatus`
Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions components/docker-up/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
# Licensed under the GNU Affero General Public License (AGPL).
# See License-AGPL.txt in the project root for license information.

FROM scratch

LABEL skip-n.registry-facade.gitpod.io="1"
Expand Down
4 changes: 4 additions & 0 deletions components/docker-up/slirp-docker-proxy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (c) 2020 TypeFox GmbH. All rights reserved.
// Licensed under the GNU Affero General Public License (AGPL).
// See License-AGPL.txt in the project root for license information.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions components/registry-facade/pkg/blobserve/refstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (c) 2020 TypeFox GmbH. All rights reserved.
// Licensed under the GNU Affero General Public License (AGPL).
// See License-AGPL.txt in the project root for license information.

package blobserve

import (
Expand Down
4 changes: 4 additions & 0 deletions components/registry-facade/pkg/blobserve/refstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (c) 2020 TypeFox GmbH. All rights reserved.
// Licensed under the GNU Affero General Public License (AGPL).
// See License-AGPL.txt in the project root for license information.

package blobserve

import (
Expand Down
4 changes: 4 additions & 0 deletions components/registry-facade/pkg/registry/layersource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (c) 2020 TypeFox GmbH. All rights reserved.
// Licensed under the GNU Affero General Public License (AGPL).
// See License-AGPL.txt in the project root for license information.

package registry

import (
Expand Down
2 changes: 1 addition & 1 deletion components/supervisor-api/control.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ syntax = "proto3";

package supervisor;

option go_package = "api";
option go_package = ".;api";

// ControlService provides workspace-facing, misc control related services
service ControlService {
Expand Down
4 changes: 2 additions & 2 deletions components/supervisor-api/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PROTOC_INCLUDE="-I. -I $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis -I /usr/lib/protoc/include"

GO111MODULE=on go get github.com/golang/protobuf/protoc-gen-go@v1.3.5
GO111MODULE=on go get github.com/golang/protobuf/protoc-gen-go
GO111MODULE=off go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
protoc $PROTOC_INCLUDE --go_out=plugins=grpc:go *.proto
protoc $PROTOC_INCLUDE --grpc-gateway_out=allow_colon_final_segments=true,logtostderr=true,paths=source_relative:go *.proto
protoc $PROTOC_INCLUDE --grpc-gateway_out=logtostderr=true,paths=source_relative:go *.proto
252 changes: 173 additions & 79 deletions components/supervisor-api/go/control.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions components/supervisor-api/go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ module github.com/gitpod-io/gitpod/supervisor/api
go 1.14

require (
github.com/golang/protobuf v1.3.5
github.com/golang/protobuf v1.4.3
github.com/grpc-ecosystem/grpc-gateway v1.14.8
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
google.golang.org/grpc v1.31.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1
google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154
google.golang.org/grpc v1.33.1
google.golang.org/protobuf v1.25.0
)
Loading