v1 API (#3)

* ⬆️ v1 API Signed-off-by: Rintaro Okamura <[email protected]> * 📝 add README Signed-off-by: Rintaro Okamura <[email protected]> * 🔥 remove sed command for gql replace Signed-off-by: Rintaro Okamura <[email protected]> * ✨ add v1/vald/vald.go from vdaas/vald/ repository Signed-off-by: Rintaro Okamura <[email protected]> * ⬆️ remove v0 apis Signed-off-by: Rintaro Okamura <[email protected]> * 💚 add FOSSA scan Signed-off-by: Rintaro Okamura <[email protected]>
vdaas · Jan 13, 2021 · 8b62ffa · 8b62ffa
1 parent 2636965
commit 8b62ffa
Show file tree

Hide file tree

Showing 16 changed files with 12,350 additions and 5,173 deletions.
diff --git a/.fossa.yml b/.fossa.yml
@@ -0,0 +1,27 @@
+# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
+# Visit https://fossa.com to learn more
+
+version: 2
+cli:
+  server: https://app.fossa.com
+  fetcher: custom
+  project: vald-client-go
+  locator: git+github.com/vdaas/vald-client-go
+analyze:
+  modules:
+  - name: github.com/vdaas/vald-client-go/v1/agent/core
+    type: go
+    target: github.com/vdaas/vald-client-go/v1/agent/core
+    path: v1/agent/core
+  - name: github.com/vdaas/vald-client-go/v1/gateway/vald
+    type: go
+    target: github.com/vdaas/vald-client-go/v1/gateway/vald
+    path: v1/gateway/vald
+  - name: github.com/vdaas/vald-client-go/v1/payload
+    type: go
+    target: github.com/vdaas/vald-client-go/v1/payload
+    path: v1/payload
+  - name: github.com/vdaas/vald-client-go/v1/vald
+    type: go
+    target: github.com/vdaas/vald-client-go/v1/vald
+    path: v1/vald
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,61 @@
+name: "Run FOSSA scan"
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - "labeled"
+
+jobs:
+  fossa-scan:
+    name: 'trigger FOSSA scan'
+    runs-on: ubuntu-latest
+    container:
+      image: vdaas/vald-ci-container:nightly
+    if: github.ref == 'refs/heads/master' || github.event.action == 'labeled' && github.event.label.name == 'actions/fossa'
+    steps:
+      - uses: actions/checkout@v2
+      - name: 'Install fossa-cli'
+        run: |
+          curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
+      - name: 'Run for master branch'
+        if: github.ref == 'refs/heads/master'
+        run: |
+          fossa analyze --branch master --revision ${GITHUB_SHA}
+        env:
+          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_SHA: ${{ github.sha }}
+      - name: 'Run for PRs'
+        if: github.event_name == 'pull_request'
+        run: |
+          curl -s ${PR_INFO_URL} > /tmp/pr_info.json
+          PR_RESP=`cat /tmp/pr_info.json`
+          HEAD_BRANCH=$(cat /tmp/pr_info.json | jq -r .head.ref)
+          if [ -z "$HEAD_BRANCH" ]; then
+            echo "Cannot get head branch information for PR #${PR_NUM}!"
+            echo "API response: $PR_RESP"
+            fossa analyze --revision ${GITHUB_SHA}
+          else
+            echo "Head branch for PR #${PR_NUM} is ${HEAD_BRANCH}"
+
+            fossa analyze --branch ${HEAD_BRANCH} --revision ${GITHUB_SHA}
+
+            ESCAPED=`echo -n "${HEAD_BRANCH}" | python3 -c 'import urllib.parse; import sys; print(urllib.parse.quote(sys.stdin.read(), safe=""))'`
+
+            curl --include --verbose --fail \
+            -H "Accept: application/json" \
+            -H "Content-Type:application/json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            --request POST \
+            --data "{\"body\": \"**[FOSSA]** The scan result will be available at https://app.fossa.com/projects/custom%2B21465%2Fvald-client-go/refs/branch/${ESCAPED}/${GITHUB_SHA}\"}" \
+            $API_URL
+          fi
+        env:
+          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_SHA: ${{ github.sha }}
+          PR_INFO_URL: ${{ github.event.pull_request.url }}
+          API_URL: ${{ github.event.pull_request.comments_url }}
+          PR_NUM: ${{ github.event.pull_request.number }}
diff --git a/Makefile b/Makefile
@@ -25,21 +25,34 @@ VALD_SHA     = VALD_SHA
 VALD_VERSION = VALD_VERSION
 VALD_DIR     = vald-origin
 
+PWD    := $(eval PWD := $(shell pwd))$(PWD)
+GOPATH := $(eval GOPATH := $(shell go env GOPATH))$(GOPATH)
+
 PROTO_ROOT  = $(VALD_DIR)/apis/proto
 PBGO_TMP    = tmp
 
-PROTOS      = gateway/vald/vald.proto agent/core/agent.proto payload/payload.proto
+PROTOS = \
+	v1/agent/core/agent.proto \
+	v1/gateway/vald/vald.proto \
+	v1/vald/filter.proto \
+	v1/vald/insert.proto \
+	v1/vald/object.proto \
+	v1/vald/remove.proto \
+	v1/vald/search.proto \
+	v1/vald/update.proto \
+	v1/vald/upsert.proto \
+	v1/payload/payload.proto
+
 PROTOS     := $(PROTOS:%=$(PROTO_ROOT)/%)
 PBGOS       = $(PROTOS:$(PROTO_ROOT)/%.proto=%.pb.go)
 
 PROTODIRS  := $(shell find $(PROTO_ROOT) -type d | sed -e "s%$(PROTO_ROOT)/%%g" | grep -v "$(PROTO_ROOT)")
 
 PROTO_PATHS = \
-	$(PROTODIRS:%=$(PROTO_ROOT)/%) \
-	$(GOPATH)/src/github.com/protocolbuffers/protobuf/src \
-	$(GOPATH)/src/github.com/gogo/protobuf/protobuf \
-	$(GOPATH)/src/github.com/googleapis/googleapis \
-	$(GOPATH)/src/github.com/envoyproxy/protoc-gen-validate
+	$(PWD) \
+	$(PWD)/$(VALD_DIR) \
+	$(GOPATH)/src \
+	$(GOPATH)/src/github.com/googleapis/googleapis
 
 MAKELISTS   = Makefile
 
@@ -91,16 +104,20 @@ clean:
 
 .PHONY: proto
 ## build proto
-proto: $(PBGOS)
+proto: \
+	$(PBGOS) \
+	v1/vald/vald.go
 
 $(PROTODIRS):
 	$(call mkdir, $@)
 	$(call rm, -rf, $@/*)
 
+v1/vald/vald.go: $(VALD_DIR)
+	cp $(VALD_DIR)/apis/grpc/$@ $@
+
 $(PBGOS): $(VALD_DIR) proto/deps $(PROTODIRS)
 	@$(call green, "generating .pb.go files...")
 	$(call mkdir, $(PBGO_TMP))
-	sed -i -e '/^.*gql\.proto.*$$\|^.*gql\..*_type.*$$/d' $(patsubst %.pb.go,$(PROTO_ROOT)/%.proto,$@)
 	protoc \
 		$(PROTO_PATHS:%=-I %) \
 		--gogofast_out=plugins=grpc:$(PBGO_TMP) \
@@ -132,8 +149,6 @@ vald/version/print:
 ## update go.mod
 mod:
 	go mod tidy
-	go mod vendor
-	rm -rf vendor
 
 .PHONY: proto/deps
 ## install proto deps
@@ -152,7 +167,8 @@ proto/deps: \
 	$(GOPATH)/bin/swagger \
 	$(GOPATH)/src/google.golang.org/genproto \
 	$(GOPATH)/src/github.com/protocolbuffers/protobuf \
-	$(GOPATH)/src/github.com/googleapis/googleapis
+	$(GOPATH)/src/github.com/googleapis/googleapis \
+	$(GOPATH)/src/github.com/envoyproxy/protoc-gen-validate
 
 $(GOPATH)/src/github.com/protocolbuffers/protobuf:
 	git clone \
@@ -166,6 +182,12 @@ $(GOPATH)/src/github.com/googleapis/googleapis:
 		https://github.com/googleapis/googleapis \
 		$(GOPATH)/src/github.com/googleapis/googleapis
 
+$(GOPATH)/src/github.com/envoyproxy/protoc-gen-validate:
+	git clone \
+		--depth 1 \
+		https://github.com/envoyproxy/protoc-gen-validate \
+		$(GOPATH)/src/github.com/envoyproxy/protoc-gen-validate
+
 $(GOPATH)/src/google.golang.org/genproto:
 	$(call go-get, google.golang.org/genproto/...)
 

diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+# vald-client-go
+
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B21465%2Fvald-client-go.svg?type=large)](https://app.fossa.com/projects/custom%2B21465%2Fvald-client-go?ref=badge_large)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# vald-client-go

		[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B21465%2Fvald-client-go.svg?type=large)](https://app.fossa.com/projects/custom%2B21465%2Fvald-client-go?ref=badge_large)