Skip to content

GODRIVER-3519 Test sharded clusters with requireApiVersion=1 #1997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2025
Merged

GODRIVER-3519 Test sharded clusters with requireApiVersion=1 #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
845b28b
GODRIVER-3519 Test sharded clusters with requireApiVersion=1
blink1073 Mar 25, 2025
a6654f1
address review
blink1073 Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,6 +1482,23 @@ tasks:
SSL: "nossl"
REQUIRE_API_VERSION: true

- name: "test-sharded-versioned-api"
tags: ["versioned-api"]
commands:
- func: bootstrap-mongo-orchestration
vars:
TOPOLOGY: "sharded_cluster"
AUTH: "auth"
SSL: "nossl"
REQUIRE_API_VERSION: true
- func: start-cse-servers
- func: run-versioned-api-test
vars:
TOPOLOGY: "sharded_cluster"
AUTH: "auth"
SSL: "nossl"
REQUIRE_API_VERSION: true

- name: "test-standalone-versioned-api-test-commands"
tags: ["versioned-api"]
commands:
Expand Down
28 changes: 23 additions & 5 deletions internal/integration/client_side_encryption_prose_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1691,7 +1691,9 @@ func TestClientSideEncryptionProse(t *testing.T) {
assert.Nil(mt, err, "error on CreateCollection: %v", err)
err = mt.Client.Database("keyvault").Collection("datakeys").Drop(context.Background())
assert.Nil(mt, err, "error on Drop: %v", err)
keyVaultClient, err := mongo.Connect(options.Client().ApplyURI(mtest.ClusterURI()))
opts := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(opts)
keyVaultClient, err := mongo.Connect(opts)
assert.Nil(mt, err, "error on Connect: %v", err)
datakeysColl := keyVaultClient.Database("keyvault").Collection("datakeys", options.Collection().SetWriteConcern(mtest.MajorityWc))
_, err = datakeysColl.InsertOne(context.Background(), key1Document)
Expand All @@ -1709,6 +1711,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
SetKmsProviders(fullKmsProvidersMap).
SetBypassQueryAnalysis(true)
co := options.Client().SetAutoEncryptionOptions(aeo).ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(co)
encryptedClient, err := mongo.Connect(co)
assert.Nil(mt, err, "error on Connect: %v", err)
return encryptedClient, clientEncryption
Expand Down Expand Up @@ -2044,6 +2047,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
var keyVaultClient *mongo.Client
{
co := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(co)
keyVaultClient, err = mongo.Connect(co)
defer keyVaultClient.Disconnect(context.Background())
integtest.AddTestServerAPIVersion(co)
Expand Down Expand Up @@ -2086,6 +2090,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
var keyVaultClient *mongo.Client
{
co := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(co)
keyVaultClient, err = mongo.Connect(co)
defer keyVaultClient.Disconnect(context.Background())
integtest.AddTestServerAPIVersion(co)
Expand Down Expand Up @@ -2136,6 +2141,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
var keyVaultClient *mongo.Client
{
co := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(co)
keyVaultClient, err = mongo.Connect(co)
defer keyVaultClient.Disconnect(context.Background())
integtest.AddTestServerAPIVersion(co)
Expand Down Expand Up @@ -2308,6 +2314,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
mt.RunOpts("21. automatic data encryption keys", qeRunOpts, func(mt *mtest.T) {
setup := func() (*mongo.Client, *mongo.ClientEncryption, error) {
opts := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(opts)
client, err := mongo.Connect(opts)
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -2626,7 +2633,9 @@ func TestClientSideEncryptionProse(t *testing.T) {
assert.Nil(mt, err, "error on CreateCollection: %v", err)
err = mt.Client.Database("keyvault").Collection("datakeys").Drop(context.Background())
assert.Nil(mt, err, "error on Drop: %v", err)
keyVaultClient, err := mongo.Connect(options.Client().ApplyURI(mtest.ClusterURI()))
opts := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(opts)
keyVaultClient, err := mongo.Connect(opts)
assert.Nil(mt, err, "error on Connect: %v", err)
datakeysColl := keyVaultClient.Database("keyvault").Collection("datakeys", options.Collection().SetWriteConcern(mtest.MajorityWc))
_, err = datakeysColl.InsertOne(context.Background(), key1Document)
Expand All @@ -2644,6 +2653,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
SetKmsProviders(fullKmsProvidersMap).
SetBypassQueryAnalysis(true)
co := options.Client().SetAutoEncryptionOptions(aeo).ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(co)
encryptedClient, err := mongo.Connect(co)
assert.Nil(mt, err, "error on Connect: %v", err)

Expand Down Expand Up @@ -2933,7 +2943,9 @@ func TestClientSideEncryptionProse(t *testing.T) {

testVal := bson.RawValue{Type: bson.TypeInt32, Value: bsoncore.AppendInt32(nil, 123)}

keyVaultClient, err := mongo.Connect(options.Client().ApplyURI(mtest.ClusterURI()))
opts := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(opts)
keyVaultClient, err := mongo.Connect(opts)
assert.Nil(mt, err, "error on Connect: %v", err)

ceo := options.ClientEncryption().
Expand Down Expand Up @@ -3077,7 +3089,9 @@ func TestClientSideEncryptionProse(t *testing.T) {
for _, tc := range testCases {
for _, dataKey := range dataKeys {
mt.Run(fmt.Sprintf("%s_%s", tc.name, dataKey.provider), func(mt *mtest.T) {
keyVaultClient, err := mongo.Connect(options.Client().ApplyURI(mtest.ClusterURI()))
opts := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(opts)
keyVaultClient, err := mongo.Connect(opts)
require.NoError(mt, err, "error on Connect: %v", err)

ceo := options.ClientEncryption().
Expand Down Expand Up @@ -3110,7 +3124,10 @@ func TestClientSideEncryptionProse(t *testing.T) {

for _, dataKey := range dataKeys {
mt.Run(fmt.Sprintf("Case 3: createDataKey fails after too many retries_%s", dataKey.provider), func(mt *mtest.T) {
keyVaultClient, err := mongo.Connect(options.Client().ApplyURI(mtest.ClusterURI()))
opts := options.Client().ApplyURI(mtest.ClusterURI())
integtest.AddTestServerAPIVersion(opts)
keyVaultClient, err := mongo.Connect(opts)

require.NoError(mt, err, "error on Connect: %v", err)

ceo := options.ClientEncryption().
Expand Down Expand Up @@ -3187,6 +3204,7 @@ func setup(mt *mtest.T, aeo *options.AutoEncryptionOptions, kvClientOpts *option
cpt.cseColl = cpt.cseClient.Database("db").Collection("coll")
}
if ceo != nil {
integtest.AddTestServerAPIVersion(kvClientOpts)
cpt.kvClient, err = mongo.Connect(kvClientOpts)
assert.Nil(mt, err, "Connect error for ClientEncryption key vault client: %v", err)
cpt.clientEnc, err = mongo.NewClientEncryption(cpt.kvClient, ceo)
Expand Down
Loading