CDRIVER-2959 fix 'validate' for bulk insert

kevinAlbs · kevinAlbs · commit 5f5e804a76c8 · 2019-02-11T18:34:19.000-05:00
diff --git a/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h b/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
@@ -49,11 +49,6 @@ _mongoc_bulk_operation_new (mongoc_client_t *client,
                             const mongoc_write_concern_t *write_concern);
 
 
-bson_validate_flags_t
-_mongoc_bulk_operation_parse_vflags (const bson_t *opts,
-                                     bson_validate_flags_t default_vflags);
-
-
 BSON_END_DECLS
 
 
diff --git a/src/libmongoc/src/mongoc/mongoc-bulk-operation.c b/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
@@ -380,7 +380,7 @@ mongoc_bulk_operation_insert_with_opts (mongoc_bulk_operation_t *bulk,
    _mongoc_write_command_init_insert (
       &command,
       document,
-      opts,
+      &insert_opts.extra,
       bulk->flags,
       bulk->operation_id,
       !mongoc_write_concern_is_acknowledged (bulk->write_concern));
@@ -574,7 +574,7 @@ mongoc_bulk_operation_update (mongoc_bulk_operation_t *bulk,
    }
 
    if (!mongoc_bulk_operation_update_many_with_opts (
-         bulk, selector, document, &opts, error)) {
+          bulk, selector, document, &opts, error)) {
       MONGOC_WARNING ("%s", error->message);
    }
 
diff --git a/src/libmongoc/tests/test-mongoc-bulk.c b/src/libmongoc/tests/test-mongoc-bulk.c
@@ -847,37 +847,60 @@ test_update_with_opts_validate (void)
    mongoc_collection_t *collection;
    mongoc_bulk_operation_t *bulk;
    bson_error_t error;
+   update_with_opts_fn fns[] = {
+      mongoc_bulk_operation_update_one_with_opts,
+      mongoc_bulk_operation_update_many_with_opts,
+   };
+   int i;
 
    client = test_framework_client_new ();
    collection = get_test_collection (client, "test_update_with_opts_validate");
-   bulk = mongoc_collection_create_bulk_operation_with_opts (collection, NULL);
 
-   BSON_ASSERT (!mongoc_bulk_operation_update_one_with_opts (
-      bulk, tmp_bson ("{}"), tmp_bson ("{'a.a': 1}"), NULL, &error));
-   ASSERT_ERROR_CONTAINS (error,
-                          MONGOC_ERROR_COMMAND,
-                          MONGOC_ERROR_COMMAND_INVALID_ARG,
-                          "update only works with $ operators");
+   for (i = 0; i < 2; i++) {
+      update_with_opts_fn update_function;
 
-   BSON_ASSERT (mongoc_bulk_operation_update_one_with_opts (
-      bulk,
-      tmp_bson ("{}"),
-      tmp_bson ("{'a.a': 1}"),
-      tmp_bson ("{'validate': %d}", BSON_VALIDATE_NONE),
-      &error));
-   BSON_ASSERT (!mongoc_bulk_operation_update_one_with_opts (
-      bulk,
-      tmp_bson ("{}"),
-      tmp_bson ("{'a.a': 1}"),
-      tmp_bson ("{'validate': %d}", BSON_VALIDATE_DOT_KEYS),
-      &error));
-   ASSERT_ERROR_CONTAINS (
-      error,
-      MONGOC_ERROR_COMMAND,
-      MONGOC_ERROR_COMMAND_INVALID_ARG,
-      "invalid argument for update: keys cannot contain \".\": \"a.a\"");
+      update_function = fns[i];
+      bulk =
+         mongoc_collection_create_bulk_operation_with_opts (collection, NULL);
+      BSON_ASSERT (!update_function (
+         bulk, tmp_bson ("{}"), tmp_bson ("{'a.a': 1}"), NULL, &error));
+      ASSERT_ERROR_CONTAINS (error,
+                             MONGOC_ERROR_COMMAND,
+                             MONGOC_ERROR_COMMAND_INVALID_ARG,
+                             "update only works with $ operators");
+
+      BSON_ASSERT (update_function (bulk,
+                              tmp_bson ("{}"),
+                              tmp_bson ("{'a.a': 1}"),
+                              tmp_bson ("{'validate': %d}", BSON_VALIDATE_NONE),
+                              &error));
+      BSON_ASSERT (
+         !update_function (bulk,
+                     tmp_bson ("{}"),
+                     tmp_bson ("{'a.a': 1}"),
+                     tmp_bson ("{'validate': %d}", BSON_VALIDATE_DOT_KEYS),
+                     &error));
+      ASSERT_ERROR_CONTAINS (
+         error,
+         MONGOC_ERROR_COMMAND,
+         MONGOC_ERROR_COMMAND_INVALID_ARG,
+         "invalid argument for update: keys cannot contain \".\": \"a.a\"");
+      mongoc_bulk_operation_destroy (bulk);
+
+      /* Test a valid update_one with explicit validation on the server. */
+      bulk =
+         mongoc_collection_create_bulk_operation_with_opts (collection, NULL);
+      BSON_ASSERT (
+         update_function (bulk,
+                    tmp_bson ("{}"),
+                    tmp_bson ("{'$set': {'a': 1}}"),
+                    tmp_bson ("{'validate': %d}", BSON_VALIDATE_DOT_KEYS),
+                    &error));
+      ASSERT_OR_PRINT (mongoc_bulk_operation_execute (bulk, NULL, &error),
+                       error);
+      mongoc_bulk_operation_destroy (bulk);
+   }
 
-   mongoc_bulk_operation_destroy (bulk);
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (client);
 }
@@ -1206,6 +1229,18 @@ test_replace_one_with_opts_validate (void)
       "invalid argument for replace: keys cannot contain \".\": \"a.a\"");
 
    mongoc_bulk_operation_destroy (bulk);
+
+   /* Test a valid replace_one with explicit validation on the server. */
+   bulk = mongoc_collection_create_bulk_operation_with_opts (collection, NULL);
+   BSON_ASSERT (mongoc_bulk_operation_replace_one_with_opts (
+      bulk,
+      tmp_bson ("{}"),
+      tmp_bson ("{'a': 1}"),
+      tmp_bson ("{'validate': %d}", BSON_VALIDATE_DOT_KEYS),
+      &error));
+   ASSERT_OR_PRINT (mongoc_bulk_operation_execute (bulk, NULL, &error), error);
+   mongoc_bulk_operation_destroy (bulk);
+
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (client);
 }
@@ -1987,6 +2022,17 @@ test_insert_with_opts_validate (void)
       "invalid document for insert: keys cannot contain \".\": \"a.a\"");
 
    mongoc_bulk_operation_destroy (bulk);
+
+   /* Test a valid insert with explicit validation on the server. */
+   bulk = mongoc_collection_create_bulk_operation_with_opts (collection, NULL);
+   BSON_ASSERT (mongoc_bulk_operation_insert_with_opts (
+      bulk,
+      tmp_bson ("{'a': 1}"),
+      tmp_bson ("{'validate': %d}", BSON_VALIDATE_DOT_KEYS),
+      &error));
+   ASSERT_OR_PRINT (mongoc_bulk_operation_execute (bulk, NULL, &error), error);
+   mongoc_bulk_operation_destroy (bulk);
+
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (client);
 }
diff --git a/src/libmongoc/tests/test-mongoc-collection.c b/src/libmongoc/tests/test-mongoc-collection.c
@@ -3780,10 +3780,65 @@ _test_insert_validate (insert_fn_t insert_fn)
                            tmp_bson ("{'validate': 0}"),
                            &error));
 
+   BSON_ASSERT (insert_fn (collection,
+                           tmp_bson ("{'a': 1}"),
+                           tmp_bson ("{'validate': 31}"),
+                           &error));
+
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (client);
 }
 
+static void
+test_insert_bulk_validate (void)
+{
+   mongoc_client_t *client;
+   mongoc_collection_t *collection;
+   bson_error_t error;
+   const bson_t *docs[] = {tmp_bson ("{'a': 1}"), tmp_bson ("{'$': 2}")};
+
+   BEGIN_IGNORE_DEPRECATIONS
+   client = test_framework_client_new ();
+   mongoc_client_set_error_api (client, 2);
+   collection = get_test_collection (client, "test_insert_validate");
+
+   /* Invalid documents, validation. */
+   BSON_ASSERT (!mongoc_collection_insert_bulk (collection,
+                                                MONGOC_INSERT_NONE,
+                                                docs,
+                                                2,
+                                                NULL /* write concern */,
+                                                &error));
+   ASSERT_ERROR_CONTAINS (error,
+                          MONGOC_ERROR_COMMAND,
+                          MONGOC_ERROR_COMMAND_INVALID_ARG,
+                          "invalid document");
+
+   /* Invalid documents, no validation. */
+   BSON_ASSERT (!mongoc_collection_insert_bulk (
+      collection,
+      (mongoc_insert_flags_t) MONGOC_INSERT_NO_VALIDATE,
+      docs,
+      2,
+      NULL /* write concern */,
+      &error));
+   ASSERT_CMPUINT32 (error.domain, ==, (uint32_t) MONGOC_ERROR_SERVER);
+
+   /* Valid document, validation. */
+   ASSERT_OR_PRINT (
+      mongoc_collection_insert_bulk (collection,
+                                     MONGOC_INSERT_NONE,
+                                     docs,
+                                     1 /* don't include invalid second doc. */,
+                                     NULL /* write concern */,
+                                     &error),
+      error);
+
+   mongoc_collection_destroy (collection);
+   mongoc_client_destroy (client);
+   END_IGNORE_DEPRECATIONS
+}
+
 
 static void
 test_insert_one_validate (void)
@@ -5341,7 +5396,7 @@ _test_update_validate (update_fn_t update_fn)
    mongoc_client_t *client;
    mongoc_collection_t *collection;
    bson_t *selector;
-   bson_t *update;
+   bson_t *invalid_update, *valid_update;
    const char *msg;
    bson_error_t error;
    bool r;
@@ -5353,21 +5408,26 @@ _test_update_validate (update_fn_t update_fn)
 
    if (update_fn == mongoc_collection_replace_one) {
       /* prohibited for replace */
-      update = tmp_bson ("{'$set': {'x': 1}}");
+      invalid_update = tmp_bson ("{'$set': {'x': 1}}");
+      /* permitted for replace */
+      valid_update = tmp_bson ("{'x': 1}");
       msg = "invalid argument for replace";
    } else {
       /* prohibited for update */
-      update = tmp_bson ("{'x': 1}");
+      invalid_update = tmp_bson ("{'x': 1}");
+      /* permitted for update */
+      valid_update = tmp_bson ("{'$set': {'x': 1}}");
       msg = "only works with $ operators";
    }
 
-   BSON_ASSERT (!update_fn (collection, selector, update, NULL, NULL, &error));
+   BSON_ASSERT (
+      !update_fn (collection, selector, invalid_update, NULL, NULL, &error));
    ASSERT_ERROR_CONTAINS (
       error, MONGOC_ERROR_COMMAND, MONGOC_ERROR_COMMAND_INVALID_ARG, msg);
 
    r = update_fn (collection,
                   selector,
-                  update,
+                  invalid_update,
                   tmp_bson ("{'validate': false}"),
                   NULL,
                   &error);
@@ -5379,7 +5439,7 @@ _test_update_validate (update_fn_t update_fn)
 
    BSON_ASSERT (!update_fn (collection,
                             selector,
-                            update,
+                            invalid_update,
                             tmp_bson ("{'validate': 'foo'}"),
                             NULL,
                             &error));
@@ -5391,13 +5451,23 @@ _test_update_validate (update_fn_t update_fn)
    /* Set all validation flags */
    BSON_ASSERT (!update_fn (collection,
                             selector,
-                            update,
+                            invalid_update,
                             tmp_bson ("{'validate': 31}"),
                             NULL,
                             &error));
    ASSERT_ERROR_CONTAINS (
       error, MONGOC_ERROR_COMMAND, MONGOC_ERROR_COMMAND_INVALID_ARG, msg);
 
+   /* Check that validation passes for a valid update. */
+   ASSERT_OR_PRINT (
+      update_fn (collection,
+                 selector,
+                 valid_update,
+                 tmp_bson ("{'validate': %d}", BSON_VALIDATE_UTF8),
+                 NULL,
+                 &error),
+      error);
+
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (client);
 }
@@ -5942,4 +6012,6 @@ test_collection_install (TestSuite *suite)
    TestSuite_AddLive (suite,
                       "/Collection/estimated_document_count_live",
                       test_estimated_document_count_live);
+   TestSuite_AddLive (
+      suite, "/Collection/insert_bulk_validate", test_insert_bulk_validate);
 }
