diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index d668c9618..e89c7f3d3 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -2,7 +2,7 @@ - [Getting Started](#getting-started) - [Git Clone OpenSearch Go Client Repository](#git-clone-opensearch-go-client-repository) - [Install Prerequisites](#install-prerequisites) - - [Go 1.20](#go-120) + - [Go 1.21](#go-121) - [Docker](#docker) - [Windows](#windows) - [Unit Testing](#unit-testing) @@ -29,9 +29,9 @@ Fork [opensearch-project/opensearch-go](https://github.com/opensearch-project/op ### Install Prerequisites -#### Go 1.20 +#### Go 1.21 -OpenSearch Go Client builds using [Go](https://go.dev/doc/install) 1.20 at a minimum. +OpenSearch Go Client builds using [Go](https://go.dev/doc/install) 1.21 at a minimum. #### Docker diff --git a/go.mod b/go.mod index d22458194..281fe2e3a 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/opensearch-project/opensearch-go/v3 -go 1.20 +go 1.21 require ( github.com/aws/aws-sdk-go v1.50.36 github.com/aws/aws-sdk-go-v2 v1.26.1 github.com/aws/aws-sdk-go-v2/config v1.27.7 github.com/stretchr/testify v1.9.0 - github.com/wI2L/jsondiff v0.4.0 + github.com/wI2L/jsondiff v0.5.1 golang.org/x/exp v0.0.0-20231006140011-7918f672742d ) @@ -26,5 +26,9 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/tidwall/gjson v1.17.0 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + github.com/tidwall/sjson v1.2.5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 6acd0090a..8578c4ac6 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,17 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/wI2L/jsondiff v0.4.0 h1:iP56F9tK83eiLttg3YdmEENtZnwlYd3ezEpNNnfZVyM= -github.com/wI2L/jsondiff v0.4.0/go.mod h1:nR/vyy1efuDeAtMwc3AF6nZf/2LD1ID8GTyyJ+K8YB0= +github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= +github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= +github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= +github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= +github.com/wI2L/jsondiff v0.5.1 h1:xS4zYUspH4U3IB0Lwo9+jv+MSRJSWMF87Y4BpDbFMHo= +github.com/wI2L/jsondiff v0.5.1/go.mod h1:qqG6hnK0Lsrz2BpIVCxWiK9ItsBCpIZQiv0izJjOZ9s= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/opensearch_integration_test.go b/opensearch_integration_test.go index 5fc1a6675..eea817e86 100644 --- a/opensearch_integration_test.go +++ b/opensearch_integration_test.go @@ -31,7 +31,6 @@ package opensearch_test import ( "context" "crypto/tls" - "github.com/stretchr/testify/require" "log" "net" "net/http" @@ -41,6 +40,8 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/opensearch-project/opensearch-go/v3" ostest "github.com/opensearch-project/opensearch-go/v3/internal/test" "github.com/opensearch-project/opensearch-go/v3/opensearchapi"