NOISSUE - Move gRPC to api package (#2593)

Signed-off-by: Sammy Oina <[email protected]>
absmach · Dec 20, 2024 · e95d1bf · e95d1bf
1 parent f0d014e
commit e95d1bf
Show file tree

Hide file tree

Showing 97 changed files with 316 additions and 346 deletions.
diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -78,7 +78,7 @@ jobs:
         if: steps.changes.outputs.proto == 'true'
         run: |
           PROTOC_VERSION=29.0
-          PROTOC_GEN_VERSION=v1.35.2
+          PROTOC_GEN_VERSION=v1.36.0
           PROTOC_GRPC_VERSION=v1.5.1
 
           # Export the variables so they are available in future steps

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config restart
 DEFAULT_DOCKER_COMPOSE_COMMAND  := up
 GRPC_MTLS_CERT_FILES_EXISTS = 0
 MOCKERY_VERSION=v2.43.2
-INTERNAL_PROTO_GEN_OUT_DIR=internal/grpc
+PKG_PROTO_GEN_OUT_DIR=api/grpc
 INTERNAL_PROTO_DIR=internal/proto
 INTERNAL_PROTO_FILES := $(shell find $(INTERNAL_PROTO_DIR) -name "*.proto" | sed 's|$(INTERNAL_PROTO_DIR)/||')
 
@@ -186,8 +186,8 @@ $(TEST_API):
 
 proto:
 	protoc -I. --go_out=. --go_opt=paths=source_relative pkg/messaging/*.proto
-	mkdir -p $(INTERNAL_PROTO_GEN_OUT_DIR)
-	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)
+	mkdir -p $(PKG_PROTO_GEN_OUT_DIR)
+	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)
 
 $(FILTERED_SERVICES):
 	$(call compile_service,$(@))

diff --git a/internal/grpc/auth/v1/auth.pb.go → api/grpc/auth/v1/auth.pb.go b/internal/grpc/auth/v1/auth.pb.go → api/grpc/auth/v1/auth.pb.go
diff --git a/internal/grpc/auth/v1/auth_grpc.pb.go → api/grpc/auth/v1/auth_grpc.pb.go b/internal/grpc/auth/v1/auth_grpc.pb.go → api/grpc/auth/v1/auth_grpc.pb.go
diff --git a/internal/grpc/channels/v1/channels.pb.go → api/grpc/channels/v1/channels.pb.go b/internal/grpc/channels/v1/channels.pb.go → api/grpc/channels/v1/channels.pb.go
diff --git a/...rnal/grpc/channels/v1/channels_grpc.pb.go → api/grpc/channels/v1/channels_grpc.pb.go b/...rnal/grpc/channels/v1/channels_grpc.pb.go → api/grpc/channels/v1/channels_grpc.pb.go