Skip to content

Commit 2fd17ef

Browse files
committed
Merge branch 'master' of github.com:zhouselena/mongo-go-driver into GODRIVER-3399
2 parents 7f6ed4d + bcf7b14 commit 2fd17ef

File tree

9 files changed

+55
-121
lines changed

9 files changed

+55
-121
lines changed

bson/doc.go

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,14 @@
44
// not use this file except in compliance with the License. You may obtain
55
// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
66

7-
// Package bson is a library for reading, writing, and manipulating BSON. BSON is a binary serialization format used to
8-
// store documents and make remote procedure calls in MongoDB. The BSON specification is located at https://bsonspec.org.
9-
// The BSON library handles marshaling and unmarshaling of values through a configurable codec system. For a description
10-
// of the codec system and examples of registering custom codecs, see the bsoncodec package. For additional information
11-
// and usage examples, check out the [Work with BSON] page in the Go Driver docs site.
12-
//
13-
// # Raw BSON
14-
//
15-
// The Raw family of types is used to validate and retrieve elements from a slice of bytes. This
16-
// type is most useful when you want do lookups on BSON bytes without unmarshaling it into another
17-
// type.
18-
//
19-
// Example:
20-
//
21-
// var raw bson.Raw = ... // bytes from somewhere
22-
// err := raw.Validate()
23-
// if err != nil { return err }
24-
// val := raw.Lookup("foo")
25-
// i32, ok := val.Int32OK()
26-
// // do something with i32...
7+
// Package bson is a library for reading, writing, and manipulating BSON. BSON is a binary serialization
8+
// format used to store documents and make remote procedure calls in MongoDB. For more information about
9+
// the Go BSON library, including usage examples, check out the [Work with BSON] page in the Go Driver
10+
// docs site. For more information about BSON, see https://bsonspec.org.
2711
//
2812
// # Native Go Types
2913
//
30-
// The D and M types defined in this package can be used to build representations of BSON using native Go types. D is a
14+
// The [D] and [M] types defined in this package can be used to build representations of BSON using native Go types. D is a
3115
// slice and M is a map. For more information about the use cases for these types, see the documentation on the type
3216
// definitions.
3317
//
@@ -93,26 +77,16 @@
9377
// 5. When unmarshaling, a field of type interface{} will follow the D/M type mappings listed above. BSON documents
9478
// unmarshaled into an interface{} field will be unmarshaled as a D.
9579
//
96-
// The encoding of each struct field can be customized by the "bson" struct tag.
97-
//
98-
// This tag behavior is configurable, and different struct tag behavior can be configured by initializing a new
99-
// bsoncodec.StructCodec with the desired tag parser and registering that StructCodec onto the Registry. By default, JSON
100-
// tags are not honored, but that can be enabled by creating a StructCodec with JSONFallbackStructTagParser, like below:
101-
//
102-
// Example:
103-
//
104-
// structcodec, _ := bsoncodec.NewStructCodec(bsoncodec.JSONFallbackStructTagParser)
105-
//
106-
// The bson tag gives the name of the field, possibly followed by a comma-separated list of options.
107-
// The name may be empty in order to specify options without overriding the default field name. The following options can
108-
// be used to configure behavior:
80+
// The encoding of each struct field can be customized by the "bson" struct tag. The "bson" tag gives the name of the
81+
// field, followed by a comma-separated list of options. The name may be omitted in order to specify options without
82+
// overriding the default field name. The following options can be used to configure behavior:
10983
//
11084
// 1. omitempty: If the "omitempty" struct tag is specified on a field, the field will not be marshaled if it is set to
11185
// an "empty" value. Numbers, booleans, and strings are considered empty if their value is equal to the zero value for
11286
// the type (i.e. 0 for numbers, false for booleans, and "" for strings). Slices, maps, and arrays are considered
11387
// empty if they are of length zero. Interfaces and pointers are considered empty if their value is nil. By default,
114-
// structs are only considered empty if the struct type implements [bsoncodec.Zeroer] and the IsZero
115-
// method returns true. Struct types that do not implement [bsoncodec.Zeroer] are never considered empty and will be
88+
// structs are only considered empty if the struct type implements [Zeroer] and the "IsZero"
89+
// method returns true. Struct types that do not implement [Zeroer] are never considered empty and will be
11690
// marshaled as embedded documents. NOTE: It is recommended that this tag be used for all slice and map fields.
11791
//
11892
// 2. minsize: If the minsize struct tag is specified on a field of type int64, uint, uint32, or uint64 and the value of
@@ -134,22 +108,34 @@
134108
// error will be returned. This tag can be used with fields that are pointers to structs. If an inlined pointer field
135109
// is nil, it will not be marshaled. For fields that are not maps or structs, this tag is ignored.
136110
//
137-
// # Marshaling and Unmarshaling
111+
// # Raw BSON
138112
//
139-
// Manually marshaling and unmarshaling can be done with the Marshal and Unmarshal family of functions.
113+
// The Raw family of types is used to validate and retrieve elements from a slice of bytes. This
114+
// type is most useful when you want do lookups on BSON bytes without unmarshaling it into another
115+
// type.
140116
//
141-
// bsoncodec code provides a system for encoding values to BSON representations and decoding
142-
// values from BSON representations. This package considers both binary BSON and ExtendedJSON as
143-
// BSON representations. The types in this package enable a flexible system for handling this
144-
// encoding and decoding.
117+
// Example:
145118
//
146-
// The codec system is composed of two parts:
119+
// var raw bson.Raw = ... // bytes from somewhere
120+
// err := raw.Validate()
121+
// if err != nil { return err }
122+
// val := raw.Lookup("foo")
123+
// i32, ok := val.Int32OK()
124+
// // do something with i32...
125+
//
126+
// # Custom Registry
127+
//
128+
// The Go BSON library uses a [Registry] to define encoding and decoding behavior for different data types.
129+
// The default encoding and decoding behavior can be customized or extended by using a modified Registry.
130+
// The custom registry system is composed of two parts:
147131
//
148132
// 1) [ValueEncoder] and [ValueDecoder] that handle encoding and decoding Go values to and from BSON
149133
// representations.
150134
//
151135
// 2) A [Registry] that holds these ValueEncoders and ValueDecoders and provides methods for
152136
// retrieving them.
153137
//
138+
// To use a custom Registry, use [Encoder.SetRegistry] or [Decoder.SetRegistry].
139+
//
154140
// [Work with BSON]: https://www.mongodb.com/docs/drivers/go/current/fundamentals/bson/
155141
package bson

internal/integtest/integtest.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ func AddServerlessAuthCredentials(uri string) (string, error) {
223223

224224
// ConnString gets the globally configured connection string.
225225
func ConnString(t *testing.T) *connstring.ConnString {
226+
if testing.Short() {
227+
t.Skip("skipping integration test in short mode")
228+
}
229+
226230
connectionStringOnce.Do(func() {
227231
uri, err := MongoDBURI()
228232
require.NoError(t, err, "error constructing mongodb URI: %v", err)

internal/test/aws/aws_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import (
2020

2121
func TestAWS(t *testing.T) {
2222
uri := os.Getenv("MONGODB_URI")
23+
if uri == "" {
24+
t.Skip("Skipping test: MONGODB_URI environment variable is not set")
25+
}
2326

2427
client, err := mongo.Connect(options.Client().ApplyURI(uri))
25-
require.NoError(t, err, "Connect error")
2628

2729
defer func() {
2830
err = client.Disconnect(context.Background())

internal/test/compilecheck/compile_check_test.go

Lines changed: 10 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,38 @@ package main
88

99
import (
1010
"context"
11-
"encoding/json"
1211
"fmt"
1312
"io"
14-
"net/http"
1513
"os"
1614
"path/filepath"
17-
"strings"
1815
"testing"
1916

2017
"github.com/stretchr/testify/assert"
2118
"github.com/stretchr/testify/require"
2219
"github.com/testcontainers/testcontainers-go"
23-
"golang.org/x/mod/semver"
2420
)
2521

2622
// TODO(GODRIVER-3515): This module cannot be included in the workspace since it
2723
// requires a version of klauspost/compress that is not compatible with the Go
2824
// Driver. Must use GOWORK=off to run this test.
2925

30-
const minSupportedVersion = "1.19"
26+
// TODO(GODRIVER-3592): Add "1.25" to the list when Go 1.25 is released.
27+
// Estimated release date is August 2025.
28+
var versions = []string{
29+
"1.19",
30+
"1.20",
31+
"1.21",
32+
"1.22",
33+
"1.23",
34+
"1.24",
35+
}
3136

3237
func TestCompileCheck(t *testing.T) {
3338
cwd, err := os.Getwd()
3439
require.NoError(t, err)
3540

3641
rootDir := filepath.Dir(filepath.Dir(filepath.Dir(cwd)))
3742

38-
versions, err := getDockerGolangImages()
39-
require.NoError(t, err)
40-
4143
for _, version := range versions {
4244
version := version // Capture range variable.
4345

@@ -85,67 +87,3 @@ func TestCompileCheck(t *testing.T) {
8587
})
8688
}
8789
}
88-
89-
// getDockerGolangImages retrieves the available Golang Docker image tags from
90-
// Docker Hub that are considered valid and meet the specified version
91-
// condition. It returns a slice of version strings in the MajorMinor format and
92-
// an error, if any.
93-
func getDockerGolangImages() ([]string, error) {
94-
// URL to fetch the Golang tags from Docker Hub with a page size of 100
95-
// records.
96-
var url = "https://hub.docker.com/v2/repositories/library/golang/tags?page_size=100"
97-
98-
versionSet := map[string]bool{}
99-
versions := []string{}
100-
101-
// Iteratively fetch and process tags from Docker Hub as long as there is a
102-
// valid next page URL.
103-
for url != "" {
104-
resp, err := http.Get(url)
105-
if err != nil {
106-
return nil, fmt.Errorf("failed to get response from Docker Hub: %w", err)
107-
}
108-
109-
var data struct {
110-
Results []struct {
111-
Name string `json:"name"`
112-
} `json:"results"`
113-
Next string `json:"next"` // URL of the next page for pagination.
114-
}
115-
116-
if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
117-
resp.Body.Close()
118-
119-
return nil, fmt.Errorf("failed to decode response Body from Docker Hub: %w", err)
120-
}
121-
122-
resp.Body.Close()
123-
124-
for _, tag := range data.Results {
125-
// Skip tags that don't start with a digit (typically version numbers).
126-
if len(tag.Name) == 0 || tag.Name[0] < '0' || tag.Name[0] > '9' {
127-
continue
128-
}
129-
130-
// Split the tag name and extract the base version part.
131-
// This handles tags like `1.18.1-alpine` by extracting `1.18.1`.
132-
base := strings.Split(tag.Name, "-")[0]
133-
134-
// Reduce the base version to MajorMinor format (e.g., `v1.18`).
135-
baseMajMin := semver.MajorMinor("v" + base)
136-
if !semver.IsValid(baseMajMin) || versionSet[baseMajMin] {
137-
continue
138-
}
139-
140-
if semver.Compare(baseMajMin, "v"+minSupportedVersion) >= 0 {
141-
versionSet[baseMajMin] = true
142-
versions = append(versions, baseMajMin[1:])
143-
}
144-
}
145-
146-
// Move to the next page of results, set by the `Next` field.
147-
url = data.Next
148-
}
149-
150-
return versions, nil
151-
}

internal/test/compilecheck/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ toolchain go1.23.1
77
require (
88
github.com/stretchr/testify v1.10.0
99
github.com/testcontainers/testcontainers-go v0.35.0
10-
golang.org/x/mod v0.24.0
1110
)
1211

1312
require (

internal/test/compilecheck/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
139139
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
140140
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
141141
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
142-
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
143-
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
144142
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
145143
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
146144
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

testdata/specifications

Submodule specifications updated 36 files

x/mongo/driver/drivertest/opmsg_deployment.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ var (
4545
Max: driverutil.MaxWireVersion,
4646
},
4747
}
48+
49+
// ErrNoResponsesRemaining is the error returned when the mocked connection is asked for a response and does not have
50+
// any responses buffered.
51+
ErrNoResponsesRemaining = errors.New("no responses remaining")
4852
)
4953

5054
// connection implements the driver.Connection interface and responds to wire messages with pre-configured responses.
@@ -71,7 +75,7 @@ func (c *connection) SetOIDCTokenGenID(uint64) {
7175
func (c *connection) Read(_ context.Context) ([]byte, error) {
7276
var dst []byte
7377
if len(c.responses) == 0 {
74-
return dst, errors.New("no responses remaining")
78+
return dst, ErrNoResponsesRemaining
7579
}
7680
nextRes := c.responses[0]
7781
c.responses = c.responses[1:]

x/mongo/driver/topology/server_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ func (d *timeoutDialer) DialContext(ctx context.Context, network, address string
130130

131131
// TestServerHeartbeatTimeout tests timeout retry and preemptive canceling.
132132
func TestServerHeartbeatTimeout(t *testing.T) {
133+
if testing.Short() {
134+
t.Skip("skipping integration test in short mode")
135+
}
133136
if os.Getenv("DOCKER_RUNNING") != "" {
134137
t.Skip("Skipping this test in docker.")
135138
}

0 commit comments

Comments
 (0)