Combine fail and reset

Author: mdb-ad

src/mongocrypt-kms-ctx.c

@@ -1138,7 +1138,7 @@ static bool _is_retryable_req(_kms_request_type_t req_type) {
     return false;
 }
 
-bool mongocrypt_kms_ctx_should_retry_http(mongocrypt_kms_ctx_t *kms) {
+bool mongocrypt_kms_ctx_should_retry(mongocrypt_kms_ctx_t *kms) {
     return kms && kms->should_retry;
 }
 
@@ -1191,6 +1191,10 @@ bool mongocrypt_kms_ctx_feed(mongocrypt_kms_ctx_t *kms, mongocrypt_binary_t *byt
     if (!mongocrypt_status_ok(status)) {
         return false;
     }
+    if (kms->should_retry) {
+        // This happens when a KMS context is reused in-place
+        kms->should_retry = false;
+    }
 
     if (!bytes) {
         CLIENT_ERR("argument 'bytes' is required");

src/mongocrypt.h

@@ -1180,7 +1180,8 @@ MONGOCRYPT_EXPORT
 bool mongocrypt_kms_ctx_feed(mongocrypt_kms_ctx_t *kms, mongocrypt_binary_t *bytes);
 
 /**
- * Indicate a network-level failure.
+ * Indicate a failure. Discards all data fed to this KMS context with @ref mongocrypt_kms_ctx_feed.
+ * The @ref mongocrypt_kms_ctx_t may be reused.
  *
  * @param[in] kms The @ref mongocrypt_kms_ctx_t.
  * @return A boolean indicating whether the failed request may be retried.
@@ -1189,21 +1190,13 @@ MONGOCRYPT_EXPORT
 bool mongocrypt_kms_ctx_fail(mongocrypt_kms_ctx_t *kms);
 
 /**
- * Reset a KMS context allowing it to be retried.
+ * Indicate if a KMS context is completed but should be retried.
  *
  * @param[in] kms The @ref mongocrypt_kms_ctx_t.
+ * @return A boolean indicating whether the failed request should be retried.
  */
 MONGOCRYPT_EXPORT
-void mongocrypt_kms_ctx_reset(mongocrypt_kms_ctx_t *kms);
-
-/**
- * Indicate if a KMS context is completed but should be retried due to an HTTP error.
- *
- * @param[in] kms The @ref mongocrypt_kms_ctx_t.
- * @return A boolean indicating whether the failed request is complete but should be retried.
- */
-MONGOCRYPT_EXPORT
-bool mongocrypt_kms_ctx_should_retry_http(mongocrypt_kms_ctx_t *kms);
+bool mongocrypt_kms_ctx_should_retry(mongocrypt_kms_ctx_t *kms);
 
 /**
  * Get the status associated with a @ref mongocrypt_kms_ctx_t object.

test/test-mongocrypt-datakey.c

@@ -444,8 +444,8 @@ static void _test_create_datakey_with_retry(_mongocrypt_tester_t *tester) {
         // Feed a retryable HTTP error.
         ASSERT_OK(mongocrypt_kms_ctx_feed(kms_ctx, TEST_FILE("./test/data/rmd/kms-decrypt-reply-429.txt")), kms_ctx);
         // In-place retry is indicated.
-        ASSERT(mongocrypt_kms_ctx_should_retry_http(kms_ctx));
-        mongocrypt_kms_ctx_reset(kms_ctx);
+        ASSERT(mongocrypt_kms_ctx_should_retry(kms_ctx));
+        ASSERT(mongocrypt_kms_ctx_fail(kms_ctx));
         // Feed a successful response.
         ASSERT_OK(mongocrypt_kms_ctx_feed(kms_ctx, TEST_FILE("./test/data/kms-aws/encrypt-response.txt")), kms_ctx);
         ASSERT_OK(mongocrypt_ctx_kms_done(ctx), ctx);
@@ -497,8 +497,6 @@ static void _test_create_datakey_with_retry(_mongocrypt_tester_t *tester) {
         ASSERT_CMPINT64(mongocrypt_kms_ctx_usleep(kms_ctx), ==, 0);
         // Mark a network error.
         ASSERT_OK(mongocrypt_kms_ctx_fail(kms_ctx), kms_ctx);
-        // Reset the context.
-        mongocrypt_kms_ctx_reset(kms_ctx);
         // Feed a successful response.
         ASSERT_OK(mongocrypt_kms_ctx_feed(kms_ctx, TEST_FILE("./test/data/kms-aws/encrypt-response.txt")), kms_ctx);
         ASSERT_OK(mongocrypt_ctx_kms_done(ctx), ctx);