From 92c8b9106dfbbf933a46b609823c3d1ec97872c8 Mon Sep 17 00:00:00 2001
From: Preston Vasquez <prestonvasquez@icloud.com>
Date: Mon, 9 Jun 2025 18:46:25 -0600
Subject: [PATCH 1/2] GODRIVER-3560 Use lambda-specific arn for FaaS (#2093)

---
 .evergreen/config.yml                      |  9 +++++++--
 internal/test/faas/awslambda/template.yaml | 14 --------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index e8ebae8bda..1800457b2b 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -26,7 +26,7 @@ timeout:
       script: |
         ls -la
 functions:
-  assume-test-secrets-ec2-role: 
+  assume-test-secrets-ec2-role:
     - command: ec2.assume_role
       params:
         role_arn: ${aws_test_secrets_role}
@@ -403,6 +403,7 @@ functions:
       params:
         shell: "bash"
         working_dir: src/go.mongodb.org/mongo-driver
+        add_expansions_to_env: true
         script: |
           ${PREPARE_SHELL}
           export BASE_SHA=${revision}
@@ -415,6 +416,7 @@ functions:
       params:
         shell: "bash"
         working_dir: src/go.mongodb.org/mongo-driver
+        add_expansions_to_env: true
         script: |
           ${PREPARE_SHELL}
           export CONFIG=$PROJECT_DIRECTORY/.github/labeler.yml
@@ -427,6 +429,7 @@ functions:
       params:
         shell: "bash"
         working_dir: src/go.mongodb.org/mongo-driver
+        add_expansions_to_env: true
         script: |
           ${PREPARE_SHELL}
           export CONFIG=$PROJECT_DIRECTORY/.github/reviewers.txt
@@ -932,6 +935,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"
@@ -1988,11 +1992,11 @@ tasks:
         params:
           working_dir: src/go.mongodb.org/mongo-driver
           shell: bash
+          add_expansions_to_env: true
           env:
             TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/internal/test/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"]
           script: |
             ${PREPARE_SHELL}
             pushd $TEST_LAMBDA_DIRECTORY/mongodb
@@ -2375,6 +2379,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
diff --git a/internal/test/faas/awslambda/template.yaml b/internal/test/faas/awslambda/template.yaml
index 417d3b3a11..34d44007e2 100644
--- a/internal/test/faas/awslambda/template.yaml
+++ b/internal/test/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"

From df35cb674160c8efb50e21ae15cfea56afcd42a5 Mon Sep 17 00:00:00 2001
From: Preston Vasquez <prestonvasquez@icloud.com>
Date: Mon, 9 Jun 2025 20:15:58 -0600
Subject: [PATCH 2/2] Assume role for PR Helper task

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index f26a5611e3..05832906d1 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -650,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"
@@ -1687,7 +1688,6 @@ tasks:
             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"