storage: Simplify makefile to remove docker

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

Author: Ben Walker

.github/workflows/storage.yml

@@ -32,12 +32,20 @@ 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/protoc-gen-go@latest
+
+    - name: Install protoc-gen-doc
+      run: go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest
+
+    - name: Install google-api-linter
+      run: go install github.com/googleapis/api-linter/cmd/api-linter@latest
 
     - name: Build protobufs
       run: make

storage/Makefile

@@ -2,18 +2,41 @@
 # Copyright (C) 2022 Intel Corporation
 # Copyright (c) 2022 Dell Inc, or its subsidiaries.
 
-all:
-	rm -rf ./v1alpha1/{autogen.md,gen,google}
-	mkdir -p  ./v1alpha1/gen/{go,cpp,python,java}
+# 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 v1alpha1 -l go -o ./v1alpha1/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 v1alpha1 -l cpp -o ./v1alpha1/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 v1alpha1 -l python -o ./v1alpha1/gen/python/  --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 v1alpha1 -l java -o ./v1alpha1/gen/java/  --go-source-relative
+CURRENT_VERSION := v1alpha1
+COMMON_VERSION := v1
 
-	# protoc doesn't include annotation and http googleapis, so we have to get them here
+define protoc_compile
+	mkdir -p $(CURRENT_VERSION)/gen/$(1)
+	protoc --proto_path=../common/$(COMMON_VERSION) --proto_path=$(CURRENT_VERSION) \
+		--$(1)_out=$(CURRENT_VERSION)/gen/$(1) \
+		$(2) \
+		$(CURRENT_VERSION)/*.proto
+endef
+
+all: python cpp go doc lint
+
+$(CURRENT_VERSION)/google:
 	curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api
-	mv google "${PWD}"/v1alpha1/
-	docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/*.proto --output-format summary"
-	docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto"
-	rm -rf "${PWD}"/v1alpha1/google
+	mv google "$(CURRENT_VERSION)/"
+
+python: $(CURRENT_VERSION)/google
+	$(call protoc_compile,python,)
+
+cpp: $(CURRENT_VERSION)/google
+	$(call protoc_compile,cpp,)
+
+go: $(CURRENT_VERSION)/google
+	$(call protoc_compile,go,)
+	mv $(CURRENT_VERSION)/gen/go/github.com/opiproject/opi-api/storage/$(CURRENT_VERSION)/gen/go/* $(CURRENT_VERSION)/gen/go/
+
+doc: $(CURRENT_VERSION)/google
+	$(call protoc_compile,doc,--doc_opt=markdown$(,)autogen.md)
+
+lint: $(CURRENT_VERSION)/google
+	api-linter -I$(CURRENT_VERSION)/ -I../common/$(COMMON_VERSION) $(CURRENT_VERSION)/*proto
+
+clean:
+	rm -rf $(CURRENT_VERSION)/google

storage/v1/.gitignore

@@ -0,0 +1 @@
+google

storage/v1alpha1/.gitignore

@@ -10,7 +10,8 @@ option java_multiple_files = true;
 option java_outer_classname = "FrontendNvmePcieProto";
 
 option go_package = "github.com/opiproject/opi-api/storage/v1alpha1/gen/go";
-import "common.proto";
+
+import "common/common.proto";
 import "object_key.proto";
 import "uuid.proto";
 import "google/protobuf/empty.proto";

storage/v1alpha1/common.proto renamed to storage/v1alpha1/common/common.proto

@@ -9,7 +9,8 @@ option java_multiple_files = true;
 option java_outer_classname = "FrontendVirtioBlkProto";
 
 option go_package = "github.com/opiproject/opi-api/storage/v1alpha1/gen/go";
-import "common.proto";
+
+import "common/common.proto";
 import "google/protobuf/empty.proto";
 import "google/api/annotations.proto";
 

storage/v1alpha1/frontend_nvme_pcie.proto

@@ -9,7 +9,8 @@ option java_multiple_files = true;
 option java_outer_classname = "FrontendVirtioScsiProto";
 
 option go_package = "github.com/opiproject/opi-api/storage/v1alpha1/gen/go";
-import "common.proto";
+
+import "common/common.proto";
 import "google/protobuf/empty.proto";
 import "google/api/annotations.proto";