fix test leaks

Author: adriandole

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

@@ -3233,16 +3233,6 @@ test_kms_tls_options_extra_rejected (void *unused)
    mongoc_client_destroy (keyvault_client);
 }
 
-static mongoc_ssl_opt_t
-make_csfle_ssl_opts (void)
-{
-   /* The failpoint server is pretending to be a KMS server and uses the same certs */
-   mongoc_ssl_opt_t ssl_opts = {0};
-   ssl_opts.ca_file = test_framework_getenv_required ("MONGOC_TEST_CSFLE_TLS_CA_FILE");
-   ssl_opts.pem_file = test_framework_getenv_required ("MONGOC_TEST_CSFLE_TLS_CERTIFICATE_KEY_FILE");
-   return ssl_opts;
-}
-
 static void
 set_retry_failpoint (mongoc_ssl_opt_t *ssl_opts, bool network)
 {
@@ -6155,7 +6145,9 @@ test_kms_retry (void *unused)
    bson_error_t error = {0};
    bson_value_t keyid;
    mongoc_client_encryption_datakey_opts_t *dkopts;
-   mongoc_ssl_opt_t ssl_opts = make_csfle_ssl_opts ();
+   char *ca_file = test_framework_getenv_required ("MONGOC_TEST_CSFLE_TLS_CA_FILE");
+   char *pem_file = test_framework_getenv_required ("MONGOC_TEST_CSFLE_TLS_CERTIFICATE_KEY_FILE");
+   mongoc_ssl_opt_t ssl_opts = {.ca_file = ca_file, .pem_file = pem_file};
    bool res;
 
    bson_value_t to_encrypt = {.value_type = BSON_TYPE_INT32, .value.v_int32 = 1};
@@ -6168,26 +6160,32 @@ test_kms_retry (void *unused)
    mongoc_client_encryption_datakey_opts_set_masterkey (
       dkopts, tmp_bson (BSON_STR ({"region" : "r", "key" : "k", "endpoint" : "127.0.0.1:9003"})));
    res = mongoc_client_encryption_create_datakey (client_encryption, "aws", dkopts, &keyid, &error);
-   ASSERT (res);
+   ASSERT_OR_PRINT (res, error);
 
    set_retry_failpoint (&ssl_opts, false);
    set_retry_failpoint (&ssl_opts, true);
    mongoc_client_encryption_encrypt_opts_set_keyid (encrypt_opts, &keyid);
    res = mongoc_client_encryption_encrypt (client_encryption, &to_encrypt, encrypt_opts, &encrypted_field, &error);
-   ASSERT (res);
+   ASSERT_OR_PRINT (res, error);
+   bson_value_destroy (&keyid);
+   bson_value_destroy (&encrypted_field);
+   mongoc_client_encryption_datakey_opts_destroy (dkopts);
 
    // Azure
    dkopts = mongoc_client_encryption_datakey_opts_new ();
    mongoc_client_encryption_datakey_opts_set_masterkey (
       dkopts, tmp_bson (BSON_STR ({"keyVaultEndpoint" : "127.0.0.1:9003", "keyName" : "foo"})));
    res = mongoc_client_encryption_create_datakey (client_encryption, "azure", dkopts, &keyid, &error);
-   ASSERT (res);
+   ASSERT_OR_PRINT (res, error);
 
    set_retry_failpoint (&ssl_opts, false);
    set_retry_failpoint (&ssl_opts, true);
    mongoc_client_encryption_encrypt_opts_set_keyid (encrypt_opts, &keyid);
    res = mongoc_client_encryption_encrypt (client_encryption, &to_encrypt, encrypt_opts, &encrypted_field, &error);
-   ASSERT (res);
+   ASSERT_OR_PRINT (res, error);
+   bson_value_destroy (&keyid);
+   bson_value_destroy (&encrypted_field);
+   mongoc_client_encryption_datakey_opts_destroy (dkopts);
 
    // GCP
    dkopts = mongoc_client_encryption_datakey_opts_new ();
@@ -6199,13 +6197,22 @@ test_kms_retry (void *unused)
                                                            "endpoint" : "127.0.0.1:9003"
                                                         })));
    res = mongoc_client_encryption_create_datakey (client_encryption, "gcp", dkopts, &keyid, &error);
-   ASSERT (res);
+   ASSERT_OR_PRINT (res, error);
 
    set_retry_failpoint (&ssl_opts, false);
    set_retry_failpoint (&ssl_opts, true);
    mongoc_client_encryption_encrypt_opts_set_keyid (encrypt_opts, &keyid);
    res = mongoc_client_encryption_encrypt (client_encryption, &to_encrypt, encrypt_opts, &encrypted_field, &error);
-   ASSERT (res);
+   ASSERT_OR_PRINT (res, error);
+   bson_value_destroy (&keyid);
+   bson_value_destroy (&encrypted_field);
+   mongoc_client_encryption_datakey_opts_destroy (dkopts);
+
+   bson_free (ca_file);
+   bson_free (pem_file);
+   mongoc_client_encryption_encrypt_opts_destroy (encrypt_opts);
+   mongoc_client_encryption_destroy (client_encryption);
+   mongoc_client_destroy (keyvault_client);
 }
 
 void