From f7f0f0abe52495bbe30314dfbf837d3a8130f0ff Mon Sep 17 00:00:00 2001 From: Mike Christopher Date: Wed, 29 Jan 2025 14:33:14 -0800 Subject: [PATCH] fix: s3 publishing (#3643) * fix: s3 publishing * fix: changeset * Update .changeset/plenty-beds-bake.md --------- Co-authored-by: Anderson Arboleya --- .changeset/plenty-beds-bake.md | 5 +++++ .github/workflows/release.yaml | 12 +++++------- apps/docs/src/guide/wallets/snippets/connectors.ts | 2 +- packages/account/src/providers/assets/assets.test.ts | 2 +- .../src/providers/assets/utils/fuelAssetsBaseUrl.ts | 2 +- .../src/providers/assets/utils/network.test.ts | 8 ++++---- packages/fuel-gauge/src/e2e-script.test.ts | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 .changeset/plenty-beds-bake.md diff --git a/.changeset/plenty-beds-bake.md b/.changeset/plenty-beds-bake.md new file mode 100644 index 00000000000..06ecbc5223c --- /dev/null +++ b/.changeset/plenty-beds-bake.md @@ -0,0 +1,5 @@ +--- +"@fuel-ts/account": patch +--- + +fix: s3 publishing diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 665b92995ae..02ef56bc8ee 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -166,19 +166,17 @@ jobs: rootdir: "" workdir: "" - - uses: aws-actions/configure-aws-credentials@v4 + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v4 if: github.ref_name == 'master' && steps.changesets.outputs.published != 'true' with: - aws-access-key-id: ${{ secrets.S3_CDN_ACCESS_KEY }} - aws-secret-access-key: ${{ secrets.S3_CDN_SECRET_KEY }} - aws-region: us-east-1 + role-to-assume: ${{ env.AWS_ROLE_ARN }} + aws-region: ${{ env.AWS_S3_REGION }} - name: Upload assets to s3 if: github.ref_name == 'master' && steps.changesets.outputs.published != 'true' run: | - aws s3 cp ./packages/account/src/providers/assets/images/ s3://${S3_CDN_BUCKET}/assets/ --recursive - env: - S3_CDN_BUCKET: ${{ secrets.S3_CDN_BUCKET }} + aws s3 cp ./packages/account/src/providers/assets/images/ s3://${{ env.AWS_S3_BUCKET }}/providers/ --recursive # # Commenting out as we require permissions to trigger across repos # - name: Notify migrations and disclosures of the new release (breaking changes) diff --git a/apps/docs/src/guide/wallets/snippets/connectors.ts b/apps/docs/src/guide/wallets/snippets/connectors.ts index 2cf100d8cb8..3e5213e6d42 100644 --- a/apps/docs/src/guide/wallets/snippets/connectors.ts +++ b/apps/docs/src/guide/wallets/snippets/connectors.ts @@ -99,7 +99,7 @@ class WalletConnector extends FuelConnector { { name: 'Ethereum', symbol: 'ETH', - icon: 'https://cdn.fuel.network/assets/eth.svg', + icon: 'https://assets.fuel.network/providers/eth.svg', networks: [ { type: 'ethereum', diff --git a/packages/account/src/providers/assets/assets.test.ts b/packages/account/src/providers/assets/assets.test.ts index 706be870913..db8ab1bfcd3 100644 --- a/packages/account/src/providers/assets/assets.test.ts +++ b/packages/account/src/providers/assets/assets.test.ts @@ -10,6 +10,6 @@ describe('assets', async () => { }); it.each(assets)('$symbol should have icon resolved to URL', async ({ icon }) => { - expect(icon).toContain('https://cdn.fuel.network/assets'); + expect(icon).toContain('https://assets.fuel.network/providers'); }); }); diff --git a/packages/account/src/providers/assets/utils/fuelAssetsBaseUrl.ts b/packages/account/src/providers/assets/utils/fuelAssetsBaseUrl.ts index 4a60f272496..1e97ccd08a1 100644 --- a/packages/account/src/providers/assets/utils/fuelAssetsBaseUrl.ts +++ b/packages/account/src/providers/assets/utils/fuelAssetsBaseUrl.ts @@ -1 +1 @@ -export const fuelAssetsBaseUrl = 'https://cdn.fuel.network/assets/' +export const fuelAssetsBaseUrl = 'https://assets.fuel.network/providers/' diff --git a/packages/account/src/providers/assets/utils/network.test.ts b/packages/account/src/providers/assets/utils/network.test.ts index 51b53748ab2..b4f46db9ed0 100644 --- a/packages/account/src/providers/assets/utils/network.test.ts +++ b/packages/account/src/providers/assets/utils/network.test.ts @@ -19,7 +19,7 @@ describe('Network Utils', () => { type: 'ethereum', chainId: CHAIN_IDS.eth.sepolia, decimals: 18, - icon: 'https://cdn.fuel.network/assets/eth.svg', + icon: 'https://assets.fuel.network/providers/eth.svg', name: 'Ethereum', symbol: 'ETH' }) @@ -33,7 +33,7 @@ describe('Network Utils', () => { chainId: CHAIN_IDS.fuel.testnet, decimals: 9, assetId: '0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07', - icon: 'https://cdn.fuel.network/assets/eth.svg', + icon: 'https://assets.fuel.network/providers/eth.svg', name: 'Ethereum', symbol: 'ETH' }) @@ -52,7 +52,7 @@ describe('Network Utils', () => { type: 'ethereum', chainId: CHAIN_IDS.eth.sepolia, decimals: 18, - icon: 'https://cdn.fuel.network/assets/eth.svg', + icon: 'https://assets.fuel.network/providers/eth.svg', name: 'Ethereum', symbol: 'ETH', }) @@ -67,7 +67,7 @@ describe('Network Utils', () => { chainId: CHAIN_IDS.fuel.testnet, decimals: 9, assetId: '0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07', - icon: 'https://cdn.fuel.network/assets/eth.svg', + icon: 'https://assets.fuel.network/providers/eth.svg', name: 'Ethereum', symbol: 'ETH', }) diff --git a/packages/fuel-gauge/src/e2e-script.test.ts b/packages/fuel-gauge/src/e2e-script.test.ts index 07cecb6e4f4..3291c0b6013 100644 --- a/packages/fuel-gauge/src/e2e-script.test.ts +++ b/packages/fuel-gauge/src/e2e-script.test.ts @@ -219,7 +219,7 @@ describe.each(selectedNetworks)('Live Script Test', (selectedNetwork) => { const expectedBaseAsset = [ { ...expectedRawBaseAsset[0], - icon: 'https://cdn.fuel.network/assets/eth.svg', + icon: 'https://assets.fuel.network/providers/eth.svg', }, ];