storage: Simplify makefile to remove docker

Signed-off-by: Ben Walker <[email protected]>

Author: Ben Walker

.github/workflows/storage.yml

@@ -32,21 +32,29 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+    - name: Setup Go
+      uses: actions/setup-go@v2
 
-    # Workaround: https://github.com/docker/build-push-action/issues/461
-    - name: Setup Docker buildx
-      uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+
+    - name: Install protoc-gen-go
+      run: go install google.golang.org/protobuf/cmd/[email protected]
+
+    - name: Install google-api-linter
+      run: go install github.com/googleapis/api-linter/cmd/api-linter@latest
 
     - name: Build protobufs
-      run: make
+      run: cd storage && make python go cpp
       working-directory: storage
 
     - name: Check uncomitted auto generated protobufs
       run: git diff --exit-code
       working-directory: storage
 
+    - name: Run google-api-linter
+      run: cd storage && api-linter v1/*proto
+
     - name: Upload build artifact
       uses: actions/upload-artifact@v3
       with:

storage/Makefile

@@ -2,22 +2,36 @@
 # Copyright (C) 2022 Intel Corporation
 # Copyright (c) 2022 Dell Inc, or its subsidiaries.
 
-all:
-	rm -rf ./v1/{autogen.md,gen}
-	mkdir -p  ./v1/gen/{go,cpp,python}
+# Make a variable named ','. Used to pass arguments with commas to protoc_compile.
+, := ,
 
-	docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.47_2 -i /common --lint -d v1 -l go -o ./v1/gen/go/  --go-source-relative
-	docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.47_2 -i /common --lint -d v1 -l cpp -o ./v1/gen/cpp/  --go-source-relative
-	docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.47_2 -i /common --lint -d v1 -l python -o ./v1/gen/python/  --go-source-relative
+CURRENT_VERSION := v1
 
-	# protoc-gen-doc doesn't support proto include paths parameter so we have to copy
-	# common included files to the proto directory
-	cp ../common/v1/uuid.proto "${PWD}"/v1
-	cp ../common/v1/object_key.proto "${PWD}"/v1
+define protoc_compile
+	mkdir -p $(CURRENT_VERSION)/gen/$(1)
+	protoc --proto_path=../common/$(CURRENT_VERSION) --proto_path=$(CURRENT_VERSION) \
+		--$(1)_out=$(CURRENT_VERSION)/gen/$(1) \
+		$(2) \
+		$(CURRENT_VERSION)/*.proto
+endef
 
-	docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1/:/out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc --doc_opt=markdown,autogen.md
-	docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1/:/out -w /out --entrypoint=sh ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter /out/*.proto --output-format summary"
+all: python cpp go doc lint
 
-# remove common included files from the proto directory
-	rm "${PWD}"/v1/uuid.proto
-	rm "${PWD}"/v1/object_key.proto
+python:
+	$(call protoc_compile,python,)
+
+cpp:
+	$(call protoc_compile,cpp,)
+
+go:
+	$(call protoc_compile,go,)
+	mv $(CURRENT_VERSION)/gen/go/github.com/opiproject/opi-api/storage/v1/gen/go/* $(CURRENT_VERSION)/gen/go/
+
+doc:
+	$(call protoc_compile,doc,--doc_opt=markdown$(,)autogen.md)
+
+lint:
+	$(call protoc_compile,lint)
+
+clean:
+	rm -rf gen