Skip to content

Commit 92c8b91

Browse files
GODRIVER-3560 Use lambda-specific arn for FaaS (#2093)
1 parent 4c4cafc commit 92c8b91

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

.evergreen/config.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ timeout:
2626
script: |
2727
ls -la
2828
functions:
29-
assume-test-secrets-ec2-role:
29+
assume-test-secrets-ec2-role:
3030
- command: ec2.assume_role
3131
params:
3232
role_arn: ${aws_test_secrets_role}
@@ -403,6 +403,7 @@ functions:
403403
params:
404404
shell: "bash"
405405
working_dir: src/go.mongodb.org/mongo-driver
406+
add_expansions_to_env: true
406407
script: |
407408
${PREPARE_SHELL}
408409
export BASE_SHA=${revision}
@@ -415,6 +416,7 @@ functions:
415416
params:
416417
shell: "bash"
417418
working_dir: src/go.mongodb.org/mongo-driver
419+
add_expansions_to_env: true
418420
script: |
419421
${PREPARE_SHELL}
420422
export CONFIG=$PROJECT_DIRECTORY/.github/labeler.yml
@@ -427,6 +429,7 @@ functions:
427429
params:
428430
shell: "bash"
429431
working_dir: src/go.mongodb.org/mongo-driver
432+
add_expansions_to_env: true
430433
script: |
431434
${PREPARE_SHELL}
432435
export CONFIG=$PROJECT_DIRECTORY/.github/reviewers.txt
@@ -932,6 +935,7 @@ tasks:
932935
- name: pull-request-helpers
933936
allowed_requesters: ["patch", "github_pr"]
934937
commands:
938+
- func: assume-test-secrets-ec2-role
935939
- func: "add PR reviewer"
936940
- func: "add PR labels"
937941
- func: "create-api-report"
@@ -1988,11 +1992,11 @@ tasks:
19881992
params:
19891993
working_dir: src/go.mongodb.org/mongo-driver
19901994
shell: bash
1995+
add_expansions_to_env: true
19911996
env:
19921997
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/internal/test/faas/awslambda
19931998
LAMBDA_STACK_NAME: dbx-go-lambda
19941999
AWS_REGION: us-east-1
1995-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
19962000
script: |
19972001
${PREPARE_SHELL}
19982002
pushd $TEST_LAMBDA_DIRECTORY/mongodb
@@ -2375,6 +2379,7 @@ task_groups:
23752379
params:
23762380
working_dir: src/go.mongodb.org/mongo-driver
23772381
binary: bash
2382+
add_expansions_to_env: true
23782383
env:
23792384
LAMBDA_STACK_NAME: dbx-go-lambda
23802385
AWS_REGION: us-east-1

internal/test/faas/awslambda/template.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,6 @@ Resources:
3232
Variables:
3333
MONGODB_URI: !Ref MongoDbUri
3434

35-
ApplicationResourceGroup:
36-
Type: AWS::ResourceGroups::Group
37-
Properties:
38-
Name:
39-
Fn::Sub: ApplicationInsights-SAM-${AWS::StackName}
40-
ResourceQuery:
41-
Type: CLOUDFORMATION_STACK_1_0
42-
ApplicationInsightsMonitoring:
43-
Type: AWS::ApplicationInsights::Application
44-
Properties:
45-
ResourceGroupName:
46-
Ref: ApplicationResourceGroup
47-
AutoConfigurationEnabled: 'true'
48-
4935
Outputs:
5036
MongoDBApi:
5137
Description: "API Gateway endpoint URL for Prod stage for MongoDB function"

0 commit comments

Comments
 (0)