Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,18 @@ steps:
command:
- |-
make proto-lint

- label: "thrift compile"
agents:
queue: "buildkite-gcp"
plugins:
- kubernetes:
<<: *kubernetes
podSpec:
<<: *podSpec
containers:
- <<: *commandContainer
command:
- |-
apt-get update && apt-get install -y thrift-compiler
make thriftlint
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.DEFAULT_GOAL := all

.PHONY: thriftlint

# M1 macs may need to switch back to x86, until arm releases are available
EMULATE_X86 =
ifeq ($(shell uname -sm),Darwin arm64)
Expand Down Expand Up @@ -44,6 +46,8 @@ PROTO_DIRS = $(sort $(dir $(PROTO_FILES)))
proto-lint: $(PROTO_FILES) $(BIN)/$(BUF_VERSION_BIN)
@$(BIN)/$(BUF_VERSION_BIN) lint

THRIFT_FILES=$(shell find . -name "*.thrift")

# https://www.grpc.io/docs/languages/go/quickstart/
# protoc-gen-gogofast (yarpc) are versioned via tools.go + go.mod (built above) and will be rebuilt as needed.
# changing PROTOC_VERSION will automatically download and use the specified version
Expand Down Expand Up @@ -89,6 +93,14 @@ proto-go: $(PROTO_FILES) $(BIN)/$(PROTOC_VERSION_BIN) $(BIN)/protoc-gen-gogofast
@mv $(PROTO_GO_OUT)/uber/cadence/* $(PROTO_GO_OUT)
@rm -r $(PROTO_GO_OUT)/uber

thriftlint:
@for file in $(THRIFT_FILES); do \
if ! thrift --gen go "$$file"; then \
echo "FAILED: $$file"; \
exit 1; \
fi; \
done

all: proto-lint proto-go

# generally not necessary unless we change library versions, but this DOES impact codegen
Expand Down
4 changes: 2 additions & 2 deletions thrift/shared.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ struct UpdateDomainResponse {
struct FailoverDomainRequest {
10: optional string domainName
20: optional string domainActiveClusterName
// only applicable to active-active domains where
// only applicable to active-active domains where
// specific cluster-attributes are being failed over
30: optional ActiveClusters activeClusters
}
Expand Down Expand Up @@ -1262,7 +1262,7 @@ struct FailoverEvent {
// Can be passed with the ID to fetch a specific event.
20: optional i64 (js.type = "Long") createdTime
30: optional FailoverType failoverType
40: optional List<ClusterFailover> clusterFailovers
40: optional list<ClusterFailover> clusterFailovers
}

struct ClusterFailover {
Expand Down