Skip to content

Commit 59d1cce

Browse files
authored
Address all buf warnings (#53)
1 parent 71ffbc4 commit 59d1cce

File tree

29 files changed

+1639
-1623
lines changed

29 files changed

+1639
-1623
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$(VERBOSE).SILENT:
22

3-
# default target
3+
# Default target
44
default: all-install all
55

66
ifndef GOPATH
@@ -9,10 +9,10 @@ endif
99

1010
PROTO_ROOT := .
1111
# List only subdirectories with *.proto files. Sort to remove duplicates.
12-
PROTO_DIRS = $(sort $(dir $(wildcard $(PROTO_ROOT)/*/*.proto)))
12+
PROTO_DIRS = $(sort $(dir $(wildcard $(PROTO_ROOT)/*/*/*.proto)))
1313
PROTO_SERVICES = $(wildcard $(PROTO_ROOT)/*/service.proto)
1414
PROTO_OUT := .gen
15-
PROTO_IMPORT := $(PROTO_ROOT):$(GOPATH)/src/github.com/gogo/protobuf/protobuf
15+
PROTO_IMPORT := $(PROTO_ROOT):$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
1616

1717
all: grpc
1818

@@ -31,7 +31,7 @@ go-grpc: clean $(PROTO_OUT)
3131

3232
gogo-grpc: clean $(PROTO_OUT)
3333
echo "Compiling for gogo-gRPC..."
34-
$(foreach PROTO_DIR,$(PROTO_DIRS),protoc --proto_path=$(PROTO_IMPORT) --gogofaster_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto;)
34+
$(foreach PROTO_DIR,$(PROTO_DIRS),protoc --proto_path=$(PROTO_IMPORT) --gogoslick_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto;)
3535

3636
# Plugins & tools
3737

@@ -40,12 +40,12 @@ grpc-install: gogo-protobuf-install
4040
go get -u google.golang.org/grpc
4141

4242
gogo-protobuf-install: go-protobuf-install
43-
go get -u github.com/gogo/protobuf/protoc-gen-gogofaster
43+
go get -u github.com/temporalio/gogo-protobuf/protoc-gen-gogoslick
4444

4545
go-protobuf-install:
4646
go get -u github.com/golang/protobuf/protoc-gen-go
4747

48-
# clean
48+
# Clean
4949

5050
clean:
5151
echo "Deleting generated go files..."
Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222

2323
syntax = "proto3";
2424

25-
package common;
25+
package common.v1;
2626

27-
option go_package = "go.temporal.io/temporal-proto/common";
28-
option java_package = "io.temporal.proto.common";
27+
option go_package = "go.temporal.io/temporal-proto/common/v1;common";
28+
option java_package = "io.temporal.proto.common.v1";
2929
option java_multiple_files = true;
30+
option java_outer_classname = "MessageProto";
3031

31-
import "common/enum.proto";
32+
import "enums/v1/common.proto";
3233

3334
message DataBlob {
34-
EncodingType encodingType = 1;
35+
enums.v1.EncodingType encoding_type = 1;
3536
bytes data = 2;
3637
}
3738

@@ -45,7 +46,7 @@ message Payload {
4546
}
4647

4748
message SearchAttributes {
48-
map<string, Payload> indexedFields = 1;
49+
map<string, Payload> indexed_fields = 1;
4950
}
5051

5152
message Memo {
@@ -57,8 +58,8 @@ message Header {
5758
}
5859

5960
message WorkflowExecution {
60-
string workflowId = 1;
61-
string runId = 2;
61+
string workflow_id = 1;
62+
string run_id = 2;
6263
}
6364

6465
message WorkflowType {
@@ -71,17 +72,17 @@ message ActivityType {
7172

7273
message RetryPolicy {
7374
// Interval of the first retry. If retryBackoffCoefficient is 1.0 then it is used for all retries.
74-
int32 initialIntervalInSeconds = 1;
75+
int32 initial_interval_in_seconds = 1;
7576
// Coefficient used to calculate the next retry interval.
7677
// The next retry interval is previous interval multiplied by the coefficient.
7778
// Must be 1 or larger.
78-
double backoffCoefficient = 2;
79+
double backoff_coefficient = 2;
7980
// Maximum interval between retries. Exponential backoff leads to interval increase.
8081
// This value is the cap of the increase. Default is 100x of the initial interval.
81-
int32 maximumIntervalInSeconds = 3;
82+
int32 maximum_interval_in_seconds = 3;
8283
// Maximum number of attempts. When exceeded the retries stop even if not expired yet.
8384
// 1 disables retries. 0 means unlimited (up to the timeouts)
84-
int32 maximumAttempts = 4;
85+
int32 maximum_attempts = 4;
8586
// Non-Retryable errors types. Will stop retrying if error type matches this list.
86-
repeated string nonRetryableErrorTypes = 5;
87+
repeated string non_retryable_error_types = 5;
8788
}

decision/message.proto

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

0 commit comments

Comments
 (0)