Skip to content

Commit 27a824c

Browse files
authored
CDRIVER-5997 speed up CSE endpoint tests (#2001)
* test using .invalid * use `.invalid` in KMS TLS tests * use KMIP for test case 4
1 parent 1e39a8b commit 27a824c

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

src/libmongoc/tests/test-mongoc-client-side-encryption.c

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ _endpoint_setup (mongoc_client_t *keyvault_client,
11421142
"'endpoint': 'doesnotexist.invalid'}}",
11431143
mongoc_test_gcp_email,
11441144
mongoc_test_gcp_privatekey));
1145-
bson_concat (kms_providers_invalid, tmp_bson ("{'kmip': { 'endpoint': 'doesnotexist.local:5698' }}"));
1145+
bson_concat (kms_providers_invalid, tmp_bson ("{'kmip': { 'endpoint': 'doesnotexist.invalid:5698' }}"));
11461146

11471147
client_encryption_opts = mongoc_client_encryption_opts_new ();
11481148
mongoc_client_encryption_opts_set_kms_providers (client_encryption_opts, kms_providers);
@@ -1284,18 +1284,13 @@ test_custom_endpoint (void *unused)
12841284
* included.
12851285
* Expect to fail with socket error */
12861286
_endpoint_setup (keyvault_client, &client_encryption, &client_encryption_invalid);
1287-
masterkey = BCON_NEW ("region",
1288-
"us-east-1",
1289-
"key",
1290-
"arn:aws:kms:us-east-1:579766882180:key/"
1291-
"89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
1292-
"endpoint",
1293-
"kms.us-east-1.amazonaws.com:12345");
1287+
masterkey = BCON_NEW ("keyId", "1", "endpoint", "localhost:12345");
12941288
mongoc_client_encryption_datakey_opts_set_masterkey (datakey_opts, masterkey);
1295-
res = mongoc_client_encryption_create_datakey (client_encryption, "aws", datakey_opts, &keyid, &error);
1289+
res = mongoc_client_encryption_create_datakey (client_encryption, "kmip", datakey_opts, &keyid, &error);
12961290
ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Failed to connect");
12971291
BSON_ASSERT (!res);
12981292
bson_value_destroy (&keyid);
1293+
12991294
bson_destroy (masterkey);
13001295
mongoc_client_encryption_destroy (client_encryption);
13011296
mongoc_client_encryption_destroy (client_encryption_invalid);
@@ -1447,7 +1442,7 @@ test_custom_endpoint (void *unused)
14471442

14481443
/* Case 12: KMIP overriding with invalid endpoint. */
14491444
_endpoint_setup (keyvault_client, &client_encryption, &client_encryption_invalid);
1450-
masterkey = BCON_NEW ("keyId", "1", "endpoint", "doesnotexist.local:5698");
1445+
masterkey = BCON_NEW ("keyId", "1", "endpoint", "doesnotexist.invalid:5698");
14511446
mongoc_client_encryption_datakey_opts_set_masterkey (datakey_opts, masterkey);
14521447
res = mongoc_client_encryption_create_datakey (client_encryption, "kmip", datakey_opts, &keyid, &error);
14531448
ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_NAME_RESOLUTION, "Failed to resolve");
@@ -2940,7 +2935,7 @@ test_kms_tls_options (void *unused)
29402935
memset (&error, 0, sizeof (bson_error_t));
29412936
dkopts = mongoc_client_encryption_datakey_opts_new ();
29422937
mongoc_client_encryption_datakey_opts_set_masterkey (
2943-
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.local', 'keyName': 'foo' }"));
2938+
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.invalid', 'keyName': 'foo' }"));
29442939
res = mongoc_client_encryption_create_datakey (client_encryption_no_client_cert, "azure", dkopts, &keyid, &error);
29452940
ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_SOCKET, "");
29462941
ASSERT (!res);
@@ -2950,7 +2945,7 @@ test_kms_tls_options (void *unused)
29502945
memset (&error, 0, sizeof (bson_error_t));
29512946
dkopts = mongoc_client_encryption_datakey_opts_new ();
29522947
mongoc_client_encryption_datakey_opts_set_masterkey (
2953-
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.local', 'keyName': 'foo' }"));
2948+
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.invalid', 'keyName': 'foo' }"));
29542949
res = mongoc_client_encryption_create_datakey (
29552950
client_encryption_with_names, "azure:no_client_cert", dkopts, &keyid, &error);
29562951
ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_SOCKET, "");
@@ -2961,7 +2956,7 @@ test_kms_tls_options (void *unused)
29612956
memset (&error, 0, sizeof (bson_error_t));
29622957
dkopts = mongoc_client_encryption_datakey_opts_new ();
29632958
mongoc_client_encryption_datakey_opts_set_masterkey (
2964-
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.local', 'keyName': 'foo' }"));
2959+
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.invalid', 'keyName': 'foo' }"));
29652960
res = mongoc_client_encryption_create_datakey (client_encryption_with_tls, "azure", dkopts, &keyid, &error);
29662961
ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION, mongocrypt_errno, "HTTP status=404");
29672962
ASSERT (!res);
@@ -2971,7 +2966,7 @@ test_kms_tls_options (void *unused)
29712966
memset (&error, 0, sizeof (bson_error_t));
29722967
dkopts = mongoc_client_encryption_datakey_opts_new ();
29732968
mongoc_client_encryption_datakey_opts_set_masterkey (
2974-
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.local', 'keyName': 'foo' }"));
2969+
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.invalid', 'keyName': 'foo' }"));
29752970
res =
29762971
mongoc_client_encryption_create_datakey (client_encryption_with_names, "azure:with_tls", dkopts, &keyid, &error);
29772972
ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION, mongocrypt_errno, "HTTP status=404");
@@ -2982,7 +2977,7 @@ test_kms_tls_options (void *unused)
29822977
memset (&error, 0, sizeof (bson_error_t));
29832978
dkopts = mongoc_client_encryption_datakey_opts_new ();
29842979
mongoc_client_encryption_datakey_opts_set_masterkey (
2985-
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.local', 'keyName': 'foo' }"));
2980+
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.invalid', 'keyName': 'foo' }"));
29862981
res = mongoc_client_encryption_create_datakey (client_encryption_expired, "azure", dkopts, &keyid, &error);
29872982
ASSERT_EXPIRED (error);
29882983
ASSERT (!res);
@@ -2992,7 +2987,7 @@ test_kms_tls_options (void *unused)
29922987
memset (&error, 0, sizeof (bson_error_t));
29932988
dkopts = mongoc_client_encryption_datakey_opts_new ();
29942989
mongoc_client_encryption_datakey_opts_set_masterkey (
2995-
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.local', 'keyName': 'foo' }"));
2990+
dkopts, tmp_bson ("{ 'keyVaultEndpoint': 'doesnotexist.invalid', 'keyName': 'foo' }"));
29962991
res = mongoc_client_encryption_create_datakey (client_encryption_invalid_hostname, "azure", dkopts, &keyid, &error);
29972992
ASSERT_INVALID_HOSTNAME (error);
29982993
ASSERT (!res);

0 commit comments

Comments
 (0)