From 759c1388b2b75017ec36bd1916418f6d2c01e049 Mon Sep 17 00:00:00 2001 From: Himank Chaudhary Date: Tue, 26 Apr 2022 14:20:28 -0700 Subject: [PATCH 1/3] fix: use the renamed api repo --- .gitmodules | 2 +- api/proto | 2 +- api/server/v1/marshaler.go | 28 ++++++++++++++++++++++++---- go.mod | 2 +- go.sum | 4 ++-- server/services/v1/api.go | 12 ++++++------ server/services/v1/request.go | 2 +- test/v1/client/client_test.go | 4 ++-- 8 files changed, 38 insertions(+), 18 deletions(-) diff --git a/.gitmodules b/.gitmodules index da9c97ed6..5fb0a7839 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "api/proto"] path = api/proto - url = https://github.com/tigrisdata/tigrisdb-api.git + url = https://github.com/tigrisdata/tigris-api.git branch = main diff --git a/api/proto b/api/proto index 31086a5e6..b9dbc09a7 160000 --- a/api/proto +++ b/api/proto @@ -1 +1 @@ -Subproject commit 31086a5e644b0e93c3eb4c2eaa6f36e2104d969f +Subproject commit b9dbc09a72789ddaaa006963daec5164b76050d4 diff --git a/api/server/v1/marshaler.go b/api/server/v1/marshaler.go index 5982bd7b2..b07b89c12 100644 --- a/api/server/v1/marshaler.go +++ b/api/server/v1/marshaler.go @@ -16,6 +16,7 @@ package api import ( "encoding/json" + "time" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" jsoniter "github.com/json-iterator/go" @@ -54,17 +55,36 @@ func (c *CustomMarshaler) Marshal(v interface{}) ([]byte, error) { // the openAPI specs needs to be specified Data as object instead of bytes. func (x *ReadResponse) MarshalJSON() ([]byte, error) { resp := struct { - Data json.RawMessage `json:"data"` - Metadata *ResponseMetadata `json:"metadata"` - ResumeToken []byte `json:"resume_token"` + Data json.RawMessage `json:"data,omitempty"` + Metadata Metadata `json:"metadata,omitempty"` + ResumeToken []byte `json:"resume_token,omitempty"` }{ Data: x.Data, - Metadata: x.Metadata, + Metadata: CreateMDFromResponseMD(x.Metadata), ResumeToken: x.ResumeToken, } return json.Marshal(resp) } +type Metadata struct { + CreatedAt *time.Time `json:"created_at,omitempty"` + UpdatedAt *time.Time `json:"updated_at,omitempty"` +} + +func CreateMDFromResponseMD(x *ResponseMetadata) Metadata { + var md Metadata + if x.CreatedAt != nil { + tm := x.CreatedAt.AsTime() + md.CreatedAt = &tm + } + if x.UpdatedAt != nil { + tm := x.UpdatedAt.AsTime() + md.UpdatedAt = &tm + } + + return md +} + // UnmarshalJSON on ReadRequest avoids unmarshalling filter and instead this way we can write a custom struct to do // the unmarshalling and will be avoiding any extra allocation/copying. func (x *ReadRequest) UnmarshalJSON(data []byte) error { diff --git a/go.mod b/go.mod index f558402c8..f1cd84943 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.10.1 github.com/stretchr/testify v1.7.1 - github.com/tigrisdata/tigrisdb-client-go v1.0.0-alpha.6 + github.com/tigrisdata/tigris-client-go v1.0.0-alpha.8 github.com/ugorji/go/codec v1.2.7 github.com/valyala/bytebufferpool v1.0.0 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f diff --git a/go.sum b/go.sum index 8707ae99f..86289f7f3 100644 --- a/go.sum +++ b/go.sum @@ -380,8 +380,8 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tigrisdata/tigrisdb-client-go v1.0.0-alpha.6 h1:wUmALbMm5oGZYx6qz+HmaWz5qzei9i6xHIJeC+BpXoo= -github.com/tigrisdata/tigrisdb-client-go v1.0.0-alpha.6/go.mod h1:lP4RhNml4kRHULYY+nb+nmvGz0THlwUx9w5BI7Qus7I= +github.com/tigrisdata/tigris-client-go v1.0.0-alpha.8 h1:7mgpLlbISo0b/SlzIdxYoTg9wMN2rbASXA7jmK3eu6c= +github.com/tigrisdata/tigris-client-go v1.0.0-alpha.8/go.mod h1:n8S0W67usp8Em9BcT1ZK0x6mW3UcApsbWVqlPaF/LSo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= diff --git a/server/services/v1/api.go b/server/services/v1/api.go index e33e2ac11..2440c8abf 100644 --- a/server/services/v1/api.go +++ b/server/services/v1/api.go @@ -45,7 +45,7 @@ const ( ) type apiService struct { - api.UnimplementedTigrisDBServer + api.UnimplementedTigrisServer kvStore kv.KeyValueStore txMgr *transaction.Manager @@ -88,11 +88,11 @@ func (s *apiService) RegisterHTTP(router chi.Router, inproc *inprocgrpc.Channel) JSONBuiltin: &runtime.JSONBuiltin{}, })) - if err := api.RegisterTigrisDBHandlerClient(context.TODO(), mux, api.NewTigrisDBClient(inproc)); err != nil { + if err := api.RegisterTigrisHandlerClient(context.TODO(), mux, api.NewTigrisClient(inproc)); err != nil { return err } - api.RegisterTigrisDBServer(inproc, s) + api.RegisterTigrisServer(inproc, s) router.HandleFunc(apiPathPrefix+databasePathPattern, func(w http.ResponseWriter, r *http.Request) { mux.ServeHTTP(w, r) @@ -108,7 +108,7 @@ func (s *apiService) RegisterHTTP(router chi.Router, inproc *inprocgrpc.Channel) } func (s *apiService) RegisterGRPC(grpc *grpc.Server) error { - api.RegisterTigrisDBServer(grpc, s) + api.RegisterTigrisServer(grpc, s) return nil } @@ -249,7 +249,7 @@ func (s *apiService) Delete(ctx context.Context, r *api.DeleteRequest) (*api.Del }, nil } -func (s *apiService) Read(r *api.ReadRequest, stream api.TigrisDB_ReadServer) error { +func (s *apiService) Read(r *api.ReadRequest, stream api.Tigris_ReadServer) error { if err := r.Validate(); err != nil { return err } @@ -424,7 +424,7 @@ func (s *apiService) Run(ctx context.Context, req *ReqOptions) (*Response, error return queryLifecycle.run(ctx, req) } -func (s *apiService) Stream(r *api.StreamRequest, stream api.TigrisDB_StreamServer) error { +func (s *apiService) Stream(r *api.StreamRequest, stream api.Tigris_StreamServer) error { if err := r.Validate(); err != nil { return err } diff --git a/server/services/v1/request.go b/server/services/v1/request.go index 98aaca76e..509f61055 100644 --- a/server/services/v1/request.go +++ b/server/services/v1/request.go @@ -30,7 +30,7 @@ const ( // Streaming is a wrapper interface for passing around for streaming reads type Streaming interface { - api.TigrisDB_ReadServer + api.Tigris_ReadServer } // ReqOptions are options used by queryLifecycle to execute a query diff --git a/test/v1/client/client_test.go b/test/v1/client/client_test.go index 5ca533ece..57c5db778 100644 --- a/test/v1/client/client_test.go +++ b/test/v1/client/client_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb-client-go/api/server/v1" - "github.com/tigrisdata/tigrisdb-client-go/driver" + api "github.com/tigrisdata/tigris-client-go/api/server/v1" + "github.com/tigrisdata/tigris-client-go/driver" "github.com/tigrisdata/tigrisdb/server/config" "google.golang.org/grpc/codes" ) From ce7e8a934d1501b54179d672ec6b1b52e9367691 Mon Sep 17 00:00:00 2001 From: Himank Chaudhary Date: Tue, 26 Apr 2022 21:26:14 -0700 Subject: [PATCH 2/3] fix: remove db from config as well --- .github/workflows/push-docker-image.yaml | 4 +-- Makefile | 4 +-- README.md | 26 +++++++++---------- api/server/v1/error.go | 24 ++++++++--------- cdc/listener.go | 2 +- cdc/manager.go | 2 +- cdc/publisher.go | 4 +-- cdc/streamer.go | 4 +-- deployment/manifests/base/deployment.yaml | 22 ++++++++-------- deployment/manifests/base/kustomization.yaml | 2 +- deployment/manifests/base/network-policy.yaml | 4 +-- deployment/manifests/base/service.yaml | 8 +++--- deployment/manifests/base/service_grpc.yaml | 8 +++--- .../manifests/overlays/sample/deployment.yaml | 4 +-- docker/Dockerfile | 6 ++--- docker/local/docker-compose.yaml | 2 +- docs/configuration.md | 6 ++--- docs/deploy_k8s.md | 2 +- docs/development/overview.md | 4 +-- go.mod | 2 +- internal/data.go | 4 +-- internal/data.proto | 2 +- internal/data_test.go | 2 +- query/aggregation/accumulator.go | 2 +- query/aggregation/aggregation.go | 2 +- query/aggregation/aggregation_test.go | 2 +- query/aggregation/arithmetic.go | 2 +- query/expression/expression.go | 4 +-- query/expression/expression_test.go | 2 +- query/filter/comparison.go | 2 +- query/filter/comparison_test.go | 2 +- query/filter/filter.go | 10 +++---- query/filter/filter_test.go | 2 +- query/filter/key_builder.go | 4 +-- query/filter/key_builder_test.go | 4 +-- query/read/fields.go | 8 +++--- query/update/operator.go | 4 +-- schema/collection.go | 2 +- schema/fields.go | 4 +-- schema/fields_test.go | 2 +- schema/schema.go | 4 +-- schema/schema_test.go | 6 ++--- server/config/config.go | 10 +++---- server/config/options.go | 2 +- server/grpc/grpc.go | 6 ++--- server/http/http.go | 6 ++--- server/main.go | 8 +++--- server/metadata/encoding/dictionary.go | 14 +++++----- server/metadata/encoding/dictionary_test.go | 8 +++--- server/metadata/encoding/schema.go | 10 +++---- server/metadata/encoding/schema_test.go | 8 +++--- server/metadata/key_encoder.go | 8 +++--- server/metadata/key_encoder_test.go | 4 +-- server/metadata/meta_version.go | 2 +- server/metadata/meta_version_test.go | 6 ++--- server/metadata/tenant.go | 10 +++---- server/metadata/tenant_test.go | 16 ++++++------ server/midddleware/auth.go | 4 +-- server/midddleware/auth_test.go | 6 ++--- server/midddleware/middleware.go | 2 +- server/muxer/muxer.go | 12 ++++----- server/services/v1/api.go | 12 ++++----- server/services/v1/health.go | 2 +- server/services/v1/query_lifecycle.go | 10 +++---- server/services/v1/query_runner.go | 26 +++++++++---------- server/services/v1/request.go | 4 +-- server/services/v1/service.go | 2 +- server/transaction/manager.go | 8 +++--- server/transaction/session.go | 8 +++--- store/kv/fdb.go | 6 ++--- store/kv/kv.go | 4 +-- store/kv/kv_test.go | 8 +++--- test/config/config.go | 2 +- test/docker/docker-compose.yml | 2 +- test/v1/client/client_test.go | 2 +- test/v1/server/collection_test.go | 2 +- test/v1/server/database_test.go | 2 +- test/v1/server/document_test.go | 2 +- value/value.go | 4 +-- value/value_test.go | 4 +-- 80 files changed, 234 insertions(+), 234 deletions(-) diff --git a/.github/workflows/push-docker-image.yaml b/.github/workflows/push-docker-image.yaml index 364dd69e7..a6f3d52ad 100644 --- a/.github/workflows/push-docker-image.yaml +++ b/.github/workflows/push-docker-image.yaml @@ -21,8 +21,8 @@ on: env: AWS_REGION: "us-west-2" - ECR_REPOSITORY: "prod/tigrisdb" - DOCKER_REPOSITORY: "tigrisdata/tigrisdb" + ECR_REPOSITORY: "prod/tigris" + DOCKER_REPOSITORY: "tigrisdata/tigris" jobs: build-and-push-image: diff --git a/Makefile b/Makefile index 04cc8cbd0..a6cb9930b 100644 --- a/Makefile +++ b/Makefile @@ -90,10 +90,10 @@ clean: # OSX specific targets to run tests against FDB installed on the Mac OSX host (non-containerized) osx_test: generate test_client - TIGRISDB_SERVER_FOUNDATIONDB_CLUSTER_FILE=$(OSX_CLUSTER_FILE) GOARCH=$(GOARCH) CGO_ENABLED=$(CGO_ENABLED) go test $(TEST_PARAM) ./... + TIGRIS_SERVER_FOUNDATIONDB_CLUSTER_FILE=$(OSX_CLUSTER_FILE) GOARCH=$(GOARCH) CGO_ENABLED=$(CGO_ENABLED) go test $(TEST_PARAM) ./... osx_run: generate server - TIGRISDB_SERVER_FOUNDATIONDB_CLUSTER_FILE=$(OSX_CLUSTER_FILE) ./server/service + TIGRIS_SERVER_FOUNDATIONDB_CLUSTER_FILE=$(OSX_CLUSTER_FILE) ./server/service upgrade_api: git submodule update --remote --recursive --rebase diff --git a/README.md b/README.md index b37cdb61b..8f4f03b08 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# TigrisDB +# Tigris Data -[![Go Report](https://goreportcard.com/badge/github.com/tigrisdata/tigrisdb)](https://goreportcard.com/report/github.com/tigrisdata/tigrisdb) -[![Build Status](https://github.com/tigrisdata/tigrisdb/workflows/Go/badge.svg)]() +[![Go Report](https://goreportcard.com/badge/github.com/tigrisdata/tigris)](https://goreportcard.com/report/github.com/tigrisdata/tigris) +[![Build Status](https://github.com/tigrisdata/tigris/workflows/Go/badge.svg)]() [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) # Getting started -These instructions will get you through setting up TigrisDB locally as Docker +These instructions will get you through setting up Tigris Data locally as Docker containers. ## Prerequisites @@ -20,7 +20,7 @@ containers. ## Running locally The [docker/local](docker/local) directory contains the docker-compose.yaml -which describes the configuration of TigrisDB components. You can run TigrisDB +which describes the configuration of Tigris Data components. You can run Tigris Data in a local environment by executing: ```shell @@ -33,23 +33,23 @@ docker-compose up -d Install the CLI: ```shell -go install github.com/tigrisdata/tigrisdb-cli@latest +go install github.com/tigrisdata/tigris-cli@latest ``` Make sure to include the installed binary in your PATH. -Test that TigrisDB is up and running locally: +Test that Tigris is up and running locally: ```shell -export TIGRISDB_URL=http://localhost:8081 -tigrisdb-cli db list databases +export TIGRIS_URL=http://localhost:8081 +tigris-cli db list databases ``` More elaborate example of CLI usage can be -found [here](https://github.com/tigrisdata/tigrisdb-cli/). +found [here](https://github.com/tigrisdata/tigris-cli/). Golang client example can be -found [here](https://github.com/tigrisdata/tigrisdb-client-go/). +found [here](https://github.com/tigrisdata/tigris-client-go/). # Documentation @@ -64,8 +64,8 @@ found [here](https://github.com/tigrisdata/tigrisdb-client-go/). # Community & Support * [Slack Community](https://join.slack.com/t/tigrisdatacommunity/shared_invite/zt-16fn5ogio-OjxJlgttJIV0ZDywcBItJQ) -* [GitHub Issues](https://github.com/tigrisdata/tigrisdb/issues) -* [GitHub Discussions](https://github.com/tigrisdata/tigrisdb/discussions) +* [GitHub Issues](https://github.com/tigrisdata/tigris/issues) +* [GitHub Discussions](https://github.com/tigrisdata/tigris/discussions) # License diff --git a/api/server/v1/error.go b/api/server/v1/error.go index 038e06ea5..644541881 100644 --- a/api/server/v1/error.go +++ b/api/server/v1/error.go @@ -26,11 +26,11 @@ import ( "google.golang.org/protobuf/types/known/anypb" ) -// TigrisDBError is our Tigris HTTP counterpart of grpc status. All the APIs should use this Error to return as a user facing -// error. TigrisDBError will return grpcStatus to the muxer so that grpc client can see grpcStatus as the final output. For +// TigrisError is our Tigris HTTP counterpart of grpc status. All the APIs should use this Error to return as a user facing +// error. TigrisError will return grpcStatus to the muxer so that grpc client can see grpcStatus as the final output. For // HTTP clients see the **MarshalStatus** method where we are returning the response by not the grpc code as that is not // needed for HTTP clients. -type TigrisDBError struct { +type TigrisError struct { // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. We don't need to marshal // this code for HTTP clients. Code codes.Code `json:"code,omitempty"` @@ -41,12 +41,12 @@ type TigrisDBError struct { } // Error to return the underlying error message -func (e *TigrisDBError) Error() string { +func (e *TigrisError) Error() string { return e.Message } -// GRPCStatus converts the TigrisDBError and return status.Status. This is used to return grpc status to the grpc clients -func (e *TigrisDBError) GRPCStatus() *status.Status { +// GRPCStatus converts the TigrisError and return status.Status. This is used to return grpc status to the grpc clients +func (e *TigrisError) GRPCStatus() *status.Status { s := &spb.Status{ Code: int32(e.Code), Message: e.Message, @@ -69,15 +69,15 @@ func (e *TigrisDBError) GRPCStatus() *status.Status { return status.FromProto(s) } -// WithDetails a helper method for adding details to the TigrisDBError -func (e *TigrisDBError) WithDetails(details ...*ErrorDetails) *TigrisDBError { +// WithDetails a helper method for adding details to the TigrisError +func (e *TigrisError) WithDetails(details ...*ErrorDetails) *TigrisError { e.Details = details return e } // MarshalStatus marshal status object func MarshalStatus(status *spb.Status) ([]byte, error) { - var resp = &TigrisDBError{} + var resp = &TigrisError{} resp.Message = status.Message resp.Code = codes.Code(status.Code) if len(status.Details) > 0 { @@ -97,17 +97,17 @@ func MarshalStatus(status *spb.Status) ([]byte, error) { } // Errorf returns Error(c, fmt.Sprintf(format, a...)). -func Errorf(c codes.Code, format string, a ...interface{}) *TigrisDBError { +func Errorf(c codes.Code, format string, a ...interface{}) *TigrisError { return Error(c, fmt.Sprintf(format, a...)) } // Error returns an error representing c and msg. If c is OK, returns nil. -func Error(c codes.Code, msg string) *TigrisDBError { +func Error(c codes.Code, msg string) *TigrisError { if c == codes.OK { return nil } - return &TigrisDBError{ + return &TigrisError{ Code: c, Message: msg, } diff --git a/cdc/listener.go b/cdc/listener.go index 5424e6086..f7ba3f68b 100644 --- a/cdc/listener.go +++ b/cdc/listener.go @@ -17,7 +17,7 @@ package cdc import ( "github.com/apple/foundationdb/bindings/go/src/fdb" jsoniter "github.com/json-iterator/go" - "github.com/tigrisdata/tigrisdb/internal" + "github.com/tigrisdata/tigris/internal" ) type Tx struct { diff --git a/cdc/manager.go b/cdc/manager.go index 77fce6902..3bbc29572 100644 --- a/cdc/manager.go +++ b/cdc/manager.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "github.com/tigrisdata/tigrisdb/store/kv" + "github.com/tigrisdata/tigris/store/kv" ) type Manager struct { diff --git a/cdc/publisher.go b/cdc/publisher.go index ba9b48997..90e573e45 100644 --- a/cdc/publisher.go +++ b/cdc/publisher.go @@ -18,8 +18,8 @@ import ( "github.com/apple/foundationdb/bindings/go/src/fdb" "github.com/apple/foundationdb/bindings/go/src/fdb/subspace" "github.com/apple/foundationdb/bindings/go/src/fdb/tuple" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/store/kv" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/store/kv" ) type Publisher struct { diff --git a/cdc/streamer.go b/cdc/streamer.go index e5bc21aaf..15fd76e34 100644 --- a/cdc/streamer.go +++ b/cdc/streamer.go @@ -20,8 +20,8 @@ import ( "github.com/apple/foundationdb/bindings/go/src/fdb" jsoniter "github.com/json-iterator/go" "github.com/rs/zerolog/log" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/server/config" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/server/config" ) type Streamer struct { diff --git a/deployment/manifests/base/deployment.yaml b/deployment/manifests/base/deployment.yaml index 214c4c25f..927e13f26 100644 --- a/deployment/manifests/base/deployment.yaml +++ b/deployment/manifests/base/deployment.yaml @@ -16,22 +16,22 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/name: tigrisdb-server - app.kubernetes.io/part-of: tigrisdb + app.kubernetes.io/name: tigris-server + app.kubernetes.io/part-of: tigris app.kubernetes.io/component: server - name: tigrisdb-server + name: tigris-server spec: selector: matchLabels: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server template: metadata: labels: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server spec: containers: - - name: tigrisdb-server - image: tigrisdata/tigrisdb:latest # Replace this with the version you want to run through kustomization + - name: tigris-server + image: tigrisdata/tigris:latest # Replace this with the version you want to run through kustomization imagePullPolicy: Always command: ["/server/service"] volumeMounts: @@ -39,7 +39,7 @@ spec: name: tmp - mountPath: /mnt/fdb-config-volume name: fdb-cluster-config-volume - - mountPath: /etc/tigrisdata/tigrisdb + - mountPath: /etc/tigrisdata/tigris name: server-config-volume ports: - containerPort: 8080 @@ -72,7 +72,7 @@ spec: # This configmap is created during the kustomization phase - name: server-config-volume configMap: - name: tigrisdb-server-config + name: tigris-server-config affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -80,11 +80,11 @@ spec: topologyKey: kubernetes.io/hostname labelSelector: matchLabels: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server weight: 100 - podAffinityTerm: topologyKey: kubernetes.io/hostname labelSelector: matchLabels: - app.kubernetes.io/part-of: tigrisdb + app.kubernetes.io/part-of: tigris weight: 5 diff --git a/deployment/manifests/base/kustomization.yaml b/deployment/manifests/base/kustomization.yaml index 00a4d8857..6fe1e330a 100644 --- a/deployment/manifests/base/kustomization.yaml +++ b/deployment/manifests/base/kustomization.yaml @@ -20,6 +20,6 @@ resources: - service_grpc.yaml - network-policy.yaml configMapGenerator: - - name: tigrisdb-server-config + - name: tigris-server-config files: - server.yaml diff --git a/deployment/manifests/base/network-policy.yaml b/deployment/manifests/base/network-policy.yaml index ec5ab6449..ad8c65f4f 100644 --- a/deployment/manifests/base/network-policy.yaml +++ b/deployment/manifests/base/network-policy.yaml @@ -15,11 +15,11 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: tigrisdb-server-network-policy + name: tigris-server-network-policy spec: podSelector: matchLabels: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server ingress: - {} egress: diff --git a/deployment/manifests/base/service.yaml b/deployment/manifests/base/service.yaml index a3fab6dca..4334a4430 100644 --- a/deployment/manifests/base/service.yaml +++ b/deployment/manifests/base/service.yaml @@ -16,10 +16,10 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: tigrisdb-server - app.kubernetes.io/part-of: tigrisdb + app.kubernetes.io/name: tigris-server + app.kubernetes.io/part-of: tigris app.kubernetes.io/component: server - name: tigrisdb-server + name: tigris-server spec: type: NodePort ports: @@ -28,4 +28,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server diff --git a/deployment/manifests/base/service_grpc.yaml b/deployment/manifests/base/service_grpc.yaml index 6c00c0236..2bdc16b9f 100644 --- a/deployment/manifests/base/service_grpc.yaml +++ b/deployment/manifests/base/service_grpc.yaml @@ -16,12 +16,12 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: tigrisdb-server - app.kubernetes.io/part-of: tigrisdb + app.kubernetes.io/name: tigris-server + app.kubernetes.io/part-of: tigris app.kubernetes.io/component: server-grpc annotations: alb.ingress.kubernetes.io/backend-protocol-version: GRPC - name: tigrisdb-server-grpc + name: tigris-server-grpc spec: type: NodePort ports: @@ -30,4 +30,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server diff --git a/deployment/manifests/overlays/sample/deployment.yaml b/deployment/manifests/overlays/sample/deployment.yaml index b42adb8e4..24718a8e9 100644 --- a/deployment/manifests/overlays/sample/deployment.yaml +++ b/deployment/manifests/overlays/sample/deployment.yaml @@ -15,11 +15,11 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: tigrisdb-server + name: tigris-server spec: selector: matchLabels: - app.kubernetes.io/name: tigrisdb-server + app.kubernetes.io/name: tigris-server template: spec: volumes: diff --git a/docker/Dockerfile b/docker/Dockerfile index fb664451e..7c4556c21 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,14 +37,14 @@ RUN rm -rf /etc/apt/* # Setup an unprivileged user RUN groupadd -r tigris && useradd -r -s /bin/false -g tigris tigris -RUN mkdir -p /server /etc/tigrisdata/tigrisdb /etc/foundationdb/ +RUN mkdir -p /server /etc/tigrisdata/tigris /etc/foundationdb/ COPY --from=build /build/server/service /server/service -COPY --from=build /build/config/server.yaml /etc/tigrisdata/tigrisdb +COPY --from=build /build/config/server.yaml /etc/tigrisdata/tigris COPY --from=build /usr/lib/libfdb_c.so /usr/lib/libfdb_c.so COPY --from=build /usr/bin/fdbcli /usr/bin/fdbcli -RUN chown -R tigris:tigris /server /etc/tigrisdata/tigrisdb +RUN chown -R tigris:tigris /server /etc/tigrisdata/tigris EXPOSE 8081 diff --git a/docker/local/docker-compose.yaml b/docker/local/docker-compose.yaml index fb697e378..0f7f510cf 100644 --- a/docker/local/docker-compose.yaml +++ b/docker/local/docker-compose.yaml @@ -27,7 +27,7 @@ services: tigris_server: container_name: tigris_server - image: tigrisdata/tigrisdb:alpha + image: tigrisdata/tigris:alpha volumes: - type: volume source: fdbdata diff --git a/docs/configuration.md b/docs/configuration.md index d1a76f4ae..c2ab59574 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -18,11 +18,11 @@ have a higher precedence. The environment variables have the following structure: - The variables are in uppercase -- They are prefixed by `TIGRISDB_SERVER_` +- They are prefixed by `TIGRIS_SERVER_` - Multi-level variables are specified by replacing `.` with `_` Examples: - To specify the FoundationDB cluster file set the - variable `TIGRISDB_SERVER_FOUNDATIONDB_CLUSTER_FILE` -- To specify the API listen port set the variable `TIGRISDB_SERVER_SERVER_PORT` \ No newline at end of file + variable `TIGRIS_SERVER_FOUNDATIONDB_CLUSTER_FILE` +- To specify the API listen port set the variable `TIGRIS_SERVER_SERVER_PORT` \ No newline at end of file diff --git a/docs/deploy_k8s.md b/docs/deploy_k8s.md index f4200d790..80804bf5e 100644 --- a/docs/deploy_k8s.md +++ b/docs/deploy_k8s.md @@ -27,7 +27,7 @@ which references the server configuration file `server.yaml`: ```yaml configMapGenerator: - - name: tigrisdb-server-config + - name: tigris-server-config files: - server.yaml ``` diff --git a/docs/development/overview.md b/docs/development/overview.md index ac050222d..3fc8193f9 100644 --- a/docs/development/overview.md +++ b/docs/development/overview.md @@ -2,7 +2,7 @@ ## Building and Testing with Docker Containers -Start local TigrisDB server listening on `http://localhost:8081` by running: +Start local Tigris server listening on `http://localhost:8081` by running: ```sh make run @@ -38,7 +38,7 @@ make osx_run ## Defining the schema The first part is to define the schema for the collection that will be stored in -TigrisDB. In the schema define the fields and their types and then define the +Tigris. In the schema define the fields and their types and then define the primary key fields. ```json diff --git a/go.mod b/go.mod index f1cd84943..be428db80 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tigrisdata/tigrisdb +module github.com/tigrisdata/tigris go 1.18 diff --git a/internal/data.go b/internal/data.go index d8e844722..181815cb9 100644 --- a/internal/data.go +++ b/internal/data.go @@ -18,8 +18,8 @@ import ( "bytes" "time" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + ulog "github.com/tigrisdata/tigris/util/log" "github.com/ugorji/go/codec" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/data.proto b/internal/data.proto index 1329b49e0..8e5d272a1 100644 --- a/internal/data.proto +++ b/internal/data.proto @@ -14,7 +14,7 @@ syntax = "proto3"; -option go_package = "github.com/tigrisdata/tigrisdb/internal"; +option go_package = "github.com/tigrisdata/tigris/internal"; message Timestamp { // Represents seconds of UTC time since Unix epoch diff --git a/internal/data_test.go b/internal/data_test.go index c6a0278b7..debc45bff 100644 --- a/internal/data_test.go +++ b/internal/data_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" + api "github.com/tigrisdata/tigris/api/server/v1" "google.golang.org/grpc/codes" ) diff --git a/query/aggregation/accumulator.go b/query/aggregation/accumulator.go index 68f8ced3b..60e2cac45 100644 --- a/query/aggregation/accumulator.go +++ b/query/aggregation/accumulator.go @@ -18,7 +18,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/tigrisdata/tigrisdb/query/expression" + "github.com/tigrisdata/tigris/query/expression" ) // supported accumulators diff --git a/query/aggregation/aggregation.go b/query/aggregation/aggregation.go index 8c26af77e..7f9cead7a 100644 --- a/query/aggregation/aggregation.go +++ b/query/aggregation/aggregation.go @@ -18,7 +18,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/tigrisdata/tigrisdb/query/expression" + "github.com/tigrisdata/tigris/query/expression" ) // Aggregation operators either can pass a single expression or an array of expression. The below is an example of diff --git a/query/aggregation/aggregation_test.go b/query/aggregation/aggregation_test.go index bcb06cfe6..d3fa29718 100644 --- a/query/aggregation/aggregation_test.go +++ b/query/aggregation/aggregation_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tigrisdata/tigrisdb/query/expression" + "github.com/tigrisdata/tigris/query/expression" ) func TestAggregation(t *testing.T) { diff --git a/query/aggregation/arithmetic.go b/query/aggregation/arithmetic.go index 5a2a1d5cf..3912aaefd 100644 --- a/query/aggregation/arithmetic.go +++ b/query/aggregation/arithmetic.go @@ -18,7 +18,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/tigrisdata/tigrisdb/query/expression" + "github.com/tigrisdata/tigris/query/expression" ) // supported arithmetic operators diff --git a/query/expression/expression.go b/query/expression/expression.go index c3561aca7..2fa6c2d57 100644 --- a/query/expression/expression.go +++ b/query/expression/expression.go @@ -16,10 +16,10 @@ package expression import ( "fmt" - "github.com/tigrisdata/tigrisdb/value" + "github.com/tigrisdata/tigris/value" jsoniter "github.com/json-iterator/go" - api "github.com/tigrisdata/tigrisdb/api/server/v1" + api "github.com/tigrisdata/tigris/api/server/v1" "google.golang.org/grpc/codes" ) diff --git a/query/expression/expression_test.go b/query/expression/expression_test.go index 1a51661e8..76f43a2d0 100644 --- a/query/expression/expression_test.go +++ b/query/expression/expression_test.go @@ -16,7 +16,7 @@ package expression import ( "github.com/stretchr/testify/require" - "github.com/tigrisdata/tigrisdb/value" + "github.com/tigrisdata/tigris/value" "testing" ) diff --git a/query/filter/comparison.go b/query/filter/comparison.go index b1242e5af..a20c4af4b 100644 --- a/query/filter/comparison.go +++ b/query/filter/comparison.go @@ -17,7 +17,7 @@ package filter import ( "fmt" - "github.com/tigrisdata/tigrisdb/value" + "github.com/tigrisdata/tigris/value" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/query/filter/comparison_test.go b/query/filter/comparison_test.go index 93919feac..10d8172a8 100644 --- a/query/filter/comparison_test.go +++ b/query/filter/comparison_test.go @@ -17,7 +17,7 @@ package filter import ( "testing" - "github.com/tigrisdata/tigrisdb/value" + "github.com/tigrisdata/tigris/value" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" diff --git a/query/filter/filter.go b/query/filter/filter.go index 3247f8f40..5010a1f94 100644 --- a/query/filter/filter.go +++ b/query/filter/filter.go @@ -18,11 +18,11 @@ import ( "bytes" "github.com/buger/jsonparser" jsoniter "github.com/json-iterator/go" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/query/expression" - "github.com/tigrisdata/tigrisdb/schema" - ulog "github.com/tigrisdata/tigrisdb/util/log" - "github.com/tigrisdata/tigrisdb/value" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/query/expression" + "github.com/tigrisdata/tigris/schema" + ulog "github.com/tigrisdata/tigris/util/log" + "github.com/tigrisdata/tigris/value" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/query/filter/filter_test.go b/query/filter/filter_test.go index e9510c118..6359e4de0 100644 --- a/query/filter/filter_test.go +++ b/query/filter/filter_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tigrisdata/tigrisdb/schema" + "github.com/tigrisdata/tigris/schema" ) func TestFilterUsingJSON(t *testing.T) { diff --git a/query/filter/key_builder.go b/query/filter/key_builder.go index 2e11f7a4c..2c9b00ab3 100644 --- a/query/filter/key_builder.go +++ b/query/filter/key_builder.go @@ -15,8 +15,8 @@ package filter import ( - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/schema" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/schema" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/query/filter/key_builder_test.go b/query/filter/key_builder_test.go index 1f11b9428..8f2c42d81 100644 --- a/query/filter/key_builder_test.go +++ b/query/filter/key_builder_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/schema" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/schema" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/query/read/fields.go b/query/read/fields.go index d306f282a..dce602c68 100644 --- a/query/read/fields.go +++ b/query/read/fields.go @@ -20,10 +20,10 @@ import ( "github.com/buger/jsonparser" jsoniter "github.com/json-iterator/go" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/query/aggregation" - "github.com/tigrisdata/tigrisdb/query/expression" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/query/aggregation" + "github.com/tigrisdata/tigris/query/expression" + ulog "github.com/tigrisdata/tigris/util/log" "github.com/valyala/bytebufferpool" "google.golang.org/grpc/codes" ) diff --git a/query/update/operator.go b/query/update/operator.go index 9246d1e67..efaac0013 100644 --- a/query/update/operator.go +++ b/query/update/operator.go @@ -20,8 +20,8 @@ import ( "github.com/buger/jsonparser" jsoniter "github.com/json-iterator/go" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc/codes" ) diff --git a/schema/collection.go b/schema/collection.go index 7d2cd8256..20357c1d9 100644 --- a/schema/collection.go +++ b/schema/collection.go @@ -24,7 +24,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/santhosh-tekuri/jsonschema/v5" - api "github.com/tigrisdata/tigrisdb/api/server/v1" + api "github.com/tigrisdata/tigris/api/server/v1" "google.golang.org/grpc/codes" ) diff --git a/schema/fields.go b/schema/fields.go index e7080ab4f..2ca3640cf 100644 --- a/schema/fields.go +++ b/schema/fields.go @@ -18,8 +18,8 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/lib/set" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/lib/set" "google.golang.org/grpc/codes" ) diff --git a/schema/fields_test.go b/schema/fields_test.go index 6a9848358..f16243db7 100644 --- a/schema/fields_test.go +++ b/schema/fields_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" + api "github.com/tigrisdata/tigris/api/server/v1" "google.golang.org/grpc/codes" ) diff --git a/schema/schema.go b/schema/schema.go index 994d19293..110184f09 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -18,8 +18,8 @@ import ( "github.com/buger/jsonparser" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/lib/set" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/lib/set" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/schema/schema_test.go b/schema/schema_test.go index ed32085d3..714aa4424 100644 --- a/schema/schema_test.go +++ b/schema/schema_test.go @@ -20,7 +20,7 @@ import ( "google.golang.org/grpc/codes" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" + api "github.com/tigrisdata/tigris/api/server/v1" ) func TestCreateCollectionFromSchema(t *testing.T) { @@ -36,7 +36,7 @@ func TestCreateCollectionFromSchema(t *testing.T) { t.Run("test_create_failure", func(t *testing.T) { reqSchema := []byte(`{"title":"Record of an order","properties":{"order_id":{"description":"A unique identifier for an order","type":"integer"},"cust_id":{"description":"A unique identifier for a customer","type":"integer"},"product":{"description":"name of the product","type":"string","maxLength":100},"quantity":{"description":"number of products ordered","type":"integer"},"price":{"description":"price of the product","type":"number"}},"primary_key":["cust_id","order_id"]}`) _, err := Build("t1", reqSchema) - require.Equal(t, "collection name is not same as schema name 't1' 'Record of an order'", err.(*api.TigrisDBError).Error()) + require.Equal(t, "collection name is not same as schema name 't1' 'Record of an order'", err.(*api.TigrisError).Error()) }) t.Run("test_supported_types", func(t *testing.T) { schema := []byte(`{ @@ -130,7 +130,7 @@ func TestCreateCollectionFromSchema(t *testing.T) { "primary_key": ["K1"] }`) _, err := Build("t1", schema) - require.Equal(t, "unsupported primary key type detected 'number'", err.(*api.TigrisDBError).Error()) + require.Equal(t, "unsupported primary key type detected 'number'", err.(*api.TigrisError).Error()) }) t.Run("test_complex_types", func(t *testing.T) { schema := []byte(`{ diff --git a/server/config/config.go b/server/config/config.go index 347d4b7c4..3fbf16b8f 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -30,17 +30,17 @@ import ( ) var configPath = []string{ - "/etc/tigrisdata/tigrisdb/", - "$HOME/.tigrisdata/tigrisdb/", + "/etc/tigrisdata/tigris/", + "$HOME/.tigrisdata/tigris/", "./config/", "./", } // envPrefix is used by viper to detect environment variables that should be used. // viper will automatically uppercase this and append _ to it -var envPrefix = "tigrisdb_server" +var envPrefix = "tigris_server" -var envEnv = "tigrisdb_environment" +var envEnv = "tigris_environment" var environment string const ( @@ -127,7 +127,7 @@ func GetTestFDBConfig(path string) (*FoundationDBConfig, error) { LoadEnvironment() // Environment can be set on OS X - fn, exists := os.LookupEnv("TIGRISDB_SERVER_FOUNDATIONDB_CLUSTER_FILE") + fn, exists := os.LookupEnv("TIGRIS_SERVER_FOUNDATIONDB_CLUSTER_FILE") // Use default location when run test in the docker // where cluster file is shared between containers diff --git a/server/config/options.go b/server/config/options.go index 567c2ca95..162627367 100644 --- a/server/config/options.go +++ b/server/config/options.go @@ -17,7 +17,7 @@ package config import ( "time" - "github.com/tigrisdata/tigrisdb/util/log" + "github.com/tigrisdata/tigris/util/log" ) type ServerConfig struct { diff --git a/server/grpc/grpc.go b/server/grpc/grpc.go index 7d96e3a94..d3cd52be6 100644 --- a/server/grpc/grpc.go +++ b/server/grpc/grpc.go @@ -17,9 +17,9 @@ package grpc import ( "github.com/rs/zerolog/log" "github.com/soheilhy/cmux" - "github.com/tigrisdata/tigrisdb/server/config" - middleware "github.com/tigrisdata/tigrisdb/server/midddleware" - "github.com/tigrisdata/tigrisdb/server/types" + "github.com/tigrisdata/tigris/server/config" + middleware "github.com/tigrisdata/tigris/server/midddleware" + "github.com/tigrisdata/tigris/server/types" "google.golang.org/grpc" ) diff --git a/server/http/http.go b/server/http/http.go index 89a99a68d..bda6bae53 100644 --- a/server/http/http.go +++ b/server/http/http.go @@ -17,14 +17,14 @@ package http import ( "net/http" - middleware "github.com/tigrisdata/tigrisdb/server/midddleware" + middleware "github.com/tigrisdata/tigris/server/midddleware" "github.com/fullstorydev/grpchan/inprocgrpc" "github.com/go-chi/chi/v5" "github.com/rs/zerolog/log" "github.com/soheilhy/cmux" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/server/types" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/server/types" ) type Server struct { diff --git a/server/main.go b/server/main.go index 70bfb1c98..46e76663a 100644 --- a/server/main.go +++ b/server/main.go @@ -17,10 +17,10 @@ package main import ( "github.com/rs/zerolog/log" "github.com/spf13/pflag" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/server/muxer" - "github.com/tigrisdata/tigrisdb/store/kv" - ulog "github.com/tigrisdata/tigrisdb/util/log" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/server/muxer" + "github.com/tigrisdata/tigris/store/kv" + ulog "github.com/tigrisdata/tigris/util/log" ) //Version of this build diff --git a/server/metadata/encoding/dictionary.go b/server/metadata/encoding/dictionary.go index 0aabce684..f278c247f 100644 --- a/server/metadata/encoding/dictionary.go +++ b/server/metadata/encoding/dictionary.go @@ -20,14 +20,14 @@ import ( "fmt" "sync" - "github.com/tigrisdata/tigrisdb/internal" + "github.com/tigrisdata/tigris/internal" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" + ulog "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc/codes" ) @@ -42,7 +42,7 @@ import ( // // The second subspace is the "encoding" which is used to assign dictionary encoded values for the database, collection // and any index names. Values assigned are monotonically incremental counter and are local to this cluster and doesn't -// need to be unique across the TigrisDB ecosystem. +// need to be unique across the Tigris ecosystem. // // The structure for encoding subspace looks like below, // ["encoding", 0x01, x, "db", "db-1", "created"] = 0x01 diff --git a/server/metadata/encoding/dictionary_test.go b/server/metadata/encoding/dictionary_test.go index 2d2c45ce6..c8bef97a4 100644 --- a/server/metadata/encoding/dictionary_test.go +++ b/server/metadata/encoding/dictionary_test.go @@ -20,10 +20,10 @@ import ( "time" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" "google.golang.org/grpc/codes" ) diff --git a/server/metadata/encoding/schema.go b/server/metadata/encoding/schema.go index 78d7ee901..1ab53b4d8 100644 --- a/server/metadata/encoding/schema.go +++ b/server/metadata/encoding/schema.go @@ -19,11 +19,11 @@ import ( "sort" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" "google.golang.org/grpc/codes" ) diff --git a/server/metadata/encoding/schema_test.go b/server/metadata/encoding/schema_test.go index b42517f67..04515684e 100644 --- a/server/metadata/encoding/schema_test.go +++ b/server/metadata/encoding/schema_test.go @@ -20,10 +20,10 @@ import ( "time" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" "google.golang.org/grpc/codes" ) diff --git a/server/metadata/key_encoder.go b/server/metadata/key_encoder.go index 062428599..9d0798ca5 100644 --- a/server/metadata/key_encoder.go +++ b/server/metadata/key_encoder.go @@ -15,10 +15,10 @@ package metadata import ( - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/schema" - "github.com/tigrisdata/tigrisdb/server/metadata/encoding" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/schema" + "github.com/tigrisdata/tigris/server/metadata/encoding" "google.golang.org/grpc/codes" ) diff --git a/server/metadata/key_encoder_test.go b/server/metadata/key_encoder_test.go index 2aff12db6..7512df91c 100644 --- a/server/metadata/key_encoder_test.go +++ b/server/metadata/key_encoder_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tigrisdata/tigrisdb/schema" - "github.com/tigrisdata/tigrisdb/server/metadata/encoding" + "github.com/tigrisdata/tigris/schema" + "github.com/tigrisdata/tigris/server/metadata/encoding" ) func TestEncodeKey(t *testing.T) { diff --git a/server/metadata/meta_version.go b/server/metadata/meta_version.go index 363f2d2d2..8ef567cba 100644 --- a/server/metadata/meta_version.go +++ b/server/metadata/meta_version.go @@ -17,7 +17,7 @@ package metadata import ( "context" - "github.com/tigrisdata/tigrisdb/server/transaction" + "github.com/tigrisdata/tigris/server/transaction" ) var ( diff --git a/server/metadata/meta_version_test.go b/server/metadata/meta_version_test.go index 2462f94c9..fdae5aab4 100644 --- a/server/metadata/meta_version_test.go +++ b/server/metadata/meta_version_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" ) func TestMetaVersion(t *testing.T) { diff --git a/server/metadata/tenant.go b/server/metadata/tenant.go index 7b5f8f764..a1f00658d 100644 --- a/server/metadata/tenant.go +++ b/server/metadata/tenant.go @@ -25,11 +25,11 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/schema" - "github.com/tigrisdata/tigrisdb/server/metadata/encoding" - "github.com/tigrisdata/tigrisdb/server/transaction" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/schema" + "github.com/tigrisdata/tigris/server/metadata/encoding" + "github.com/tigrisdata/tigris/server/transaction" + ulog "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc/codes" ) diff --git a/server/metadata/tenant_test.go b/server/metadata/tenant_test.go index 9e2d9aaa5..f4e626bb2 100644 --- a/server/metadata/tenant_test.go +++ b/server/metadata/tenant_test.go @@ -20,12 +20,12 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/schema" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/server/metadata/encoding" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/schema" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/server/metadata/encoding" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" ) func TestTenantManager_CreateTenant(t *testing.T) { @@ -97,7 +97,7 @@ func TestTenantManager_CreateTenant(t *testing.T) { tx, err = tm.StartTxWithoutTracking(ctx) require.NoError(t, err) _, err = m.CreateOrGetTenant(context.TODO(), tx, &TenantNamespace{"ns-test1", 3}) - require.Equal(t, "id is already assigned to 'ns-test1'", err.(*api.TigrisDBError).Error()) + require.Equal(t, "id is already assigned to 'ns-test1'", err.(*api.TigrisError).Error()) require.NoError(t, tx.Commit(context.TODO())) _ = kv.DropTable(ctx, encoding.ReservedSubspaceKey) @@ -117,7 +117,7 @@ func TestTenantManager_CreateTenant(t *testing.T) { tx, err = tm.StartTxWithoutTracking(ctx) require.NoError(t, err) _, err = m.CreateOrGetTenant(ctx, tx, &TenantNamespace{"ns-test2", 2}) - require.Equal(t, "id is already assigned to the namespace 'ns-test1'", err.(*api.TigrisDBError).Error()) + require.Equal(t, "id is already assigned to the namespace 'ns-test1'", err.(*api.TigrisError).Error()) require.NoError(t, tx.Rollback(ctx)) _ = kv.DropTable(ctx, encoding.ReservedSubspaceKey) diff --git a/server/midddleware/auth.go b/server/midddleware/auth.go index d493dc270..b622b6d7c 100644 --- a/server/midddleware/auth.go +++ b/server/midddleware/auth.go @@ -24,8 +24,8 @@ import ( "github.com/auth0/go-jwt-middleware/v2/validator" "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/server/config" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/server/config" "google.golang.org/grpc/codes" ) diff --git a/server/midddleware/auth_test.go b/server/midddleware/auth_test.go index 04e746315..f432c401b 100644 --- a/server/midddleware/auth_test.go +++ b/server/midddleware/auth_test.go @@ -20,9 +20,9 @@ import ( "github.com/auth0/go-jwt-middleware/v2/validator" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/server/config" - "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/server/config" + "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/server/midddleware/middleware.go b/server/midddleware/middleware.go index 831342b2d..e9579968f 100644 --- a/server/midddleware/middleware.go +++ b/server/midddleware/middleware.go @@ -25,7 +25,7 @@ import ( grpc_ratelimit "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/ratelimit" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" "github.com/rs/zerolog/log" - "github.com/tigrisdata/tigrisdb/server/config" + "github.com/tigrisdata/tigris/server/config" "google.golang.org/grpc" ) diff --git a/server/muxer/muxer.go b/server/muxer/muxer.go index dec80a3f5..ccd9c9179 100644 --- a/server/muxer/muxer.go +++ b/server/muxer/muxer.go @@ -20,12 +20,12 @@ import ( "github.com/rs/zerolog/log" "github.com/soheilhy/cmux" - "github.com/tigrisdata/tigrisdb/server/config" - tgrpc "github.com/tigrisdata/tigrisdb/server/grpc" - tHTTP "github.com/tigrisdata/tigrisdb/server/http" - v1 "github.com/tigrisdata/tigrisdb/server/services/v1" - "github.com/tigrisdata/tigrisdb/server/types" - "github.com/tigrisdata/tigrisdb/store/kv" + "github.com/tigrisdata/tigris/server/config" + tgrpc "github.com/tigrisdata/tigris/server/grpc" + tHTTP "github.com/tigrisdata/tigris/server/http" + v1 "github.com/tigrisdata/tigris/server/services/v1" + "github.com/tigrisdata/tigris/server/types" + "github.com/tigrisdata/tigris/store/kv" ) type Server interface { diff --git a/server/services/v1/api.go b/server/services/v1/api.go index 2440c8abf..b57de931a 100644 --- a/server/services/v1/api.go +++ b/server/services/v1/api.go @@ -23,12 +23,12 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" jsoniter "github.com/json-iterator/go" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/cdc" - "github.com/tigrisdata/tigrisdb/server/metadata" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/cdc" + "github.com/tigrisdata/tigris/server/metadata" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" + ulog "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/server/services/v1/health.go b/server/services/v1/health.go index cec85947d..2d4b50ed3 100644 --- a/server/services/v1/health.go +++ b/server/services/v1/health.go @@ -21,7 +21,7 @@ import ( "github.com/fullstorydev/grpchan/inprocgrpc" "github.com/go-chi/chi/v5" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - api "github.com/tigrisdata/tigrisdb/api/server/v1" + api "github.com/tigrisdata/tigris/api/server/v1" "google.golang.org/grpc" ) diff --git a/server/services/v1/query_lifecycle.go b/server/services/v1/query_lifecycle.go index 9cfe47cd7..21454730d 100644 --- a/server/services/v1/query_lifecycle.go +++ b/server/services/v1/query_lifecycle.go @@ -18,11 +18,11 @@ import ( "context" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/cdc" - "github.com/tigrisdata/tigrisdb/server/metadata" - "github.com/tigrisdata/tigrisdb/server/transaction" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/cdc" + "github.com/tigrisdata/tigris/server/metadata" + "github.com/tigrisdata/tigris/server/transaction" + ulog "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc/codes" ) diff --git a/server/services/v1/query_runner.go b/server/services/v1/query_runner.go index 6e5736d7e..17ff19613 100644 --- a/server/services/v1/query_runner.go +++ b/server/services/v1/query_runner.go @@ -22,19 +22,19 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/cdc" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/query/filter" - "github.com/tigrisdata/tigrisdb/query/read" - "github.com/tigrisdata/tigrisdb/query/update" - "github.com/tigrisdata/tigrisdb/schema" - "github.com/tigrisdata/tigrisdb/server/metadata" - "github.com/tigrisdata/tigrisdb/server/transaction" - "github.com/tigrisdata/tigrisdb/store/kv" - ulog "github.com/tigrisdata/tigrisdb/util/log" - "github.com/tigrisdata/tigrisdb/value" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/cdc" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/query/filter" + "github.com/tigrisdata/tigris/query/read" + "github.com/tigrisdata/tigris/query/update" + "github.com/tigrisdata/tigris/schema" + "github.com/tigrisdata/tigris/server/metadata" + "github.com/tigrisdata/tigris/server/transaction" + "github.com/tigrisdata/tigris/store/kv" + ulog "github.com/tigrisdata/tigris/util/log" + "github.com/tigrisdata/tigris/value" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/services/v1/request.go b/server/services/v1/request.go index 509f61055..020874556 100644 --- a/server/services/v1/request.go +++ b/server/services/v1/request.go @@ -15,8 +15,8 @@ package v1 import ( - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/internal" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/internal" ) const ( diff --git a/server/services/v1/service.go b/server/services/v1/service.go index 009c6fcba..eadbdea2d 100644 --- a/server/services/v1/service.go +++ b/server/services/v1/service.go @@ -17,7 +17,7 @@ package v1 import ( "github.com/fullstorydev/grpchan/inprocgrpc" "github.com/go-chi/chi/v5" - "github.com/tigrisdata/tigrisdb/store/kv" + "github.com/tigrisdata/tigris/store/kv" "google.golang.org/grpc" ) diff --git a/server/transaction/manager.go b/server/transaction/manager.go index eaac861c7..6093635df 100644 --- a/server/transaction/manager.go +++ b/server/transaction/manager.go @@ -17,10 +17,10 @@ package transaction import ( "context" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/store/kv" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/store/kv" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/server/transaction/session.go b/server/transaction/session.go index 2d6345de1..d5d747471 100644 --- a/server/transaction/session.go +++ b/server/transaction/session.go @@ -20,10 +20,10 @@ import ( "sync" "github.com/google/uuid" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/keys" - "github.com/tigrisdata/tigrisdb/store/kv" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/keys" + "github.com/tigrisdata/tigris/store/kv" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/store/kv/fdb.go b/store/kv/fdb.go index cfc1278d0..158638cc0 100644 --- a/store/kv/fdb.go +++ b/store/kv/fdb.go @@ -24,9 +24,9 @@ import ( "github.com/apple/foundationdb/bindings/go/src/fdb/subspace" "github.com/apple/foundationdb/bindings/go/src/fdb/tuple" "github.com/rs/zerolog/log" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/server/config" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/server/config" + ulog "github.com/tigrisdata/tigris/util/log" "golang.org/x/xerrors" "google.golang.org/grpc/codes" ) diff --git a/store/kv/kv.go b/store/kv/kv.go index 619141900..a51b2b3cc 100644 --- a/store/kv/kv.go +++ b/store/kv/kv.go @@ -18,8 +18,8 @@ import ( "context" "unsafe" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/server/config" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/server/config" ) type KeyValue struct { diff --git a/store/kv/kv_test.go b/store/kv/kv_test.go index 7634972b7..0b8300429 100644 --- a/store/kv/kv_test.go +++ b/store/kv/kv_test.go @@ -24,10 +24,10 @@ import ( "github.com/apple/foundationdb/bindings/go/src/fdb/subspace" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/internal" - "github.com/tigrisdata/tigrisdb/server/config" - ulog "github.com/tigrisdata/tigrisdb/util/log" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/internal" + "github.com/tigrisdata/tigris/server/config" + ulog "github.com/tigrisdata/tigris/util/log" "google.golang.org/grpc/codes" ) diff --git a/test/config/config.go b/test/config/config.go index 9815ef011..e317d9732 100644 --- a/test/config/config.go +++ b/test/config/config.go @@ -15,7 +15,7 @@ package config import ( - "github.com/tigrisdata/tigrisdb/server/config" + "github.com/tigrisdata/tigris/server/config" ) func GetBaseURL() string { diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml index e577f5a00..eabdd9636 100644 --- a/test/docker/docker-compose.yml +++ b/test/docker/docker-compose.yml @@ -47,7 +47,7 @@ services: environment: # Instruct test to use default location in the docker # instead of test/config/fdb.cluster file when running on the host - - TIGRISDB_ENVIRONMENT=test + - TIGRIS_ENVIRONMENT=test - TEST_PARAM container_name: tigris_test build: diff --git a/test/v1/client/client_test.go b/test/v1/client/client_test.go index 57c5db778..5d63f9c5c 100644 --- a/test/v1/client/client_test.go +++ b/test/v1/client/client_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" api "github.com/tigrisdata/tigris-client-go/api/server/v1" "github.com/tigrisdata/tigris-client-go/driver" - "github.com/tigrisdata/tigrisdb/server/config" + "github.com/tigrisdata/tigris/server/config" "google.golang.org/grpc/codes" ) diff --git a/test/v1/server/collection_test.go b/test/v1/server/collection_test.go index 57e6b8bf3..5d32a1d4b 100644 --- a/test/v1/server/collection_test.go +++ b/test/v1/server/collection_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/suite" - "github.com/tigrisdata/tigrisdb/test/config" + "github.com/tigrisdata/tigris/test/config" "gopkg.in/gavv/httpexpect.v1" ) diff --git a/test/v1/server/database_test.go b/test/v1/server/database_test.go index 5156967dd..86bd607be 100644 --- a/test/v1/server/database_test.go +++ b/test/v1/server/database_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/suite" - "github.com/tigrisdata/tigrisdb/test/config" + "github.com/tigrisdata/tigris/test/config" "gopkg.in/gavv/httpexpect.v1" ) diff --git a/test/v1/server/document_test.go b/test/v1/server/document_test.go index ffe1bf25c..33d64db0c 100644 --- a/test/v1/server/document_test.go +++ b/test/v1/server/document_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/tigrisdata/tigrisdb/test/config" + "github.com/tigrisdata/tigris/test/config" "gopkg.in/gavv/httpexpect.v1" ) diff --git a/value/value.go b/value/value.go index 227036f4b..8be19c8b4 100644 --- a/value/value.go +++ b/value/value.go @@ -20,8 +20,8 @@ import ( "strconv" "github.com/pkg/errors" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/schema" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/schema" "google.golang.org/grpc/codes" ) diff --git a/value/value_test.go b/value/value_test.go index 77b30ffe2..47c3fa0d6 100644 --- a/value/value_test.go +++ b/value/value_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/stretchr/testify/require" - api "github.com/tigrisdata/tigrisdb/api/server/v1" - "github.com/tigrisdata/tigrisdb/schema" + api "github.com/tigrisdata/tigris/api/server/v1" + "github.com/tigrisdata/tigris/schema" "google.golang.org/grpc/codes" ) From 341c966949e9af01baa99b1b781928961433aafa Mon Sep 17 00:00:00 2001 From: Ovais Tariq Date: Tue, 26 Apr 2022 23:06:26 -0700 Subject: [PATCH 3/3] fix: no need to push to ecr repo as it is not being used (#227) --- .github/workflows/push-docker-image.yaml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/push-docker-image.yaml b/.github/workflows/push-docker-image.yaml index a6f3d52ad..ac53f27b3 100644 --- a/.github/workflows/push-docker-image.yaml +++ b/.github/workflows/push-docker-image.yaml @@ -10,18 +10,12 @@ on: types: [published] workflow_call: secrets: - GH_ECR_AWS_ACCESS_KEY_ID: - required: true - GH_ECR_AWS_SECRET_ACCESS_KEY: - required: true GH_DOCKER_ACCESS_USER: required: true GH_DOCKER_ACCESS_TOKEN: required: true env: - AWS_REGION: "us-west-2" - ECR_REPOSITORY: "prod/tigris" DOCKER_REPOSITORY: "tigrisdata/tigris" jobs: @@ -35,13 +29,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.GH_ECR_AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.GH_ECR_AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.AWS_REGION }} - - name: Login to Docker Hub id: login-docker-hub uses: docker/login-action@v1 @@ -49,19 +36,12 @@ jobs: username: ${{ secrets.GH_DOCKER_ACCESS_USER }} password: ${{ secrets.GH_DOCKER_ACCESS_TOKEN }} - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - - name: Docker meta id: meta - env: - ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} uses: docker/metadata-action@v3 with: # list of Docker images to use as base name for tags images: | - ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }} ${{ env.DOCKER_REPOSITORY }} # generate Docker tags based on the following events/attributes # we generate the latest tag off the alpha branch