Skip to content

Commit b178331

Browse files
matthewdalematthewdale
authored
Remove unnecessary error from GridFSBucket method. (#1533)
1 parent bdc38a6 commit b178331

File tree

6 files changed

+26
-47
lines changed

6 files changed

+26
-47
lines changed

‎internal/integration/gridfs_test.go‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ func TestGridFS(x *testing.T) {
7272

7373
for _, tc := range testcases {
7474
mt.Run(tc.name, func(mt *mtest.T) {
75-
bucket, err := mt.DB.GridFSBucket(options.GridFSBucket().SetChunkSizeBytes(chunkSize))
76-
assert.Nil(mt, err, "NewBucket error: %v", err)
75+
bucket := mt.DB.GridFSBucket(options.GridFSBucket().SetChunkSizeBytes(chunkSize))
7776

7877
ustream, err := bucket.OpenUploadStream(context.Background(), "foo")
7978
assert.Nil(mt, err, "OpenUploadStream error: %v", err)
@@ -107,16 +106,15 @@ func TestGridFS(x *testing.T) {
107106

108107
mt.Run("index creation", func(mt *mtest.T) {
109108
// Unit tests showing that UploadFromStream creates indexes on the chunks and files collections.
110-
bucket, err := mt.DB.GridFSBucket()
111-
assert.Nil(mt, err, "NewBucket error: %v", err)
109+
bucket := mt.DB.GridFSBucket()
112110

113111
byteData := []byte("Hello, world!")
114112
r := bytes.NewReader(byteData)
115113

116114
uploadCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
117115
mt.Cleanup(cancel)
118116

119-
_, err = bucket.UploadFromStream(uploadCtx, "filename", r)
117+
_, err := bucket.UploadFromStream(uploadCtx, "filename", r)
120118
assert.Nil(mt, err, "UploadFromStream error: %v", err)
121119

122120
findCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -186,13 +184,12 @@ func TestGridFS(x *testing.T) {
186184

187185
mt.ClearEvents()
188186

189-
bucket, err := mt.DB.GridFSBucket()
190-
assert.Nil(mt, err, "NewBucket error: %v", err)
187+
bucket := mt.DB.GridFSBucket()
191188
defer func() {
192189
_ = bucket.Drop(context.Background())
193190
}()
194191

195-
_, err = bucket.OpenUploadStream(context.Background(), "filename")
192+
_, err := bucket.OpenUploadStream(context.Background(), "filename")
196193
assert.Nil(mt, err, "OpenUploadStream error: %v", err)
197194

198195
mt.FilterStartedEvents(func(evt *event.CommandStartedEvent) bool {
@@ -233,13 +230,13 @@ func TestGridFS(x *testing.T) {
233230

234231
mt.ClearEvents()
235232
var fileContent []byte
236-
bucket, err := mt.DB.GridFSBucket()
237-
assert.Nil(mt, err, "NewBucket error: %v", err)
233+
bucket := mt.DB.GridFSBucket()
234+
238235
defer func() {
239236
_ = bucket.Drop(context.Background())
240237
}()
241238

242-
_, err = bucket.UploadFromStream(context.Background(), "filename", bytes.NewBuffer(fileContent))
239+
_, err := bucket.UploadFromStream(context.Background(), "filename", bytes.NewBuffer(fileContent))
243240
assert.Nil(mt, err, "UploadFromStream error: %v", err)
244241

245242
mt.FilterStartedEvents(func(evt *event.CommandStartedEvent) bool {
@@ -281,8 +278,7 @@ func TestGridFS(x *testing.T) {
281278
for _, tc := range testCases {
282279
mt.Run(tc.name, func(mt *mtest.T) {
283280
// Create a new GridFS bucket.
284-
bucket, err := mt.DB.GridFSBucket()
285-
assert.Nil(mt, err, "NewBucket error: %v", err)
281+
bucket := mt.DB.GridFSBucket()
286282
defer func() { _ = bucket.Drop(context.Background()) }()
287283

288284
// Upload the file and store the uploaded file ID.
@@ -331,8 +327,7 @@ func TestGridFS(x *testing.T) {
331327
// Test that the chunk size for a file download is determined by the chunkSize field in the files
332328
// collection document, not the bucket's chunk size.
333329

334-
bucket, err := mt.DB.GridFSBucket()
335-
assert.Nil(mt, err, "NewBucket error: %v", err)
330+
bucket := mt.DB.GridFSBucket()
336331
defer func() { _ = bucket.Drop(context.Background()) }()
337332

338333
fileData := []byte("hello world")
@@ -362,8 +357,7 @@ func TestGridFS(x *testing.T) {
362357
_, err := mt.DB.Collection("fs.files").InsertOne(context.Background(), filesDoc)
363358
assert.Nil(mt, err, "InsertOne error for files collection: %v", err)
364359

365-
bucket, err := mt.DB.GridFSBucket()
366-
assert.Nil(mt, err, "NewBucket error: %v", err)
360+
bucket := mt.DB.GridFSBucket()
367361
defer func() { _ = bucket.Drop(context.Background()) }()
368362

369363
_, err = bucket.OpenDownloadStream(context.Background(), oid)
@@ -378,12 +372,11 @@ func TestGridFS(x *testing.T) {
378372
fileName := "read-error-test"
379373
fileData := make([]byte, 17000000)
380374

381-
bucket, err := mt.DB.GridFSBucket()
382-
assert.Nil(mt, err, "NewBucket error: %v", err)
375+
bucket := mt.DB.GridFSBucket()
383376
defer func() { _ = bucket.Drop(context.Background()) }()
384377

385378
dataReader := bytes.NewReader(fileData)
386-
_, err = bucket.UploadFromStream(context.Background(), fileName, dataReader)
379+
_, err := bucket.UploadFromStream(context.Background(), fileName, dataReader)
387380
assert.Nil(mt, err, "UploadFromStream error: %v", err)
388381

389382
ctx, cancel := context.WithCancel(context.Background())
@@ -406,12 +399,11 @@ func TestGridFS(x *testing.T) {
406399
fileName := "skip-error-test"
407400
fileData := make([]byte, 17000000)
408401

409-
bucket, err := mt.DB.GridFSBucket()
410-
assert.Nil(mt, err, "NewBucket error: %v", err)
402+
bucket := mt.DB.GridFSBucket()
411403
defer func() { _ = bucket.Drop(context.Background()) }()
412404

413405
dataReader := bytes.NewReader(fileData)
414-
_, err = bucket.UploadFromStream(context.Background(), fileName, dataReader)
406+
_, err := bucket.UploadFromStream(context.Background(), fileName, dataReader)
415407
assert.Nil(mt, err, "UploadFromStream error: %v", err)
416408

417409
ctx, cancel := context.WithCancel(context.Background())
@@ -446,11 +438,10 @@ func TestGridFS(x *testing.T) {
446438
if tc.bucketName != "" {
447439
bucketOpts.SetName(tc.bucketName)
448440
}
449-
bucket, err := mt.DB.GridFSBucket(bucketOpts)
450-
assert.Nil(mt, err, "NewBucket error: %v", err)
441+
bucket := mt.DB.GridFSBucket(bucketOpts)
451442
defer func() { _ = bucket.Drop(context.Background()) }()
452443

453-
_, err = bucket.UploadFromStream(context.Background(), "accessors-test-file", bytes.NewReader(fileData))
444+
_, err := bucket.UploadFromStream(context.Background(), "accessors-test-file", bytes.NewReader(fileData))
454445
assert.Nil(mt, err, "UploadFromStream error: %v", err)
455446

456447
bucketName := tc.bucketName
@@ -491,10 +482,9 @@ func TestGridFS(x *testing.T) {
491482
chunkSize = &temp
492483
}
493484

494-
bucket, err := mt.DB.GridFSBucket(&options.BucketOptions{
485+
bucket := mt.DB.GridFSBucket(&options.BucketOptions{
495486
ChunkSizeBytes: chunkSize,
496487
})
497-
assert.Nil(mt, err, "NewBucket error: %v", err)
498488

499489
timeout := 5 * time.Second
500490
if israce.Enabled {
@@ -512,7 +502,7 @@ func TestGridFS(x *testing.T) {
512502
ctx, cancel := context.WithTimeout(context.Background(), timeout)
513503
mt.Cleanup(cancel)
514504

515-
_, err = bucket.UploadFromStream(ctx, "filename", bytes.NewReader(p))
505+
_, err := bucket.UploadFromStream(ctx, "filename", bytes.NewReader(p))
516506
assert.Nil(mt, err, "UploadFromStream error: %v", err)
517507

518508
var w *bytes.Buffer
@@ -531,8 +521,7 @@ func TestGridFS(x *testing.T) {
531521

532522
// Regression test for a bug introduced in GODRIVER-2346.
533523
mt.Run("Find", func(mt *mtest.T) {
534-
bucket, err := mt.DB.GridFSBucket()
535-
assert.Nil(mt, err, "NewBucket error: %v", err)
524+
bucket := mt.DB.GridFSBucket()
536525
// Find the file back.
537526
cursor, err := bucket.Find(context.Background(), bson.D{{"foo", "bar"}})
538527
defer func() {

‎internal/integration/unified/entity.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -796,12 +796,7 @@ func (em *EntityMap) addGridFSBucketEntity(entityOptions *entityOptions) error {
796796
bucketOpts = entityOptions.GridFSBucketOptions.BucketOptions
797797
}
798798

799-
bucket, err := db.GridFSBucket(bucketOpts)
800-
if err != nil {
801-
return fmt.Errorf("error creating GridFS bucket: %v", err)
802-
}
803-
804-
em.gridfsBuckets[entityOptions.ID] = bucket
799+
em.gridfsBuckets[entityOptions.ID] = db.GridFSBucket(bucketOpts)
805800
return nil
806801
}
807802

‎internal/integration/unified_spec_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,7 @@ func createBucket(mt *mtest.T, testFile testFile, testCase *testCase) {
363363
}
364364
bucketOpts.SetChunkSizeBytes(chunkSize)
365365

366-
var err error
367-
testCase.bucket, err = mt.DB.GridFSBucket(bucketOpts)
368-
assert.Nil(mt, err, "NewBucket error: %v", err)
366+
testCase.bucket = mt.DB.GridFSBucket(bucketOpts)
369367
}
370368

371369
func runOperation(mt *mtest.T, testCase *testCase, op *operation, sess0, sess1 mongo.Session) error {

‎mongo/database.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ func (db *Database) executeCreateOperation(ctx context.Context, op *operation.Cr
970970

971971
// GridFSBucket is used to construct a GridFS bucket which can be used as a
972972
// container for files.
973-
func (db *Database) GridFSBucket(opts ...*options.BucketOptions) (*GridFSBucket, error) {
973+
func (db *Database) GridFSBucket(opts ...*options.BucketOptions) *GridFSBucket {
974974
b := &GridFSBucket{
975975
name: "fs",
976976
chunkSize: DefaultGridFSChunkSize,
@@ -1021,5 +1021,5 @@ func (db *Database) GridFSBucket(opts ...*options.BucketOptions) (*GridFSBucket,
10211021
b.readBuf = make([]byte, b.chunkSize)
10221022
b.writeBuf = make([]byte, b.chunkSize)
10231023

1024-
return b, nil
1024+
return b
10251025
}

‎mongo/gridfs_bucket_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ func TestBucket_openDownloadStream(t *testing.T) {
4646

4747
for _, test := range tests {
4848
t.Run(test.name, func(t *testing.T) {
49-
bucket, err := db.GridFSBucket()
50-
assert.NoError(t, err)
51-
49+
bucket := db.GridFSBucket()
5250
_, err = bucket.openDownloadStream(context.Background(), test.filter)
5351
assert.ErrorIs(t, err, test.err)
5452
})

‎mongo/gridfs_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ func TestGridFS(t *testing.T) {
7979

8080
for _, tt := range chunkSizeTests {
8181
t.Run(tt.testName, func(t *testing.T) {
82-
bucket, err := db.GridFSBucket(tt.bucketOpts)
83-
assert.Nil(t, err, "NewBucket error: %v", err)
82+
bucket := db.GridFSBucket(tt.bucketOpts)
8483

8584
us, err := bucket.OpenUploadStream(context.Background(), "filename", tt.uploadOpts)
8685
assert.Nil(t, err, "OpenUploadStream error: %v", err)

0 commit comments

Comments
 (0)