Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(deps): migrate to opensearch-go v5 and disable its new node discovery (#21851)

renovate[bot]a046b818380d
diff --git a/backend/plugin/db/elasticsearch/elasticsearch.go b/backend/plugin/db/elasticsearch/elasticsearch.go
index 83ac0a4798..a5301bcf5f 100644
--- a/backend/plugin/db/elasticsearch/elasticsearch.go
+++ b/backend/plugin/db/elasticsearch/elasticsearch.go
@@ -15,9 +15,9 @@ import (
"time"
"github.com/elastic/go-elasticsearch/v7"
- opensearch "github.com/opensearch-project/opensearch-go/v4"
- "github.com/opensearch-project/opensearch-go/v4/opensearchapi"
- "github.com/opensearch-project/opensearch-go/v4/signer/awsv2"
+ opensearch "github.com/opensearch-project/opensearch-go/v5"
+ "github.com/opensearch-project/opensearch-go/v5/opensearchapi"
+ "github.com/opensearch-project/opensearch-go/v5/signer/awsv2"
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/durationpb"
@@ -234,6 +234,13 @@ func openWithOpenSearchClient(ctx context.Context, config db.ConnectionConfig, a
osConfig := opensearch.Config{
Addresses: []string{address},
Transport: baseTransport,
+ // A managed domain fronts its nodes behind one endpoint, so the
+ // addresses the cluster publishes are not reachable from here and
+ // SigV4 is bound to the host we were configured with. Left to its
+ // default the client discovers nodes and routes to those published
+ // addresses instead, abandoning the endpoint.
+ DiscoverNodesOnStart: new(false),
+ DiscoverNodesInterval: -1,
}
// Configure authentication
diff --git a/backend/plugin/db/elasticsearch/sync.go b/backend/plugin/db/elasticsearch/sync.go
index 8b47612a35..ce90100062 100644
--- a/backend/plugin/db/elasticsearch/sync.go
+++ b/backend/plugin/db/elasticsearch/sync.go
@@ -11,7 +11,7 @@ import (
metadatapb "github.com/bytebase/omni/metadata"
"github.com/elastic/go-elasticsearch/v7/esapi"
- "github.com/opensearch-project/opensearch-go/v4/opensearchapi"
+ "github.com/opensearch-project/opensearch-go/v5/opensearchapi"
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/common"
@@ -128,22 +128,21 @@ func (d *Driver) getHiddenIndices(ctx context.Context) (map[string]bool, error)
hiddenIndices := make(map[string]bool)
if d.isOpenSearch && d.opensearchAPI != nil {
- resp, err := d.opensearchAPI.Indices.Settings.Get(ctx, &opensearchapi.SettingsGetReq{
- Indices: []string{"*"},
- Settings: []string{"index.hidden"},
- Params: opensearchapi.SettingsGetParams{
- ExpandWildcards: "open,hidden",
+ resp, err := d.opensearchAPI.Indices.GetSettings(ctx, &opensearchapi.IndicesGetSettingsReq{
+ Indices: []string{"*"},
+ Name: []string{"index.hidden"},
+ Params: &opensearchapi.IndicesGetSettingsParams{
+ ExpandWildcards: []string{"open", "hidden"},
},
})
if err != nil {
return nil, errors.Wrapf(err, "failed to get index settings")
}
- for indexName, indexData := range resp.GetIndices() {
- var settings IndexSettingsResult
- if err := json.Unmarshal(indexData.Settings, &settings.Settings); err != nil {
+ for indexName, indexState := range resp.Entries {
+ if indexState.Settings == nil || indexState.Settings.Index == nil {
continue
}
- if settings.Settings.Index.Hidden == "true" {
+ if hidden := indexState.Settings.Index.Hidden; hidden != nil && *hidden == "true" {
hiddenIndices[indexName] = true
}
}
@@ -218,8 +217,8 @@ func (d *Driver) getIndices(ctx context.Context) ([]*metadatapb.TableMetadata, e
return nil, errors.Wrapf(err, "failed to list indices")
}
- for _, idx := range resp.Indices {
- if hiddenIndices[idx.Index] {
+ for _, idx := range resp.Records {
+ if idx.Index == nil || hiddenIndices[*idx.Index] {
continue
}
@@ -233,11 +232,14 @@ func (d *Driver) getIndices(ctx context.Context) ([]*metadatapb.TableMetadata, e
var docCount int64
if idx.DocsCount != nil {
- docCount = int64(*idx.DocsCount)
+ docCount, err = parseDocCount(*idx.DocsCount)
+ if err != nil {
+ return nil, err
+ }
}
indicesMetadata = append(indicesMetadata, &metadatapb.TableMetadata{
- Name: idx.Index,
+ Name: *idx.Index,
DataSize: datasize,
RowCount: docCount,
})
diff --git a/go.mod b/go.mod
index ed3e13d4b0..0ccbb9edb2 100644
--- a/go.mod
+++ b/go.mod
@@ -73,7 +73,7 @@ require (
github.com/modelcontextprotocol/go-sdk v1.8.0
github.com/nyaruka/phonenumbers/v2 v2.0.16
github.com/openark/golib v0.0.0-20210531070646-355f37940af8
- github.com/opensearch-project/opensearch-go/v4 v4.8.1
+ github.com/opensearch-project/opensearch-go/v5 v5.1.3
github.com/paulmach/orb v0.14.0
github.com/pb33f/libopenapi v0.42.3
github.com/pingcap/tidb v1.1.0-beta.0.20241125141335-ec8b81b98edc
@@ -307,6 +307,7 @@ require (
github.com/richardlehane/mscfb v1.0.9 // indirect
github.com/richardlehane/msoleps v1.0.6 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
+ github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/segmentio/asm v1.2.1 // indirect
diff --git a/go.sum b/go.sum
index e54f39a0b6..dd01783dc2 100644
--- a/go.sum
+++ b/go.sum
@@ -771,8 +771,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opensearch-project/opensearch-go/v4 v4.8.1 h1:9r9x+pt5QG49EZfG0bqQgCexFcQkeMkVGM54dpX0b9Q=
-github.com/opensearch-project/opensearch-go/v4 v4.8.1/go.mod h1:OEBTtFm2ZeJ8G/ZbE3ITbKuKlT+9ujruJF3Vj5LBMqo=
+github.com/opensearch-project/opensearch-go/v5 v5.1.3 h1:vAjUZ9iCQ7gqOEo8XAnwafLt6cDTuQfCM2KK0LOri08=
+github.com/opensearch-project/opensearch-go/v5 v5.1.3/go.mod h1:VKWkTG+A9Kjq5mqkxb/IlN+6rWH8C46rwzw9dHRti+U=
github.com/opentracing/basictracer-go v1.1.0 h1:Oa1fTSBvAl8pa3U+IJYqrKm0NALwH9OsgwOqDv4xJW0=
github.com/opentracing/basictracer-go v1.1.0/go.mod h1:V2HZueSJEp879yv285Aap1BS69fQMD+MNP1mRs6mBQc=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -874,6 +874,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 h1:18kd+8ZUlt/ARXhljq+14TwAoKa61q6dX8jtwOf6DH8=
+github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
@@ -964,8 +966,8 @@ github.com/the42/cartconvert v0.0.0-20131203171324-aae784c392b8 h1:I4DY8wLxJXCrM
github.com/the42/cartconvert v0.0.0-20131203171324-aae784c392b8/go.mod h1:fWO/msnJVhHqN1yX6OBoxSyfj7TEj1hHiL8bJSQsK30=
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
-github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
-github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
+github.com/tidwall/gjson v1.20.0 h1:+agJ3rEzKcCXKDKo0ml26UROcpcAlnZyjq+TjbY5Fto=
+github.com/tidwall/gjson v1.20.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.2.2 h1:dz1jrRuE7or/74V490B4/GP1pZm5WKlt2bgCP5A83w8=