From 727324583cbf7418c9f0accfdfe12afb8a1252a4 Mon Sep 17 00:00:00 2001
From: Phuong Nguyen <phuong@near.org>
Date: Mon, 17 Jun 2024 15:27:53 -0700
Subject: [PATCH] Fix newest AWS updates failing on localstack

---
 Dockerfile  | 2 +-
 src/main.rs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9dba02..6b5ae80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.71 AS builder
+FROM rust:1.78 AS builder
 WORKDIR /tmp/
 
 # Copy from nearcore:
diff --git a/src/main.rs b/src/main.rs
index 72cccbf..3d81207 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -243,13 +243,13 @@ async fn handle_message(
         client.clone(),
         bucket.clone(),
         block_json,
-        format!("{}/block.json", base_key).to_string(),
+        format!("{}/{}/block.json", bucket, base_key).to_string(),
     )
     .await;
 
     // Shards
     for shard in streamer_message.shards.iter() {
-        let key = format!("{}/shard_{}.json", base_key, shard.shard_id);
+        let key = format!("{}/{}/shard_{}.json", bucket, base_key, shard.shard_id);
         let shard_json =
             serde_json::to_value(shard).expect("Failed to serialize IndexerShard to JSON");
         put_object_or_retry(client.clone(), bucket.clone(), shard_json, key).await;
@@ -293,6 +293,7 @@ async fn put_object_or_retry(
                 metrics::RETRY_COUNT.inc();
                 tracing::warn!(
                     target: INDEXER,
+                    ?err,
                     "Failed to put {} to S3, retrying",
                     &filename
                 );