diff --git a/backup/backup.go b/backup/backup.go index 52ff4a1..01ae711 100644 --- a/backup/backup.go +++ b/backup/backup.go @@ -19,9 +19,9 @@ import ( "encoding/json" "errors" "fmt" - core "github.com/Netcracker/dbaas-adapter-core/pkg/utils" "github.com/Netcracker/dbaas-opensearch-adapter/api" "github.com/Netcracker/dbaas-opensearch-adapter/basic" + core "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/utils" "io" "log/slog" "net/http" diff --git a/basic/basic.go b/basic/basic.go index 77d1b6a..a77fd62 100644 --- a/basic/basic.go +++ b/basic/basic.go @@ -25,10 +25,10 @@ import ( "strings" "sync" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" - core "github.com/Netcracker/dbaas-adapter-core/pkg/utils" "github.com/Netcracker/dbaas-opensearch-adapter/cluster" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" + core "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/utils" "github.com/gorilla/mux" "github.com/opensearch-project/opensearch-go/opensearchapi" ) diff --git a/basic/basic_multiusers_test.go b/basic/basic_multiusers_test.go index 7fafa37..84bee4e 100644 --- a/basic/basic_multiusers_test.go +++ b/basic/basic_multiusers_test.go @@ -16,9 +16,9 @@ package basic import ( "fmt" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/cluster" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/stretchr/testify/assert" "sync" "testing" diff --git a/basic/basic_test.go b/basic/basic_test.go index ff496a2..253187e 100644 --- a/basic/basic_test.go +++ b/basic/basic_test.go @@ -17,9 +17,9 @@ package basic import ( "context" "fmt" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/cluster" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/stretchr/testify/assert" "os" "sync" diff --git a/basic/user.go b/basic/user.go index 685b300..7823914 100644 --- a/basic/user.go +++ b/basic/user.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/api" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/gorilla/mux" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/basic/user_test.go b/basic/user_test.go index 8208743..c54324b 100644 --- a/basic/user_test.go +++ b/basic/user_test.go @@ -16,8 +16,8 @@ package basic import ( "fmt" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/stretchr/testify/assert" "testing" ) diff --git a/common/common.go b/common/common.go index 90be73c..8b809f1 100644 --- a/common/common.go +++ b/common/common.go @@ -27,7 +27,7 @@ import ( "strconv" "strings" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/opensearch-project/opensearch-go/opensearchapi" uuid "github.com/satori/go.uuid" ) diff --git a/go.mod b/go.mod index 0737c34..e2a8880 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/Netcracker/dbaas-opensearch-adapter go 1.22 require ( - github.com/Netcracker/dbaas-adapter-core v0.9.2 + github.com/Netcracker/qubership-dbaas-adapter-core v0.9.3 github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 github.com/opensearch-project/opensearch-go v1.1.0 diff --git a/go.sum b/go.sum index 58cc0ce..22ab34c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/Netcracker/dbaas-adapter-core v0.9.2 h1:r33EatAFAsU6OvcbGeMBb8SRcyMIcjMvYavBkNmuFJ0= -github.com/Netcracker/dbaas-adapter-core v0.9.2/go.mod h1:YQYyF4h0n64r2KX3Ag0Af/dAPmRlv6TQ/qfI+FulFv0= +github.com/Netcracker/qubership-dbaas-adapter-core v0.9.3 h1:9drI9CX71rCTvE5HM+/LRUPwT4Wct20Et1v2SB6wpYU= +github.com/Netcracker/qubership-dbaas-adapter-core v0.9.3/go.mod h1:dEXm/aZmbDHVkkMqmcU901I1akukhL+3y4bPoTWBWFQ= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= diff --git a/physical/physical.go b/physical/physical.go index 95efad1..f390796 100644 --- a/physical/physical.go +++ b/physical/physical.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/basic" cl "github.com/Netcracker/dbaas-opensearch-adapter/client" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/physical/physical_test.go b/physical/physical_test.go index 0be69d4..6aa5637 100644 --- a/physical/physical_test.go +++ b/physical/physical_test.go @@ -19,10 +19,10 @@ import ( "net/http/httptest" "testing" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/basic" cl "github.com/Netcracker/dbaas-opensearch-adapter/client" "github.com/Netcracker/dbaas-opensearch-adapter/common" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/stretchr/testify/assert" ) diff --git a/server/server.go b/server/server.go index 8ddefad..6dbd1f3 100644 --- a/server/server.go +++ b/server/server.go @@ -18,7 +18,6 @@ import ( "context" "crypto/subtle" "fmt" - "github.com/Netcracker/dbaas-adapter-core/pkg/dao" "github.com/Netcracker/dbaas-opensearch-adapter/backup" "github.com/Netcracker/dbaas-opensearch-adapter/basic" cl "github.com/Netcracker/dbaas-opensearch-adapter/client" @@ -26,6 +25,7 @@ import ( "github.com/Netcracker/dbaas-opensearch-adapter/common" "github.com/Netcracker/dbaas-opensearch-adapter/health" "github.com/Netcracker/dbaas-opensearch-adapter/physical" + "github.com/Netcracker/qubership-dbaas-adapter-core/pkg/dao" "github.com/gorilla/handlers" "github.com/gorilla/mux" "net/http"