Skip to content

Commit e95d1bf

Browse files
authoredDec 20, 2024··
NOISSUE - Move gRPC to api package (#2593)
Signed-off-by: Sammy Oina <sammyoina@gmail.com>
1 parent f0d014e commit e95d1bf

File tree

97 files changed

+316
-346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+316
-346
lines changed
 

‎.github/workflows/check-generated-files.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
if: steps.changes.outputs.proto == 'true'
7979
run: |
8080
PROTOC_VERSION=29.0
81-
PROTOC_GEN_VERSION=v1.35.2
81+
PROTOC_GEN_VERSION=v1.36.0
8282
PROTOC_GRPC_VERSION=v1.5.1
8383
8484
# Export the variables so they are available in future steps

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config restart
2323
DEFAULT_DOCKER_COMPOSE_COMMAND := up
2424
GRPC_MTLS_CERT_FILES_EXISTS = 0
2525
MOCKERY_VERSION=v2.43.2
26-
INTERNAL_PROTO_GEN_OUT_DIR=internal/grpc
26+
PKG_PROTO_GEN_OUT_DIR=api/grpc
2727
INTERNAL_PROTO_DIR=internal/proto
2828
INTERNAL_PROTO_FILES := $(shell find $(INTERNAL_PROTO_DIR) -name "*.proto" | sed 's|$(INTERNAL_PROTO_DIR)/||')
2929

@@ -186,8 +186,8 @@ $(TEST_API):
186186

187187
proto:
188188
protoc -I. --go_out=. --go_opt=paths=source_relative pkg/messaging/*.proto
189-
mkdir -p $(INTERNAL_PROTO_GEN_OUT_DIR)
190-
protoc -I $(INTERNAL_PROTO_DIR) --go_out=$(INTERNAL_PROTO_GEN_OUT_DIR) --go_opt=paths=source_relative --go-grpc_out=$(INTERNAL_PROTO_GEN_OUT_DIR) --go-grpc_opt=paths=source_relative $(INTERNAL_PROTO_FILES)
189+
mkdir -p $(PKG_PROTO_GEN_OUT_DIR)
190+
protoc -I $(INTERNAL_PROTO_DIR) --go_out=$(PKG_PROTO_GEN_OUT_DIR) --go_opt=paths=source_relative --go-grpc_out=$(PKG_PROTO_GEN_OUT_DIR) --go-grpc_opt=paths=source_relative $(INTERNAL_PROTO_FILES)
191191

192192
$(FILTERED_SERVICES):
193193
$(call compile_service,$(@))

0 commit comments

Comments
 (0)
Please sign in to comment.