DOCSP-47800 Update bson primitive references (#423)

Author: stephmarie17

source/fundamentals/gridfs.txt

@@ -260,7 +260,7 @@ The following example downloads a file and writes to a file buffer:
 
 .. code-block:: go
 
-   id, err := primitive.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
+   id, err := bson.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
    fileBuffer := bytes.NewBuffer(nil)
 
    if _, err := bucket.DownloadToStream(id, fileBuffer); err != nil {
@@ -279,7 +279,7 @@ The following example downloads a file into memory and reads its contents:
 
 .. code-block:: go
 
-   id, err := primitive.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
+   id, err := bson.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
    downloadStream, err := bucket.OpenDownloadStream(id)
    if err != nil {
       panic(err)
@@ -303,7 +303,7 @@ The following example renames a file to ``"mongodbTutorial.zip"``:
 
 .. code-block:: go
 
-   id, err := primitive.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
+   id, err := bson.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
    if err := bucket.Rename(id, "mongodbTutorial.zip"); err != nil {
        panic(err)
    }
@@ -320,7 +320,7 @@ The following example deletes a file:
 
 .. code-block:: go
 
-   id, err := primitive.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
+   id, err := bson.ObjectIDFromHex("62f7bd54a6e4452da13b3e88")
    if err := bucket.Delete(id); err != nil {
       panic(err)
    }

source/includes/fundamentals/code-snippets/CRUD/retrieve.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"go.mongodb.org/mongo-driver/v2/bson"
-	"go.mongodb.org/mongo-driver/v2/bson/primitive"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
@@ -118,7 +117,7 @@ func main() {
 	fmt.Println("\nFind One by ObjectId:\n")
 	{
 		// begin objectid
-		id, err := primitive.ObjectIDFromHex("65170b42b99efdd0b07d42de")
+		id, err := bson.ObjectIDFromHex("65170b42b99efdd0b07d42de")
 		if err != nil {
 			panic(err)
 		}

source/includes/usage-examples/code-snippets/find.go

@@ -10,14 +10,13 @@ import (
 
 	"github.com/joho/godotenv"
 	"go.mongodb.org/mongo-driver/v2/bson"
-	"go.mongodb.org/mongo-driver/v2/bson/primitive"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 // start-restaurant-struct
 type Restaurant struct {
-	ID           primitive.ObjectID `bson:"_id"`
+	ID           bson.ObjectID `bson:"_id"`
 	Name         string
 	RestaurantId string `bson:"restaurant_id"`
 	Cuisine      string

source/includes/usage-examples/code-snippets/findOne.go

@@ -10,14 +10,13 @@ import (
 
 	"github.com/joho/godotenv"
 	"go.mongodb.org/mongo-driver/v2/bson"
-	"go.mongodb.org/mongo-driver/v2/bson/primitive"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 // start-restaurant-struct
 type Restaurant struct {
-	ID           primitive.ObjectID `bson:"_id"`
+	ID           bson.ObjectID `bson:"_id"`
 	Name         string
 	RestaurantId string `bson:"restaurant_id"`
 	Cuisine      string

source/includes/usage-examples/code-snippets/updateOne.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/joho/godotenv"
 	"go.mongodb.org/mongo-driver/v2/bson"
-	"go.mongodb.org/mongo-driver/v2/bson/primitive"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
@@ -36,7 +35,7 @@ func main() {
 
 	// begin updateone
 	coll := client.Database("sample_restaurants").Collection("restaurants")
-	id, _ := primitive.ObjectIDFromHex("5eb3d668b31de5d588f42a7a")
+	id, _ := bson.ObjectIDFromHex("5eb3d668b31de5d588f42a7a")
 	filter := bson.D{{"_id", id}}
 
 	// Creates instructions to add the "avg_rating" field to documents

source/whats-new.txt

@@ -91,6 +91,11 @@ in the {+driver-short+} source code on GitHub.
      Learn more in the :ref:`golang-timeout-setting` section of the
      Connection Options guide.
 
+   - Removal of the ``bson/primitive`` package. This package is now merged with
+     the ``bson`` package. To update your code, remove any ``bson/primitive``
+     import statements and change any instance of ``primitive.ObjectID`` to
+     ``bson.ObjectId``.
+
 This release includes the following improvements and fixes:
 
 - Support for OpenID Connect (OIDC) authentication. To learn more, see