Linter framework

Signed-off-by: Luis Pabon <[email protected]>

Author: lpabon

.gitignore

@@ -4,3 +4,5 @@ test/app/bin
 client
 venv
 *.lint
+test/app/protos/website/content
+test/app/protos/website/web

Makefile

@@ -34,7 +34,6 @@ test: build
 	go test $(PKGS)
 
 testapp:
-	$(MAKE) -C test/app proto-lint
 	$(MAKE) -C test/app
 
 testapp-verify: testapp

server/server_test.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	grpcclient "github.com/libopenstorage/grpc-framework/pkg/grpc/client"
-	appapi "github.com/libopenstorage/grpc-framework/test/app/api"
 	appserver "github.com/libopenstorage/grpc-framework/test/app/pkg/server"
+	appapi "github.com/libopenstorage/grpc-framework/test/app/protos/apis/hello/apiv1"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/time/rate"
 	"google.golang.org/grpc"

test/app/Makefile

@@ -2,53 +2,23 @@
 PROTO_FILE = ./api/hello.proto
 TAG = dev
 
-all: proto server client
+all: protos server client
 
 ./bin:
 	mkdir ./bin
 
+.PHONY: server
 server: ./bin
 	go build -o ./bin/server cmd/server.go
 
+.PHONY: client
 client: ./bin
 	go build -o ./bin/client cmd/client/client.go
 
+.PHONY: clean
 clean:
 	rm -rf ./bin
 
-proto:
-	docker run \
-		--privileged --rm \
-		-v $(shell pwd):/go/src/code \
-		-e "GOPATH=/go" \
-		-e "DOCKER_PROTO=yes" \
-		-e "PROTO_USER=$(shell id -u)" \
-		-e "PROTO_GROUP=$(shell id -g)" \
-		-e "PATH=/bin:/usr/bin:/usr/local/bin:/go/bin:/usr/local/go/bin" \
-		quay.io/openstorage/grpc-framework:$(TAG)\
-			make docker-proto
-
-proto-lint:
-	docker run \
-		--privileged --rm \
-		-v $(shell pwd):/go/src/code \
-		-e "GOPATH=/go" \
-		-e "DOCKER_PROTO=yes" \
-		-e "PROTO_USER=$(shell id -u)" \
-		-e "PROTO_GROUP=$(shell id -g)" \
-		-e "PATH=/bin:/usr/bin:/usr/local/bin:/go/bin:/usr/local/go/bin" \
-		quay.io/openstorage/grpc-framework:$(TAG)\
-			grpcfw-lint \
-				-o $(PROTO_FILE).lint \
-				--disable-rule core::0191::proto-package \
-				--set-exit-status \
-				$(PROTO_FILE)
-
-docker-proto:
-ifndef DOCKER_PROTO
-	$(error Do not run directly. Run 'make proto' instead.)
-endif
-	grpcfw $(PROTO_FILE)
-	grpcfw-rest $(PROTO_FILE)
-	grpcfw-doc $(PROTO_FILE)
-
+.PHONY: protos
+protos:
+	$(MAKE) -C protos

test/app/cmd/client/client.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/libopenstorage/grpc-framework/pkg/auth"
 	"github.com/libopenstorage/grpc-framework/pkg/auth/role"
-	"github.com/libopenstorage/grpc-framework/test/app/api"
+	api "github.com/libopenstorage/grpc-framework/test/app/protos/apis/hello/apiv1"
 	"github.com/sirupsen/logrus"
 )
 

test/app/cmd/server.go

@@ -24,8 +24,8 @@ import (
 	"github.com/libopenstorage/grpc-framework/pkg/auth"
 	"github.com/libopenstorage/grpc-framework/pkg/util"
 	"github.com/libopenstorage/grpc-framework/server"
-	"github.com/libopenstorage/grpc-framework/test/app/api"
 	helloserver "github.com/libopenstorage/grpc-framework/test/app/pkg/server"
+	api "github.com/libopenstorage/grpc-framework/test/app/protos/apis/hello/apiv1"
 
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"

test/app/pkg/server/hello.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/libopenstorage/grpc-framework/test/app/api"
+	api "github.com/libopenstorage/grpc-framework/test/app/protos/apis/hello/apiv1"
 	"github.com/sirupsen/logrus"
 )
 

test/app/protos/Makefile

@@ -0,0 +1,78 @@
+export TOP=$(shell pwd)
+
+ifndef L
+L=go
+endif
+
+ifndef LINT_OUTPUT
+LINT_OUTPUT=false
+endif
+DOCKERCMD=docker run \
+		--privileged --rm \
+		-v $(shell pwd):/go/src/code \
+		-e "LINT_OUTPUT=$(LINT_OUTPUT)" \
+		-e "GOPATH=/go" \
+		-e "L=$(L)" \
+		-e "DOCKER_PROTO=yes" \
+		-e "PROTO_USER=$(shell id -u)" \
+		-e "PROTO_GROUP=$(shell id -g)" \
+		-e "PATH=/bin:/usr/bin:/usr/local/bin:/go/bin:/usr/local/go/bin" \
+		$(GRPC_FRAMEWORK_CONTAINER)
+
+SUBDIRS=apis
+
+all: build docs
+
+python:
+	$(DOCKERCMD) make -C sdk/python setup
+	$(MAKE) L=python build
+	$(DOCKERCMD) make -C sdk/python sdk
+
+.PHONY: publish
+publish: build docs python
+	$(DOCKERCMD) make -C publish
+
+docker-shell:
+	docker run \
+		-ti \
+		--privileged --rm \
+		-v $(shell pwd):/go/src/code \
+		-e "LINT_OUTPUT=$(LINT_OUTPUT)" \
+		-e "GOPATH=/go" \
+		-e "L=$(L)" \
+		-e "DOCKER_PROTO=yes" \
+		-e "PROTO_USER=$(shell id -u)" \
+		-e "PROTO_GROUP=$(shell id -g)" \
+		-e "PATH=/bin:/usr/bin:/usr/local/bin:/go/bin:/usr/local/go/bin" \
+		$(GRPC_FRAMEWORK_CONTAINER) /bin/bash
+
+ifndef DOCKER_PROTO
+build:
+	$(DOCKERCMD) make build
+else
+.PHONY: build
+build: lint $(SUBDIRS)
+endif
+
+.PHONY: lint
+lint:
+	@SCRIPTSDIR=$(TOP)/lint/repo-scripts $(TOP)/lint/run.sh
+
+include $(TOP)/make/common.mk
+
+.PHONY: docs
+ifndef DOCKER_PROTO
+docs:
+	$(DOCKERCMD) make docs
+else
+docs:
+	$(MAKE) -C website
+endif
+
+.PHONY: serve
+serve:
+	cd docs ; python3 -m http.server
+
+.PHONY: clean
+clean:
+	$(MAKE) -C website clean

test/app/protos/apis/Makefile

@@ -0,0 +1,6 @@
+SUBDIRS= hello \
+		 example
+
+all: $(SUBDIRS)
+
+include $(TOP)/make/common.mk

test/app/protos/apis/example/Makefile

@@ -0,0 +1,5 @@
+SUBDIRS= apiv1
+
+all: $(SUBDIRS)
+
+include $(TOP)/make/common.mk