Merge branch 'master' into godriver3591-fix-compilecheck-ver

Author: matthewdale

.github/workflows/scorecard.yml

@@ -39,7 +39,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -64,7 +64,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif

README.md

@@ -4,6 +4,9 @@
   <a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/mongo"><img src="etc/assets/godev-mongo-blue.svg" alt="docs"></a>
   <a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/bson"><img src="etc/assets/godev-bson-blue.svg" alt="docs"></a>
   <a href="https://www.mongodb.com/docs/drivers/go/current/"><img src="etc/assets/docs-mongodb-green.svg"></a>
+  <a href="https://securityscorecards.dev/viewer/?uri=github.com/mongodb/mongo-go-driver">
+    <img src="https://api.securityscorecards.dev/projects/github.com/mongodb/mongo-go-driver/badge" alt="OpenSSF Scorecard" />
+  </a>
 </p>
 
 # MongoDB Go Driver

internal/integration/unified/matches.go

@@ -242,19 +242,32 @@ func evaluateSpecialComparison(ctx context.Context, assertionDoc bson.Raw, actua
 			return fmt.Errorf("expected lsid %v, got %v", expectedID, actualID)
 		}
 	case "$$lte":
-		if assertionVal.Type != bson.TypeInt32 && assertionVal.Type != bson.TypeInt64 {
-			return fmt.Errorf("expected assertionVal to be an Int32 or Int64 but got a %s", assertionVal.Type)
+		if assertionVal.Type != bson.TypeInt32 && assertionVal.Type != bson.TypeInt64 && assertionVal.Type != bson.TypeDouble {
+			return fmt.Errorf("expected assertionVal to be an Int32, Int64, or Double but got a %s", assertionVal.Type)
 		}
-		if actual.Type != bson.TypeInt32 && actual.Type != bson.TypeInt64 {
-			return fmt.Errorf("expected value to be an Int32 or Int64 but got a %s", actual.Type)
+		if actual.Type != bson.TypeInt32 && actual.Type != bson.TypeInt64 && assertionVal.Type != bson.TypeDouble {
+			return fmt.Errorf("expected value to be an Int32, Int64, or Double but got a %s", actual.Type)
 		}
 
 		// Numeric values can be compared even if their types are different (e.g. if expected is an int32 and actual
 		// is an int64).
-		expectedInt64 := assertionVal.AsInt64()
-		actualInt64 := actual.AsInt64()
-		if actualInt64 > expectedInt64 {
-			return fmt.Errorf("expected numeric value %d to be less than or equal %d", actualInt64, expectedInt64)
+
+		// TODO(GODRIVER-3594): If we decide to add AsDoubleOK() as a method to RawValue, this following conversion should be updated.
+		var expectedF64 float64
+		if assertionVal.Type == bson.TypeDouble {
+			expectedF64 = assertionVal.Double()
+		} else {
+			expectedF64 = float64(assertionVal.AsInt64())
+		}
+		var actualF64 float64
+		if actual.Type == bson.TypeDouble {
+			actualF64 = actual.Double()
+		} else {
+			actualF64 = float64(actual.AsInt64())
+		}
+
+		if actualF64 > expectedF64 {
+			return fmt.Errorf("expected numeric value %f to be less than or equal %f", actualF64, expectedF64)
 		}
 		return nil
 	case "$$matchAsDocument":

internal/spectest/skip.go

@@ -11,10 +11,6 @@ import "testing"
 // skipTests is a map of "fully-qualified test name" to "the reason for skipping
 // the test".
 var skipTests = map[string][]string{
-	// TODO(GODRIVER-3518): Test flexible numeric comparisons with $$lte
-	"Modifies $$lte operator test to also use floating point and Int64 types (GODRIVER-3518)": {
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/operator-lte.json/special_lte_matching_operator",
-	},
 
 	// SPEC-1403: This test checks to see if the correct error is thrown when auto
 	// encrypting with a server < 4.2. Currently, the test will fail because a