Skip to content

Commit b91611a

Browse files
agnesgarouxagnesgaroux
authored
Merge pull request #2816 from wellcomecollection/increase-relation_embedder-memory
Increase relation embedder memory
2 parents e9bedca + b1186b2 commit b91611a

File tree

4 files changed

+68
-43
lines changed

4 files changed

+68
-43
lines changed

‎pipeline/terraform/2024-11-18/pipeline_config.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ locals {
88

99
terraform {
1010
backend "s3" {
11-
role_arn = "arn:aws:iam::760097843905:role/platform-developer"
11+
assume_role = {
12+
role_arn = "arn:aws:iam::760097843905:role/platform-developer"
13+
}
1214

1315
bucket = "wellcomecollection-platform-infra"
1416
key = "terraform/catalogue-pipeline/pipeline/2024-11-18.tfstate"

‎pipeline/terraform/modules/stack/relation_embedder/embedder.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ module "embedder_lambda" {
3333

3434
# see comment on fargate service's queue_visibility_timeout_seconds
3535
# 15 minutes is the max for lambda, is it going to be enough?
36-
timeout = 60 * 15 # 15 Minutes
36+
timeout = 60 * 15 # 15 Minutes
37+
memory_size = 2048
3738

3839
queue_config = {
3940
topic_arns = [

‎pipeline/terraform/modules/stack/terraform.tf

Lines changed: 60 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,35 @@ data "terraform_remote_state" "catalogue_infra_critical" {
22
backend = "s3"
33

44
config = {
5-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
6-
bucket = "wellcomecollection-platform-infra"
7-
key = "terraform/catalogue/infrastructure/critical.tfstate"
8-
region = "eu-west-1"
5+
assume_role = {
6+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
7+
}
8+
bucket = "wellcomecollection-platform-infra"
9+
key = "terraform/catalogue/infrastructure/critical.tfstate"
10+
region = "eu-west-1"
911
}
1012
}
1113

1214
data "terraform_remote_state" "shared_infra" {
1315
backend = "s3"
1416

1517
config = {
16-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
17-
bucket = "wellcomecollection-platform-infra"
18-
key = "terraform/platform-infrastructure/shared.tfstate"
19-
region = "eu-west-1"
18+
assume_role = {
19+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
20+
}
21+
bucket = "wellcomecollection-platform-infra"
22+
key = "terraform/platform-infrastructure/shared.tfstate"
23+
region = "eu-west-1"
2024
}
2125
}
2226

2327
data "terraform_remote_state" "monitoring" {
2428
backend = "s3"
2529

2630
config = {
27-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
28-
31+
assume_role = {
32+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
33+
}
2934
bucket = "wellcomecollection-platform-infra"
3035
key = "terraform/monitoring.tfstate"
3136
region = "eu-west-1"
@@ -36,8 +41,9 @@ data "terraform_remote_state" "accounts_catalogue" {
3641
backend = "s3"
3742

3843
config = {
39-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
40-
44+
assume_role = {
45+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
46+
}
4147
bucket = "wellcomecollection-platform-infra"
4248
key = "terraform/aws-account-infrastructure/catalogue.tfstate"
4349
region = "eu-west-1"
@@ -52,43 +58,51 @@ data "terraform_remote_state" "sierra_adapter" {
5258
backend = "s3"
5359

5460
config = {
55-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
56-
bucket = "wellcomecollection-platform-infra"
57-
key = "terraform/sierra_adapter.tfstate"
58-
region = "eu-west-1"
61+
assume_role = {
62+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
63+
}
64+
bucket = "wellcomecollection-platform-infra"
65+
key = "terraform/sierra_adapter.tfstate"
66+
region = "eu-west-1"
5967
}
6068
}
6169

6270
data "terraform_remote_state" "mets_adapter" {
6371
backend = "s3"
6472

6573
config = {
66-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
67-
bucket = "wellcomecollection-platform-infra"
68-
key = "terraform/catalogue/mets_adapter.tfstate"
69-
region = "eu-west-1"
74+
assume_role = {
75+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
76+
}
77+
bucket = "wellcomecollection-platform-infra"
78+
key = "terraform/catalogue/mets_adapter.tfstate"
79+
region = "eu-west-1"
7080
}
7181
}
7282

7383
data "terraform_remote_state" "tei_adapter" {
7484
backend = "s3"
7585

7686
config = {
77-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
78-
bucket = "wellcomecollection-platform-infra"
79-
key = "terraform/tei_adapter.tfstate"
80-
region = "eu-west-1"
87+
assume_role = {
88+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
89+
}
90+
bucket = "wellcomecollection-platform-infra"
91+
key = "terraform/tei_adapter.tfstate"
92+
region = "eu-west-1"
8193
}
8294
}
8395

8496
data "terraform_remote_state" "ebsco_adapter" {
8597
backend = "s3"
8698

8799
config = {
88-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
89-
bucket = "wellcomecollection-platform-infra"
90-
key = "terraform/ebsco_adapter.tfstate"
91-
region = "eu-west-1"
100+
assume_role = {
101+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
102+
}
103+
bucket = "wellcomecollection-platform-infra"
104+
key = "terraform/ebsco_adapter.tfstate"
105+
region = "eu-west-1"
92106
}
93107
}
94108

@@ -97,32 +111,38 @@ data "terraform_remote_state" "calm_adapter" {
97111
backend = "s3"
98112

99113
config = {
100-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
101-
bucket = "wellcomecollection-platform-infra"
102-
key = "terraform/calm_adapter.tfstate"
103-
region = "eu-west-1"
114+
assume_role = {
115+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
116+
}
117+
bucket = "wellcomecollection-platform-infra"
118+
key = "terraform/calm_adapter.tfstate"
119+
region = "eu-west-1"
104120
}
105121
}
106122

107123
data "terraform_remote_state" "reindexer" {
108124
backend = "s3"
109125

110126
config = {
111-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
112-
bucket = "wellcomecollection-platform-infra"
113-
key = "terraform/catalogue/reindexer.tfstate"
114-
region = "eu-west-1"
127+
assume_role = {
128+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
129+
}
130+
bucket = "wellcomecollection-platform-infra"
131+
key = "terraform/catalogue/reindexer.tfstate"
132+
region = "eu-west-1"
115133
}
116134
}
117135

118136
data "terraform_remote_state" "inferrer" {
119137
backend = "s3"
120138

121139
config = {
122-
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
123-
bucket = "wellcomecollection-platform-infra"
124-
key = "terraform/catalogue-pipeline/pipeline/inferrer.tfstate"
125-
region = "eu-west-1"
140+
assume_role = {
141+
role_arn = "arn:aws:iam::760097843905:role/platform-read_only"
142+
}
143+
bucket = "wellcomecollection-platform-infra"
144+
key = "terraform/catalogue-pipeline/pipeline/inferrer.tfstate"
145+
region = "eu-west-1"
126146
}
127147
}
128148

‎pipeline/terraform/scripts/create_terraform_config_file.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ locals {
2828
2929
terraform {
3030
backend "s3" {
31-
role_arn = "arn:aws:iam::760097843905:role/platform-developer"
31+
assume_role = {
32+
role_arn = "arn:aws:iam::760097843905:role/platform-developer"
33+
}
3234
3335
bucket = "wellcomecollection-platform-infra"
3436
key = "terraform/catalogue-pipeline/pipeline/$PIPELINE_DATE.tfstate"

0 commit comments

Comments
 (0)