fix: cleanup s3 sync action

- audience cleanup amazonaws.com
anagrambuild · Oct 23, 2024 · dff58b1 · dff58b1
1 parent 9dcccba
commit dff58b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/.github/workflows/build-containers.yaml b/.github/workflows/build-containers.yaml
@@ -4,18 +4,15 @@ on:
     branches:
       - main
       - helm
-
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         flavor: [standard, cuda]
-
     permissions:
       contents: read
       packages: write
-
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
@@ -24,21 +21,17 @@ jobs:
           docker-images: false
       - name: Checkout Code
         uses: actions/checkout@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Extract Version from Cargo.toml
         run: echo "VERSION=${{ github.head_ref || github.ref_name }}-$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "bonsol-node") | .version')" >> $GITHUB_ENV
         working-directory: ./node
-
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v3
         with:
@@ -48,6 +41,6 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository_owner }}/bonsol-node:${{ matrix.flavor }}-${{ env.VERSION }}
             ghcr.io/${{ github.repository_owner }}/bonsol-node:${{ matrix.flavor }}-${{ github.sha }}
-          platforms: linux/amd64 
+          platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,9 +6,7 @@ on:
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-
 permissions: read-all
-
 jobs:
   nix-flake-check:
     name: Nix Flake Check
@@ -26,7 +24,6 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: DeterminateSystems/flake-checker-action@main
       - run: nix flake check --all-systems -L
-
   nix-devShell-check:
     name: Nix devShell Check
     runs-on: ubuntu-latest
@@ -42,7 +39,6 @@ jobs:
             extra-trusted-public-keys = bonsol.cachix.org-1:yz7vi1rCPW1BpqoszdJvf08HZxQ/5gPTPxft4NnT74A=
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix develop
-
   nix-fmt-check:
     name: Nix Format Check
     runs-on: ubuntu-latest

diff --git a/.github/workflows/s3-prover-sync.yml b/.github/workflows/s3-prover-sync.yml
@@ -10,8 +10,11 @@ env:
   AWS_REGION: "us-east-1"
   PROVER_TAG: "v2024-05-17.1"
 concurrency:
-  group: "sync-prover-to-s3-${{ env.PROVER_TAG }}"
+  group: "sync-prover-to-s3"
   cancel-in-progress: true
+permissions:
+  id-token: write
+  contents: read
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -21,7 +24,7 @@ jobs:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          audience: sts.amazonaws.com.cn
+          audience: sts.amazonaws.com
           aws-region: us-east-1
           role-to-assume: arn:aws:iam::041119533185:role/GithubBonsolCI
       - name: Build Prover Artifact

diff --git a/node/src/ingest/mod.rs b/node/src/ingest/mod.rs
@@ -4,9 +4,10 @@ mod rpc;
 use anyhow::Result;
 pub use {dragon::GrpcIngester, rpc::RpcIngester};
 
-use crate::types::BonsolInstruction;
-use solana_sdk::pubkey::Pubkey;
-use tokio::sync::mpsc::UnboundedReceiver;
+use {
+    crate::types::BonsolInstruction, solana_sdk::pubkey::Pubkey,
+    tokio::sync::mpsc::UnboundedReceiver,
+};
 
 pub type TxChannel = UnboundedReceiver<Vec<BonsolInstruction>>;