Merge branch 'main' into main

.gitignore

@@ -40,16 +40,13 @@ src/frontend/cypress/screenshots
 src/shippingservice/target/
 
 # Ignore copied/generated protobuf files
-/src/accountingservice/genproto/
 /src/cartservice/src/protos/
-/src/checkoutservice/genproto/
 /src/featureflagservice/proto/
 /src/featureflagservice/src/ffs_demo_pb.erl
 /src/featureflagservice/src/ffs_service_*.erl
 /src/featureflagservice/src/oteldemo_*.erl
 /src/frontend/pb/
 /src/frontend/protos/
 /src/paymentservice/demo.proto
-/src/productcatalogservice/genproto/
 /src/recommendationservice/demo_pb2*.py
 /src/shippingservice/proto/

.licenserc.json

@@ -34,10 +34,13 @@
     ],
     "ignore": [
         "node_modules/",
+        "src/accountingservice/genproto/",
         "src/cartservice/src/obj/",
         "src/cartservice/tests/obj/",
+        "src/checkoutservice/genproto/",
         "src/featureflagservice/assets/vendor/",
         "src/featureflagservice/priv/",
+        "src/productcatalogservice/genproto/",
         "internal/tools/"
     ]
   }

src/accountingservice/Dockerfile

@@ -3,19 +3,10 @@
 
 
 FROM golang:1.19.2-alpine AS builder
-RUN apk add build-base protobuf-dev protoc
 WORKDIR /usr/src/app/
 
-# Restore dependencies
 COPY ./src/accountingservice/ ./
-COPY ./pb/ ./proto/
-RUN go mod download
-RUN go install google.golang.org/protobuf/cmd/[email protected]
-RUN go install google.golang.org/grpc/cmd/[email protected]
-
-# Build executable
-RUN protoc -I ./proto/ ./proto/demo.proto --go_out=./ --go-grpc_out=./
-RUN go build -o /go/bin/accountingservice/ ./
+RUN go build -o /go/bin/accountingservice/
 
 # -----------------------------------------------------------------------------
 

src/accountingservice/README.md

@@ -4,11 +4,10 @@ This service consumes new orders from a Kafka topic.
 
 ## Local Build
 
-To build the protos and the service binary, run:
+To build the service binary, run:
 
 ```sh
-protoc -I ../../pb/ ../../pb/demo.proto --go_out=./ --go-grpc_out=./
-go build -o /go/bin/accountingservice/ ./
+go build -o /go/bin/accountingservice/
 ```
 
 ## Docker Build
@@ -18,3 +17,23 @@ From the root directory, run:
 ```sh
 docker compose build accountingservice
 ```
+
+## Regenerate protos
+
+> **Note**
+> [`protoc`](https://grpc.io/docs/protoc-installation/) is required.
+
+To regenerate gRPC code run:
+
+```sh
+go generate
+```
+
+## Bump dependencies
+
+To bump all dependencies run:
+
+```sh
+go get -u -t ./...
+go mod tidy
+```