Skip to content
Snippets Groups Projects
Commit 221b13b9 authored by Leonardo Christino's avatar Leonardo Christino
Browse files

chore: update protobuf to include protocol and internalDatabaseName properly

parent 4de91757
No related branches found
No related tags found
No related merge requests found
Pipeline #127149 passed
Stage: tag-release
Stage: get-release-tag
Stage: container-image
Stage: deploy-staging
Hide whitespace changes
Inline Side-by-side
Makefile
+ 6
− 11
View file @ 221b13b9
......@@ -54,11 +54,7 @@ develop:
@go run cmd/query-service/main.go
docker: linux
@rm -rf ./dependencies
@cp -r ../../dependencies ./dependencies
@docker build --progress plain -t graphpolaris/query-handler-service:latest -f ./Dockerfile .
@docker push graphpolaris/query-handler-service:latest
@rm -r ./dependencies
@docker build --progress plain -t harbor.graphpolairs.com/graphpolaris/query:latest -f ./Dockerfile .
rollout: docker
kubectl rollout restart deployment arangodb-query-service
......@@ -70,15 +66,14 @@ log:
logarango:
@kubectl get pods -o wide | grep Running | grep arangodb-query-service | cut -d " " -f1 | xargs kubectl logs -f
staging: login
make linux
@docker build -t query-service-staging:latest .
@docker tag query-service-staging:latest datastropheregistry.azurecr.io/query-service-staging:latest
@docker push datastropheregistry.azurecr.io/query-service-staging:latest
login:
echo -e "machine git.science.uu.nl\nlogin gitlab-ci-token\npassword ${CI_JOB_TOKEN}" > ~/.netrc
documentation:
godoc -goroot ~/Developer/go
# wget -r -np -N -E -p -k http://localhost:6060/pkg/query-service?m=all
push:
@go get -u -v all
@go mod tidy --compat=1.21
@docker build --progress plain -t harbor.graphpolairs.com/graphpolaris/query -f ./Dockerfile .
README.md
+ 15
− 0
View file @ 221b13b9
......@@ -14,6 +14,21 @@ This service handles the conversion and execution of queries sent from the front
The reason the conversion and execution code are seperated is because there can be multiple databases using the same query language, while they each have their own driver.
## Development Replace
Add the following lines to the go.mod file to replace the dependencies with local dependencies (better dev experience). DO NOT PUSH THEM!
```sh
replace git.science.uu.nl/graphpolaris/broker => ../../dependencies/broker
replace git.science.uu.nl/graphpolaris/keyvaluestore => ../../dependencies/keyvaluestore
replace git.science.uu.nl/graphpolaris/query-conversion => ../../dependencies/query-conversion
replace git.science.uu.nl/graphpolaris/query-execution => ../../dependencies/query-execution
```
### Dev Dependencies
Here are the developer dependencies. Coding can be done without these tools, but they sure make your life easier.
......
go.mod
+ 0
− 8
View file @ 221b13b9
......@@ -43,11 +43,3 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
replace git.science.uu.nl/graphpolaris/broker => ../../dependencies/broker
replace git.science.uu.nl/graphpolaris/keyvaluestore => ../../dependencies/keyvaluestore
replace git.science.uu.nl/graphpolaris/query-conversion => ../../dependencies/query-conversion
replace git.science.uu.nl/graphpolaris/query-execution => ../../dependencies/query-execution
internal/drivers/rpcdriver/databaseInfoService/databaseInfo.pb.go
+ 22
− 21
View file @ 221b13b9
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc v3.17.3
// protoc-gen-go v1.31.0
// protoc v3.21.12
// source: databaseInfo.proto
package databaseInfoService
......@@ -179,30 +179,31 @@ var file_databaseInfo_proto_rawDesc = []byte{
0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
0x72, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x4e,
0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x62,
0x61, 0x73, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xbe, 0x01, 0x0a, 0x14, 0x44, 0x61, 0x74, 0x61,
0x61, 0x73, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xda, 0x01, 0x0a, 0x14, 0x44, 0x61, 0x74, 0x61,
0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08,
0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73,
0x77, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73,
0x77, 0x6f, 0x72, 0x64, 0x12, 0x32, 0x0a, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01,
0x28, 0x09, 0x52, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61,
0x62, 0x61, 0x73, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0x57, 0x0a, 0x13, 0x44, 0x61, 0x74, 0x61,
0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
0x40, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e,
0x66, 0x6f, 0x12, 0x14, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66,
0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62,
0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
0x00, 0x42, 0x47, 0x5a, 0x45, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
0x6d, 0x65, 0x6e, 0x74, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x69, 0x6e, 0x74,
0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2f, 0x72, 0x70, 0x63,
0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49,
0x6e, 0x66, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72,
0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72,
0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
0x12, 0x32, 0x0a, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61,
0x62, 0x61, 0x73, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14,
0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65,
0x4e, 0x61, 0x6d, 0x65, 0x32, 0x57, 0x0a, 0x13, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65,
0x49, 0x6e, 0x66, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x40, 0x0a, 0x0f, 0x47,
0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14,
0x2e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49,
0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x47, 0x5a,
0x45, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74,
0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
0x6c, 0x2f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2f, 0x72, 0x70, 0x63, 0x64, 0x72, 0x69, 0x76,
0x65, 0x72, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x53,
0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment