Merge pull request #20 from rrati/grpc-respose-updates

Define Protocol message and use in ProvisionerCreateBucketRequest #21

Author: k8s-ci-robot

Diff for: .gitignore

@@ -5,6 +5,7 @@
 cosi.proto.tmp
 protoc
 protoc-gen-go
+protoc-gen-go-json
 cosi.a
 .protoc
 .idea

Diff for: Makefile

@@ -69,6 +69,25 @@ $(PROTOC_GEN_GO):
 	go build -o "$@" $(PROTOC_GEN_GO_PKG)
 
 
+########################################################################
+##                          PROTOC-GEN-GO-JSON                        ##
+########################################################################
+
+# This is the recipe for getting and installing the json plug-in
+# for protoc-gen-go
+PROTOC_GEN_GO_JSON_PKG := github.com/mitchellh/protoc-gen-go-json
+PROTOC_GEN_GO_JSON := protoc-gen-go-json
+$(PROTOC_GEN_GO_JSON): PROTOC_GEN_GO_JSON_VERSION := v1.0.0
+$(PROTOC_GEN_GO_JSON):
+	mkdir -p $(dir $(GOPATH)/src/$(PROTOC_GEN_GO_JSON_PKG))
+	test -d $(GOPATH)/src/$(PROTOC_GEN_GO_JSON_PKG)/.git || git clone https://$(PROTOC_GEN_GO_JSON_PKG) $(GOPATH)/src/$(PROTOC_GEN_GO_JSON_PKG)
+	(cd $(GOPATH)/src/$(PROTOC_GEN_GO_JSON_PKG) && \
+		(test "$$(git describe --tags | head -1)" = "$(PROTOC_GEN_GO_JSON_VERSION)" || \
+			(git fetch && git checkout tags/$(PROTOC_GEN_GO_JSON_VERSION))))
+	(cd $(GOPATH)/src/$(PROTOC_GEN_GO_JSON_PKG) && go get -v -d $$(go list -f '{{ .ImportPath }}' ./...)) && \
+	go build -o "$@" $(PROTOC_GEN_GO_JSON_PKG)
+
+
 ########################################################################
 ##                          GEN-PROTO-GO                              ##
 ########################################################################
@@ -123,12 +142,15 @@ export PATH := $(shell pwd):$(PATH)
 ##                              BUILD                                 ##
 ########################################################################
 COSI_PROTO := ./cosi.proto
-COSI_PKG_ROOT := github.com/kubernetes-sigs/container-object-storage-interface-spec
+COSI_SPEC := spec.md
+COSI_PKG_ROOT := sigs.k8s.io/container-object-storage-interface-spec
 COSI_PKG_SUB := .
 COSI_BUILD := $(COSI_PKG_SUB)/.build
 COSI_GO := $(COSI_PKG_SUB)/cosi.pb.go
+COSI_GO_JSON := $(COSI_PKG_SUB)/cosi.pb.json.go
 COSI_A := cosi.a
 COSI_GO_TMP := $(COSI_BUILD)/$(COSI_PKG_ROOT)/cosi.pb.go
+COSI_GO_JSON_TMP := $(COSI_BUILD)/$(COSI_PKG_ROOT)/cosi.pb.json.go
 
 # This recipe generates the go language bindings to a temp area.
 $(COSI_GO_TMP): HERE := $(shell pwd)
@@ -137,11 +159,13 @@ $(COSI_GO_TMP): GO_OUT := plugins=grpc
 $(COSI_GO_TMP): GO_OUT := $(GO_OUT),Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor
 $(COSI_GO_TMP): GO_OUT := $(GO_OUT),Mgoogle/protobuf/wrappers.proto=$(PTYPES_PKG)/wrappers
 $(COSI_GO_TMP): GO_OUT := $(GO_OUT):"$(HERE)/$(COSI_BUILD)"
+$(COSI_GO_TMP): GO_JSON_OUT := emit_defaults
+$(COSI_GO_TMP): GO_JSON_OUT := $(GO_JSON_OUT):"$(HERE)/$(COSI_BUILD)"
 $(COSI_GO_TMP): INCLUDE := -I$(GOPATH)/src -I$(HERE)/$(PROTOC_TMP_DIR)/include
-$(COSI_GO_TMP): $(COSI_PROTO) | $(PROTOC) $(PROTOC_GEN_GO)
+$(COSI_GO_TMP): $(COSI_PROTO) | $(PROTOC) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_JSON)
 	@mkdir -p "$(@D)"
 	(cd "$(GOPATH)/src" && \
-		$(HERE)/$(PROTOC) $(INCLUDE) --go_out=$(GO_OUT) "$(COSI_PKG_ROOT)/$(<F)")
+		$(HERE)/$(PROTOC) $(INCLUDE) --go_out=$(GO_OUT) --go-json_out=$(GO_JSON_OUT) "$(COSI_PKG_ROOT)/$(<F)")
 
 # The temp language bindings are compared to the ones that are
 # versioned. If they are different then it means the language
@@ -154,23 +178,38 @@ else
 	diff "$@" "$?" > /dev/null 2>&1 || cp -f "$?" "$@"
 endif
 
+# The temp language bindings are compared to the ones that are
+# versioned. If they are different then it means the language
+# bindings were not updated prior to being committed.
+$(COSI_GO_JSON): $(COSI_GO_JSON_TMP)
+ifeq (true,$(TRAVIS))
+	diff "$@" "$?"
+else
+	@mkdir -p "$(@D)"
+	diff "$@" "$?" > /dev/null 2>&1 || cp -f "$?" "$@"
+endif
+
 # This recipe builds the Go archive from the sources in three steps:
 #
 #   1. Go get any missing dependencies.
 #   2. Cache the packages.
 #   3. Build the archive file.
-$(COSI_A): $(COSI_GO) $(GENPROTO_BUILD_GO) $(GRPC_BUILD_GO)
+$(COSI_A): $(COSI_GO) $(COSI_GO_JSON) $(GENPROTO_BUILD_GO) $(GRPC_BUILD_GO)
 	go get -v -d ./...
 	go install ./$(COSI_PKG_SUB)
 	go build -o "$@" ./$(COSI_PKG_SUB)
 
-build: $(COSI_A)
+generate:
+	echo "// Code generated by make; DO NOT EDIT." > "$(COSI_PROTO)"
+	cat $(COSI_SPEC) | sed -n -e '/```protobuf$$/,/^```$$/ p' | sed '/^```/d' >> "$(COSI_PROTO)"
+
+build: generate $(COSI_A)
 
 clean:
 	go clean -i ./...
-	rm -rf "$(COSI_A)" "$(COSI_GO)" "$(COSI_BUILD)"
+	rm -rf "$(COSI_PROTO)" "$(COSI_A)" "$(COSI_GO)" "$(COSI_GO_JSON)" "$(COSI_BUILD)"
 
 clobber: clean
-	rm -fr "$(PROTOC)" "$(PROTOC_GEN_GO)" "$(COSI_PKG_SUB)"
+	rm -fr "$(PROTOC)" "$(PROTOC_TMP_DIR)" "$(PROTOC_GEN_GO)" "$(PROTOC_GEN_GO_JSON)"
 
 .PHONY: clean clobber $(GRPC_BUILD_GO) $(GENPROTO_BUILD_GO)