diff options
author | 2022-08-03 19:38:48 -0700 | |
---|---|---|
committer | 2022-08-03 19:38:48 -0700 | |
commit | b26ffd01b821047b692e5235e4f7f4f8f535f432 (patch) | |
tree | 3c25cd773ff968e52219ab2d52a42670ebca1b73 | |
parent | 779eeb8dc8ea25779ec3635fdb12c5c79966bdd8 (diff) | |
download | touchpad-b26ffd01b821047b692e5235e4f7f4f8f535f432.tar.gz touchpad-b26ffd01b821047b692e5235e4f7f4f8f535f432.tar.zst touchpad-b26ffd01b821047b692e5235e4f7f4f8f535f432.zip |
Refactor proto go generation to fix dep issues
-rw-r--r-- | .idea/touchpad.iml | 1 | ||||
-rw-r--r-- | api/buf.gen.yaml | 6 | ||||
-rw-r--r-- | api/touchpad/common/v1/enums.proto | 2 | ||||
-rw-r--r-- | api/touchpad/common/v1/message.proto | 2 | ||||
-rw-r--r-- | api/touchpad/meet/v1/request_response.proto | 2 | ||||
-rw-r--r-- | api/touchpad/meet/v1/service.proto | 2 | ||||
-rw-r--r-- | api/touchpad/swimmer/v1/request_response.proto | 2 | ||||
-rw-r--r-- | api/touchpad/swimmer/v1/service.proto | 2 | ||||
-rw-r--r-- | golang/.gitignore | 18 | ||||
-rw-r--r-- | golang/go.mod | 3 | ||||
-rw-r--r-- | golang/scraper/internal/consumer/consumer.go | 1 | ||||
-rw-r--r-- | golang/scraper/internal/scraper/scraper.go | 4 | ||||
-rw-r--r-- | golang/scraper/main.go | 4 |
13 files changed, 40 insertions, 9 deletions
diff --git a/.idea/touchpad.iml b/.idea/touchpad.iml index d6ebd48..25ed3f6 100644 --- a/.idea/touchpad.iml +++ b/.idea/touchpad.iml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> + <component name="Go" enabled="true" /> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> diff --git a/api/buf.gen.yaml b/api/buf.gen.yaml index 2bdd033..014dded 100644 --- a/api/buf.gen.yaml +++ b/api/buf.gen.yaml @@ -1,15 +1,15 @@ version: v1 plugins: - name: go - out: gen/go + out: ../golang/api opt: - paths=source_relative - name: go-grpc - out: gen/go + out: ../golang/api opt: - paths=source_relative - name: grpc-gateway - out: gen/go + out: ../golang/api opt: - paths=source_relative - name: openapiv2 diff --git a/api/touchpad/common/v1/enums.proto b/api/touchpad/common/v1/enums.proto index 909ead4..8ef518d 100644 --- a/api/touchpad/common/v1/enums.proto +++ b/api/touchpad/common/v1/enums.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package touchpad.common.v1; -option go_package = "go.anshulg.com/touchpad/api/gen/go/touchpad/common/v1;common"; +option go_package = "go.anshulg.com/touchpad/golang/api/touchpad/common/v1;common"; option java_multiple_files = true; option java_outer_classname = "EnumsProto"; option java_package = "com.anshulg.touchpad.common.v1"; diff --git a/api/touchpad/common/v1/message.proto b/api/touchpad/common/v1/message.proto index 3a0055e..464006f 100644 --- a/api/touchpad/common/v1/message.proto +++ b/api/touchpad/common/v1/message.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "touchpad/common/v1/enums.proto"; -option go_package = "go.anshulg.com/touchpad/api/gen/go/touchpad/common/v1;common"; +option go_package = "go.anshulg.com/touchpad/golang/api/touchpad/common/v1;common"; option java_multiple_files = true; option java_outer_classname = "MessageProto"; option java_package = "com.anshulg.touchpad.common.v1"; diff --git a/api/touchpad/meet/v1/request_response.proto b/api/touchpad/meet/v1/request_response.proto index 32efdd1..24da051 100644 --- a/api/touchpad/meet/v1/request_response.proto +++ b/api/touchpad/meet/v1/request_response.proto @@ -4,7 +4,7 @@ package touchpad.meet.v1; import "touchpad/common/v1/message.proto"; -option go_package = "go.anshulg.com/touchpad/api/gen/go/touchpad/meet/v1;meet"; +option go_package = "go.anshulg.com/touchpad/golang/api/touchpad/meet/v1;meet"; option java_multiple_files = true; option java_outer_classname = "RequestResponseProto"; option java_package = "com.anshulg.touchpad.meet.v1"; diff --git a/api/touchpad/meet/v1/service.proto b/api/touchpad/meet/v1/service.proto index 75fa303..ad561e3 100644 --- a/api/touchpad/meet/v1/service.proto +++ b/api/touchpad/meet/v1/service.proto @@ -5,7 +5,7 @@ package touchpad.meet.v1; import "google/api/annotations.proto"; import "touchpad/meet/v1/request_response.proto"; -option go_package = "go.anshulg.com/touchpad/api/gen/go/touchpad/meet/v1;meet"; +option go_package = "go.anshulg.com/touchpad/golang/api/touchpad/meet/v1;meet"; option java_multiple_files = true; option java_outer_classname = "ServiceProto"; option java_package = "com.anshulg.touchpad.meet.v1"; diff --git a/api/touchpad/swimmer/v1/request_response.proto b/api/touchpad/swimmer/v1/request_response.proto index c5a5565..e236cdb 100644 --- a/api/touchpad/swimmer/v1/request_response.proto +++ b/api/touchpad/swimmer/v1/request_response.proto @@ -4,7 +4,7 @@ package touchpad.swimmer.v1; import "touchpad/common/v1/message.proto"; -option go_package = "go.anshulg.com/touchpad/api/gen/go/touchpad/swimmer/v1;swimmer"; +option go_package = "go.anshulg.com/touchpad/golang/api/touchpad/swimmer/v1;swimmer"; option java_multiple_files = true; option java_outer_classname = "RequestResponseProto"; option java_package = "com.anshulg.touchpad.swimmer.v1"; diff --git a/api/touchpad/swimmer/v1/service.proto b/api/touchpad/swimmer/v1/service.proto index 072557a..1a80aa7 100644 --- a/api/touchpad/swimmer/v1/service.proto +++ b/api/touchpad/swimmer/v1/service.proto @@ -5,7 +5,7 @@ package touchpad.swimmer.v1; import "google/api/annotations.proto"; import "touchpad/swimmer/v1/request_response.proto"; -option go_package = "go.anshulg.com/touchpad/api/gen/go/touchpad/swimmer/v1;swimmer"; +option go_package = "go.anshulg.com/touchpad/golang/api/touchpad/swimmer/v1;swimmer"; option java_multiple_files = true; option java_outer_classname = "ServiceProto"; option java_package = "com.anshulg.touchpad.swimmer.v1"; diff --git a/golang/.gitignore b/golang/.gitignore new file mode 100644 index 0000000..2d08b78 --- /dev/null +++ b/golang/.gitignore @@ -0,0 +1,18 @@ +### Go template +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ + +api/
\ No newline at end of file diff --git a/golang/go.mod b/golang/go.mod new file mode 100644 index 0000000..df45a72 --- /dev/null +++ b/golang/go.mod @@ -0,0 +1,3 @@ +module go.anshulg.com/touchpad/golang + +go 1.18 diff --git a/golang/scraper/internal/consumer/consumer.go b/golang/scraper/internal/consumer/consumer.go new file mode 100644 index 0000000..b78b46c --- /dev/null +++ b/golang/scraper/internal/consumer/consumer.go @@ -0,0 +1 @@ +package consumer diff --git a/golang/scraper/internal/scraper/scraper.go b/golang/scraper/internal/scraper/scraper.go new file mode 100644 index 0000000..b7324ac --- /dev/null +++ b/golang/scraper/internal/scraper/scraper.go @@ -0,0 +1,4 @@ +package scraper + +type Scraper interface { +} diff --git a/golang/scraper/main.go b/golang/scraper/main.go new file mode 100644 index 0000000..da29a2c --- /dev/null +++ b/golang/scraper/main.go @@ -0,0 +1,4 @@ +package main + +func main() { +} |