Skip to content

Commit a56b28d

Browse files
authored
Update testsrv protos (#668)
1 parent 7e3c23f commit a56b28d

File tree

4 files changed

+6
-160
lines changed

4 files changed

+6
-160
lines changed

sdk-core-protos/protos/testsrv_upstream/Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,26 @@ PROTO_ROOT := .
2323
PROTO_FILES = $(shell find $(PROTO_ROOT) -name "*.proto")
2424
PROTO_DIRS = $(sort $(dir $(PROTO_FILES)))
2525
PROTO_OUT := .gen
26-
PROTO_IMPORTS := -I=$(PROTO_ROOT) -I=$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
26+
PROTO_IMPORTS := -I=$(PROTO_ROOT)
2727

2828
$(PROTO_OUT):
2929
mkdir $(PROTO_OUT)
3030

3131
##### Compile proto files for go #####
32-
grpc: buf-lint api-linter buf-breaking gogo-grpc fix-path
32+
grpc: buf-lint api-linter buf-breaking fix-path
3333

3434
go-grpc: clean $(PROTO_OUT)
3535
printf $(COLOR) "Compile for go-gRPC..."
3636
$(foreach PROTO_DIR,$(PROTO_DIRS),protoc $(PROTO_IMPORTS) --go_out=plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto;)
3737

38-
gogo-grpc: clean $(PROTO_OUT)
39-
printf $(COLOR) "Compile for gogo-gRPC..."
40-
$(foreach PROTO_DIR,$(PROTO_DIRS),protoc $(PROTO_IMPORTS) --gogoslick_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto;)
41-
4238
fix-path:
4339
mv -f $(PROTO_OUT)/temporal/api/* $(PROTO_OUT) && rm -rf $(PROTO_OUT)/temporal
4440

4541
##### Plugins & tools #####
46-
grpc-install: gogo-protobuf-install
42+
grpc-install:
4743
printf $(COLOR) "Install/update gRPC plugins..."
4844
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
4945

50-
gogo-protobuf-install: go-protobuf-install
51-
GO111MODULE=off go get github.com/temporalio/gogo-protobuf/protoc-gen-gogoslick
52-
5346
go-protobuf-install:
5447
go install github.com/golang/protobuf/protoc-gen-go@v1.4.3
5548

sdk-core-protos/protos/testsrv_upstream/api-linter.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,3 @@
3131
- 'core::0127::http-annotation'
3232
- 'core::0131::method-signature'
3333
- 'core::0131::response-message-name'
34-
35-
- included_paths:
36-
- 'dependencies/gogoproto/gogo.proto'
37-
disabled_rules:
38-
- 'all'

sdk-core-protos/protos/testsrv_upstream/dependencies/gogoproto/gogo.proto

Lines changed: 0 additions & 141 deletions
This file was deleted.

sdk-core-protos/protos/testsrv_upstream/temporal/api/testservice/v1/request_response.proto

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ option csharp_namespace = "Temporalio.Api.TestService.V1";
3333

3434
import "google/protobuf/duration.proto";
3535
import "google/protobuf/timestamp.proto";
36-
import "dependencies/gogoproto/gogo.proto";
3736

3837
message LockTimeSkippingRequest {
3938
}
@@ -48,16 +47,16 @@ message UnlockTimeSkippingResponse {
4847
}
4948

5049
message SleepUntilRequest {
51-
google.protobuf.Timestamp timestamp = 1 [(gogoproto.stdtime) = true];
50+
google.protobuf.Timestamp timestamp = 1;
5251
}
5352

5453
message SleepRequest {
55-
google.protobuf.Duration duration = 1 [(gogoproto.stdduration) = true];
54+
google.protobuf.Duration duration = 1;
5655
}
5756

5857
message SleepResponse {
5958
}
6059

6160
message GetCurrentTimeResponse {
62-
google.protobuf.Timestamp time = 1 [(gogoproto.stdtime) = true];
61+
google.protobuf.Timestamp time = 1;
6362
}

0 commit comments

Comments
 (0)