refactor: remove uneeded code and use struct literal syntax

RafaelCenzano · RafaelCenzano · commit 17866ca967a5 · 2026-01-07T10:38:56.000-08:00
diff --git a/mongo/client_encryption.go b/mongo/client_encryption.go
@@ -465,7 +465,9 @@ func (ce *ClientEncryption) RewrapManyDataKey(
 	}
 
 	// Transfer rmdko options to /x/ package options to publish the mongocrypt feed.
-	co := &mcopts.RewrapManyDataKeyOptions{}
+	co := &mcopts.RewrapManyDataKeyOptions{
+		Provider: args.Provider,
+	}
 	if args.MasterKey != nil {
 		keyDoc, err := marshal(
 			args.MasterKey,
@@ -476,9 +478,6 @@ func (ce *ClientEncryption) RewrapManyDataKey(
 		}
 		co.MasterKey = keyDoc
 	}
-	if args.Provider != nil {
-		co.Provider = args.Provider
-	}
 
 	// Prepare the filters and rewrap the data key using mongocrypt.
 	filterdoc, err := marshal(filter, ce.keyVaultClient.bsonOpts, ce.keyVaultClient.registry)

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,9 @@ func (ce *ClientEncryption) RewrapManyDataKey(`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`// Transfer rmdko options to /x/ package options to publish the mongocrypt feed.`
`468`		`- co := &mcopts.RewrapManyDataKeyOptions{}`
	`468`	`+ co := &mcopts.RewrapManyDataKeyOptions{`
	`469`	`+ Provider: args.Provider,`
	`470`	`+ }`
`469`	`471`	`if args.MasterKey != nil {`
`470`	`472`	`keyDoc, err := marshal(`
`471`	`473`	`args.MasterKey,`
`@@ -476,9 +478,6 @@ func (ce *ClientEncryption) RewrapManyDataKey(`
`476`	`478`	`}`
`477`	`479`	`co.MasterKey = keyDoc`
`478`	`480`	`}`
`479`		`- if args.Provider != nil {`
`480`		`- co.Provider = args.Provider`
`481`		`- }`
`482`	`481`
`483`	`482`	`// Prepare the filters and rewrap the data key using mongocrypt.`
`484`	`483`	`filterdoc, err := marshal(filter, ce.keyVaultClient.bsonOpts, ce.keyVaultClient.registry)`