Skip to content

Commit ec5cac5

Browse files
committed
fix(aws): unblock production infrastructure apply
1 parent aadb6e7 commit ec5cac5

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

infra/aws/platform/compute.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ resource "aws_lb" "public_api" {
4141
name = substr("${local.resource_prefix}-api-public", 0, 32)
4242
internal = false
4343
load_balancer_type = "application"
44-
ip_address_type = "dualstack"
44+
ip_address_type = "ipv4"
4545
security_groups = [aws_security_group.public_api_alb.id]
4646
subnets = [for subnet in aws_subnet.public : subnet.id]
4747

infra/aws/scripts/provision-tigris.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ if [[ -z "$tigris_access_key" || -z "$tigris_secret_key" ]]; then
5959
fi
6060

6161
tigris_s3api() {
62-
AWS_ACCESS_KEY_ID="$tigris_access_key" \
62+
env -u AWS_SESSION_TOKEN -u AWS_SECURITY_TOKEN \
63+
AWS_ACCESS_KEY_ID="$tigris_access_key" \
6364
AWS_SECRET_ACCESS_KEY="$tigris_secret_key" \
6465
AWS_DEFAULT_REGION="$TIGRIS_REGION" \
6566
AWS_EC2_METADATA_DISABLED=true \
@@ -71,7 +72,8 @@ tigris_s3api() {
7172
# Restrict compatibility mode to the two affected configuration APIs; its
7273
# bucket-policy API expects the normal AWS CLI headers.
7374
tigris_s3api_bucket_config() {
74-
AWS_ACCESS_KEY_ID="$tigris_access_key" \
75+
env -u AWS_SESSION_TOKEN -u AWS_SECURITY_TOKEN \
76+
AWS_ACCESS_KEY_ID="$tigris_access_key" \
7577
AWS_SECRET_ACCESS_KEY="$tigris_secret_key" \
7678
AWS_DEFAULT_REGION="$TIGRIS_REGION" \
7779
AWS_REQUEST_CHECKSUM_CALCULATION=when_required \
@@ -81,7 +83,8 @@ tigris_s3api_bucket_config() {
8183
}
8284

8385
tigris_cli() {
84-
AWS_ACCESS_KEY_ID="$tigris_access_key" \
86+
env -u AWS_SESSION_TOKEN -u AWS_SECURITY_TOKEN \
87+
AWS_ACCESS_KEY_ID="$tigris_access_key" \
8588
AWS_SECRET_ACCESS_KEY="$tigris_secret_key" \
8689
AWS_ENDPOINT_URL_S3="$TIGRIS_ENDPOINT" \
8790
AWS_DEFAULT_REGION="$TIGRIS_REGION" \
@@ -90,7 +93,8 @@ tigris_cli() {
9093
}
9194

9295
tigris_cloudfront() {
93-
AWS_ACCESS_KEY_ID="$tigris_access_key" \
96+
env -u AWS_SESSION_TOKEN -u AWS_SECURITY_TOKEN \
97+
AWS_ACCESS_KEY_ID="$tigris_access_key" \
9498
AWS_SECRET_ACCESS_KEY="$tigris_secret_key" \
9599
AWS_DEFAULT_REGION=us-east-1 \
96100
AWS_EC2_METADATA_DISABLED=true \

0 commit comments

Comments
 (0)