From 8efcbb379a9e3fa7aa0e5674bc03d67068c0ea9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?= Date: Thu, 13 Jan 2022 11:50:37 +0100 Subject: [PATCH] Cleanup leftovers --- .make/protobuf.mk | 16 ---------------- accounts/Makefile | 9 --------- accounts/buf.gen.yaml | 29 ----------------------------- accounts/buf.lock | 17 ----------------- accounts/buf.yaml | 10 ---------- settings/Makefile | 9 --------- settings/buf.gen.yaml | 29 ----------------------------- settings/buf.lock | 17 ----------------- settings/buf.yaml | 10 ---------- store/Makefile | 9 --------- store/buf.gen.yaml | 30 ------------------------------ store/buf.lock | 17 ----------------- store/buf.yaml | 10 ---------- thumbnails/Makefile | 9 --------- thumbnails/buf.gen.yaml | 30 ------------------------------ thumbnails/buf.lock | 17 ----------------- thumbnails/buf.yaml | 10 ---------- 17 files changed, 278 deletions(-) delete mode 100644 .make/protobuf.mk delete mode 100644 accounts/buf.gen.yaml delete mode 100644 accounts/buf.lock delete mode 100644 accounts/buf.yaml delete mode 100644 settings/buf.gen.yaml delete mode 100644 settings/buf.lock delete mode 100644 settings/buf.yaml delete mode 100644 store/buf.gen.yaml delete mode 100644 store/buf.lock delete mode 100644 store/buf.yaml delete mode 100644 thumbnails/buf.gen.yaml delete mode 100644 thumbnails/buf.lock delete mode 100644 thumbnails/buf.yaml diff --git a/.make/protobuf.mk b/.make/protobuf.mk deleted file mode 100644 index 21e74cbe4..000000000 --- a/.make/protobuf.mk +++ /dev/null @@ -1,16 +0,0 @@ -# bingo creates symlinks from the -l option in GOBIN, from where -# we can easily use it with buf. To have the symlinks inside this -# repo and on a known location, we set GOBIN to .bingo in the root -# of the repository (therefore we need to cd ..) -.PHONY: protoc-deps -protoc-deps: $(BINGO) - @cd .. && GOPATH="" GOBIN=".bingo" $(BINGO) get -l google.golang.org/protobuf/cmd/protoc-gen-go - @cd .. && GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/asim/go-micro/cmd/protoc-gen-micro/v4 - @cd .. && GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/owncloud/protoc-gen-microweb - @cd .. && GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 - @cd .. && GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc - -.PHONY: buf-generate -buf-generate: $(BUF) protoc-deps - $(BUF) generate - diff --git a/accounts/Makefile b/accounts/Makefile index 975ab4de2..9b0678468 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -47,12 +47,3 @@ yarn-build: node_modules .PHONY: node_modules node_modules: yarn install --immutable - -############ protobuf ############ -PROTO_VERSION := v0 -PROTO_SRC := pkg/proto/$(PROTO_VERSION) - -include ../.make/protobuf.mk - -.PHONY: protobuf -protobuf: buf-generate diff --git a/accounts/buf.gen.yaml b/accounts/buf.gen.yaml deleted file mode 100644 index 35a2098be..000000000 --- a/accounts/buf.gen.yaml +++ /dev/null @@ -1,29 +0,0 @@ -version: v1 -plugins: - - name: go - path: ../.bingo/protoc-gen-go - out: pkg/ - opt: - - paths=source_relative - - - name: micro - path: ../.bingo/protoc-gen-micro - out: pkg/ - opt: - - paths=source_relative - - - name: microweb - path: ../.bingo/protoc-gen-microweb - out: pkg/ - opt: - - paths=source_relative - - - name: openapiv2 - path: ../.bingo/protoc-gen-openapiv2 - out: pkg/ - - - name: doc - path: ../.bingo/protoc-gen-doc - out: ../docs/extensions/accounts - opt: - - ./templates/GRPC.tmpl,grpc.md diff --git a/accounts/buf.lock b/accounts/buf.lock deleted file mode 100644 index 65d843368..000000000 --- a/accounts/buf.lock +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by buf. DO NOT EDIT. -version: v1 -deps: - - remote: buf.build - owner: googleapis - repository: googleapis - branch: main - commit: ca45b9d9c51849e898845743a28b0eb0 - digest: b1--B2JdvzLV2KI5pYMG9AHJHFGznqXfZKjKwcqBuXhGgw= - create_time: 2021-10-14T15:09:30.598677Z - - remote: buf.build - owner: grpc-ecosystem - repository: grpc-gateway - branch: main - commit: 462ede5f3dee45569df6317bda220b1b - digest: b1-4FNKWjnS2yafyeOdqW8u-s7w1pJBHjz0Z6CbOL-Ipk0= - create_time: 2021-10-14T01:55:03.476639Z diff --git a/accounts/buf.yaml b/accounts/buf.yaml deleted file mode 100644 index 8d96e03b5..000000000 --- a/accounts/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1 -lint: - use: - - DEFAULT -deps: - - buf.build/googleapis/googleapis - - buf.build/grpc-ecosystem/grpc-gateway -breaking: - use: - - FILE diff --git a/settings/Makefile b/settings/Makefile index 349b780ac..c838ab93a 100644 --- a/settings/Makefile +++ b/settings/Makefile @@ -48,12 +48,3 @@ yarn-build: node_modules .PHONY: node_modules node_modules: yarn install --immutable - -############ protobuf ############ -PROTO_VERSION := v0 -PROTO_SRC := pkg/proto/$(PROTO_VERSION) - -include ../.make/protobuf.mk - -.PHONY: protobuf -protobuf: buf-generate diff --git a/settings/buf.gen.yaml b/settings/buf.gen.yaml deleted file mode 100644 index 41f10995c..000000000 --- a/settings/buf.gen.yaml +++ /dev/null @@ -1,29 +0,0 @@ -version: v1 -plugins: - - name: go - path: ../.bingo/protoc-gen-go - out: pkg/ - opt: - - paths=source_relative - - - name: micro - path: ../.bingo/protoc-gen-micro - out: pkg/ - opt: - - paths=source_relative - - - name: microweb - path: ../.bingo/protoc-gen-microweb - out: pkg/ - opt: - - paths=source_relative - - - name: openapiv2 - path: ../.bingo/protoc-gen-openapiv2 - out: pkg/ - - - name: doc - path: ../.bingo/protoc-gen-doc - out: ../docs/extensions/settings - opt: - - ./templates/GRPC.tmpl,grpc.md diff --git a/settings/buf.lock b/settings/buf.lock deleted file mode 100644 index 65d843368..000000000 --- a/settings/buf.lock +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by buf. DO NOT EDIT. -version: v1 -deps: - - remote: buf.build - owner: googleapis - repository: googleapis - branch: main - commit: ca45b9d9c51849e898845743a28b0eb0 - digest: b1--B2JdvzLV2KI5pYMG9AHJHFGznqXfZKjKwcqBuXhGgw= - create_time: 2021-10-14T15:09:30.598677Z - - remote: buf.build - owner: grpc-ecosystem - repository: grpc-gateway - branch: main - commit: 462ede5f3dee45569df6317bda220b1b - digest: b1-4FNKWjnS2yafyeOdqW8u-s7w1pJBHjz0Z6CbOL-Ipk0= - create_time: 2021-10-14T01:55:03.476639Z diff --git a/settings/buf.yaml b/settings/buf.yaml deleted file mode 100644 index 8d96e03b5..000000000 --- a/settings/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1 -lint: - use: - - DEFAULT -deps: - - buf.build/googleapis/googleapis - - buf.build/grpc-ecosystem/grpc-gateway -breaking: - use: - - FILE diff --git a/store/Makefile b/store/Makefile index c227d2f81..8fbe07b30 100644 --- a/store/Makefile +++ b/store/Makefile @@ -30,12 +30,3 @@ ci-go-generate: protobuf # CI runs ci-node-generate automatically before this ta .PHONY: ci-node-generate ci-node-generate: - -############ protobuf ############ -PROTO_VERSION := v0 -PROTO_SRC := pkg/proto/$(PROTO_VERSION) - -include ../.make/protobuf.mk - -.PHONY: protobuf -protobuf: buf-generate diff --git a/store/buf.gen.yaml b/store/buf.gen.yaml deleted file mode 100644 index a836d201c..000000000 --- a/store/buf.gen.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: v1 -plugins: - - name: go - path: ../.bingo/protoc-gen-go - out: pkg/ - opt: - - paths=source_relative - - - name: micro - path: ../.bingo/protoc-gen-micro - out: pkg/ - opt: - - paths=source_relative - - # not needed for store - #- name: microweb - # path: ../.bingo/protoc-gen-microweb - # out: pkg/ - # opt: - # - paths=source_relative - - - name: openapiv2 - path: ../.bingo/protoc-gen-openapiv2 - out: pkg/ - - - name: doc - path: ../.bingo/protoc-gen-doc - out: ../docs/extensions/store - opt: - - ./templates/GRPC.tmpl,grpc.md diff --git a/store/buf.lock b/store/buf.lock deleted file mode 100644 index 65d843368..000000000 --- a/store/buf.lock +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by buf. DO NOT EDIT. -version: v1 -deps: - - remote: buf.build - owner: googleapis - repository: googleapis - branch: main - commit: ca45b9d9c51849e898845743a28b0eb0 - digest: b1--B2JdvzLV2KI5pYMG9AHJHFGznqXfZKjKwcqBuXhGgw= - create_time: 2021-10-14T15:09:30.598677Z - - remote: buf.build - owner: grpc-ecosystem - repository: grpc-gateway - branch: main - commit: 462ede5f3dee45569df6317bda220b1b - digest: b1-4FNKWjnS2yafyeOdqW8u-s7w1pJBHjz0Z6CbOL-Ipk0= - create_time: 2021-10-14T01:55:03.476639Z diff --git a/store/buf.yaml b/store/buf.yaml deleted file mode 100644 index 8d96e03b5..000000000 --- a/store/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1 -lint: - use: - - DEFAULT -deps: - - buf.build/googleapis/googleapis - - buf.build/grpc-ecosystem/grpc-gateway -breaking: - use: - - FILE diff --git a/thumbnails/Makefile b/thumbnails/Makefile index 41dd62ced..a083f9316 100644 --- a/thumbnails/Makefile +++ b/thumbnails/Makefile @@ -29,12 +29,3 @@ ci-go-generate: protobuf # CI runs ci-node-generate automatically before this ta .PHONY: ci-node-generate ci-node-generate: - -############ protobuf ############ -PROTO_VERSION := v0 -PROTO_SRC := pkg/proto/$(PROTO_VERSION) - -include ../.make/protobuf.mk - -.PHONY: protobuf -protobuf: buf-generate diff --git a/thumbnails/buf.gen.yaml b/thumbnails/buf.gen.yaml deleted file mode 100644 index 26f39c7ed..000000000 --- a/thumbnails/buf.gen.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: v1 -plugins: - - name: go - path: ../.bingo/protoc-gen-go - out: pkg/ - opt: - - paths=source_relative - - - name: micro - path: ../.bingo/protoc-gen-micro - out: pkg/ - opt: - - paths=source_relative - - # not needed for thumbnails - #- name: microweb - # path: ../.bingo/protoc-gen-microweb - # out: pkg/ - # opt: - # - paths=source_relative - - - name: openapiv2 - path: ../.bingo/protoc-gen-openapiv2 - out: pkg/ - - - name: doc - path: ../.bingo/protoc-gen-doc - out: ../docs/extensions/accounts - opt: - - ./templates/GRPC.tmpl,grpc.md diff --git a/thumbnails/buf.lock b/thumbnails/buf.lock deleted file mode 100644 index 65d843368..000000000 --- a/thumbnails/buf.lock +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by buf. DO NOT EDIT. -version: v1 -deps: - - remote: buf.build - owner: googleapis - repository: googleapis - branch: main - commit: ca45b9d9c51849e898845743a28b0eb0 - digest: b1--B2JdvzLV2KI5pYMG9AHJHFGznqXfZKjKwcqBuXhGgw= - create_time: 2021-10-14T15:09:30.598677Z - - remote: buf.build - owner: grpc-ecosystem - repository: grpc-gateway - branch: main - commit: 462ede5f3dee45569df6317bda220b1b - digest: b1-4FNKWjnS2yafyeOdqW8u-s7w1pJBHjz0Z6CbOL-Ipk0= - create_time: 2021-10-14T01:55:03.476639Z diff --git a/thumbnails/buf.yaml b/thumbnails/buf.yaml deleted file mode 100644 index 8d96e03b5..000000000 --- a/thumbnails/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1 -lint: - use: - - DEFAULT -deps: - - buf.build/googleapis/googleapis - - buf.build/grpc-ecosystem/grpc-gateway -breaking: - use: - - FILE