From 5e03bf36c4a00f257274ab19642e313d8ba3ddbe Mon Sep 17 00:00:00 2001 From: Daniyar Itegulov Date: Wed, 29 Nov 2023 14:57:56 +1100 Subject: [PATCH 1/2] fix: ignore RUSTSEC-2023-0071 (#394) --- .github/workflows/unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 6b4c41d06..3c2799f88 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -51,4 +51,4 @@ jobs: uses: actions-rs/cargo@v1 with: command: audit - args: --ignore RUSTSEC-2020-0071 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2022-0093 + args: --ignore RUSTSEC-2020-0071 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2023-0071 From 6f46b0b648f9cf62cddd4c4eeea7742dbab59124 Mon Sep 17 00:00:00 2001 From: Daniyar Itegulov Date: Fri, 1 Dec 2023 12:42:16 +1100 Subject: [PATCH 2/2] fix: make Lake indexer work with macos (#392) Update integration-tests/src/env/containers.rs: * use ipv4 port for macos localstack * pull from the near-lake-indexer's specific tag that has both macos and linux images --------- Co-authored-by: Xiangyi Zheng --- integration-tests/src/env/containers.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/integration-tests/src/env/containers.rs b/integration-tests/src/env/containers.rs index 4b23453a2..39b1244a8 100644 --- a/integration-tests/src/env/containers.rs +++ b/integration-tests/src/env/containers.rs @@ -553,8 +553,16 @@ impl<'a> LocalStack<'a> { .await?; let s3_address = format!("http://{}:{}", address, Self::S3_CONTAINER_PORT); - let s3_host_port = container.get_host_port_ipv6(Self::S3_CONTAINER_PORT); - let s3_host_address = format!("http://[::1]:{s3_host_port}"); + #[cfg(all(target_os = "macos", target_arch = "aarch64"))] + let s3_host_address = { + let s3_host_port = container.get_host_port_ipv4(Self::S3_CONTAINER_PORT); + format!("http://127.0.0.1:{s3_host_port}") + }; + #[cfg(target_arch = "x86_64")] + let s3_host_address = { + let s3_host_port = container.get_host_port_ipv6(Self::S3_CONTAINER_PORT); + format!("http://[::1]:{s3_host_port}") + }; tracing::info!( s3_address, @@ -600,7 +608,7 @@ impl<'a> LakeIndexer<'a> { let image = GenericImage::new( "ghcr.io/near/near-lake-indexer", - "e6519c922435f3d18b5f2ddac5d1ec171ef4dd6b", + "18ef24922fd7b5b8985ea793fdf7a939e57216ba", ) .with_env_var("AWS_ACCESS_KEY_ID", "FAKE_LOCALSTACK_KEY_ID") .with_env_var("AWS_SECRET_ACCESS_KEY", "FAKE_LOCALSTACK_ACCESS_KEY")