Merge branch 'GODRIVER-3419' of github.com:prestonvasquez/mongo-go-driver into GODRIVER-3419

Author: prestonvasquez

.evergreen/config.yml

@@ -213,6 +213,7 @@ functions:
       type: test
       params:
         binary: bash
+        add_expansions_to_env: true
         env:
           BASE_SHA: "${revision}"
           HEAD_SHA: "${github_commit}"
@@ -223,6 +224,7 @@ functions:
       type: test
       params:
         binary: bash
+        add_expansions_to_env: true
         env:
           COMMIT: "${github_commit}"
           PR_TASK: apply-labels
@@ -233,6 +235,7 @@ functions:
       type: test
       params:
         binary: bash
+        add_expansions_to_env: true
         env:
           COMMIT: "${github_commit}"
           PR_TASK: assign-reviewer
@@ -647,6 +650,7 @@ tasks:
   - name: pull-request-helpers
     allowed_requesters: ["patch", "github_pr"]
     commands:
+      - func: assume-test-secrets-ec2-role
       - func: "add PR reviewer"  
       - func: "add PR labels"
       - func: "create-api-report"
@@ -1679,11 +1683,11 @@ tasks:
         type: test
         params:
           binary: bash
+          add_expansions_to_env: true
           env:
             TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/internal/cmd/faas/awslambda
             LAMBDA_STACK_NAME: dbx-go-lambda
             AWS_REGION: us-east-1
-          include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
           args: [*task-runner, evg-test-deployed-lambda-aws]
 
   - name: "oidc-auth-test"
@@ -2063,6 +2067,7 @@ task_groups:
         params:
           working_dir: src/go.mongodb.org/mongo-driver
           binary: bash
+          add_expansions_to_env: true
           env:
             LAMBDA_STACK_NAME: dbx-go-lambda
             AWS_REGION: us-east-1

.pre-commit-config.yaml

@@ -65,3 +65,9 @@ repos:
     require_serial: true
     pass_filenames: false
     entry: etc/golangci-lint.sh
+
+  - id: check-licenses
+    name: check-licenses
+    language: system
+    types: [go]
+    entry: etc/check_license.sh

Taskfile.yml

@@ -34,7 +34,7 @@ tasks:
 
   build-compile-check-all: bash etc/run-compile-check-test.sh
 
-  build-aws-ecs-test: go build ${BUILD_TAGS} ./internal/cmd/testaws/main.go
+  build-aws-ecs-test: go test -c ./internal/test/aws -o aws.testbin
 
   cross-compile: 
     - GOOS=linux GOARCH=386 go build ./...

etc/check_license.sh

@@ -8,7 +8,7 @@ copyright=$"// Copyright (C) MongoDB, Inc. $year-present.
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 "
 
-add_copyright() {
+check_or_add_copyright() {
     file=$1
 
     # Check if first 24 bytes match first 24 bytes of copyright notice.
@@ -54,10 +54,23 @@ do
     esac
 done
 
-# Find all .go files and try to write a license notice.
-GO_FILES=$(find . -type f -name "*.go" -print)
+# Shift script arguments so $1 contains only optional filename args.
+# E.g. check_license.sh -a ./mongo/cursor.go
+shift "$((OPTIND - 1))"
+FILES=$1
 
-for file in $GO_FILES
+# If no filenames were passed, find all .go files and try to write a license
+# notice.
+if [ -z "$FILES" ]; then
+    FILES=$(find . -type f -name "*.go" -print)
+fi
+
+for file in $FILES
 do
-    add_copyright "$file"
+    # Skip any files that aren't .go files.
+    if [[ ! "$file" =~ .go$ ]]; then
+        continue
+    fi
+
+    check_or_add_copyright "$file"
 done

etc/run-mongodb-aws-ecs-test.sh

@@ -2,8 +2,8 @@
 set -eu
 
 if [ "${SKIP_ECS_AUTH_TEST:-}" = "true" ]; then
-    echo "This platform does not support the ECS auth test, skipping..."
-    exit 0
+  echo "This platform does not support the ECS auth test, skipping..."
+  exit 0
 fi
 
 task build-aws-ecs-test
@@ -13,7 +13,7 @@ ECS_SRC_DIR=$AUTH_AWS_DIR/src
 
 # pack up project directory to ssh it to the container
 mkdir -p $ECS_SRC_DIR/.evergreen
-cp ${PROJECT_DIRECTORY}/main $ECS_SRC_DIR
+cp ${PROJECT_DIRECTORY}/aws.testbin $ECS_SRC_DIR/main
 cp ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
 tar -czf $ECS_SRC_DIR/src.tgz -C ${PROJECT_DIRECTORY} .
 

etc/run-mongodb-aws-test.sh

@@ -31,4 +31,4 @@ set -x
 
 # For Go 1.16+, Go builds requires a go.mod file in the current working directory or a parent
 # directory. Spawn a new subshell, "cd" to the project directory, then run "go run".
-(cd ${PROJECT_DIRECTORY} && go run "./internal/cmd/testaws/main.go" | tee test.suite)
+(cd ${PROJECT_DIRECTORY} && go test -timeout 30m -v ./internal/test/aws/... | tee -a test.suite)

internal/cmd/faas/awslambda/template.yaml

@@ -32,20 +32,6 @@ Resources:
         Variables:
           MONGODB_URI: !Ref MongoDbUri
 
-  ApplicationResourceGroup:
-    Type: AWS::ResourceGroups::Group
-    Properties:
-      Name:
-        Fn::Sub: ApplicationInsights-SAM-${AWS::StackName}
-      ResourceQuery:
-        Type: CLOUDFORMATION_STACK_1_0
-  ApplicationInsightsMonitoring:
-    Type: AWS::ApplicationInsights::Application
-    Properties:
-      ResourceGroupName:
-        Ref: ApplicationResourceGroup
-      AutoConfigurationEnabled: 'true'
-
 Outputs:
   MongoDBApi:
     Description: "API Gateway endpoint URL for Prod stage for MongoDB function"

internal/cmd/testaws/main.go renamed to internal/test/aws/aws_test.go

@@ -1,4 +1,4 @@
-// Copyright (C) MongoDB, Inc. 2017-present.
+// Copyright (C) MongoDB, Inc. 2025-present.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
@@ -9,32 +9,30 @@ package main
 import (
 	"context"
 	"errors"
-	"fmt"
 	"os"
+	"testing"
 
 	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/internal/require"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
-func main() {
+func TestAWS(t *testing.T) {
 	uri := os.Getenv("MONGODB_URI")
-	ctx := context.Background()
 
 	client, err := mongo.Connect(options.Client().ApplyURI(uri))
-	if err != nil {
-		panic(fmt.Sprintf("Connect error: %v", err))
-	}
+	require.NoError(t, err, "Connect error")
 
 	defer func() {
-		if err = client.Disconnect(ctx); err != nil {
-			panic(fmt.Sprintf("Disconnect error: %v", err))
-		}
+		err = client.Disconnect(context.Background())
+		require.NoError(t, err)
 	}()
 
-	db := client.Database("aws")
-	coll := db.Collection("test")
-	if err = coll.FindOne(ctx, bson.D{{"x", 1}}).Err(); err != nil && !errors.Is(err, mongo.ErrNoDocuments) {
-		panic(fmt.Sprintf("FindOne error: %v", err))
+	coll := client.Database("aws").Collection("test")
+
+	err = coll.FindOne(context.Background(), bson.D{{Key: "x", Value: 1}}).Err()
+	if err != nil && !errors.Is(err, mongo.ErrNoDocuments) {
+		t.Logf("FindOne error: %v", err)
 	}
 }