From d1b1c181f164f5f1b974dd01ac2e7e439664f3cf Mon Sep 17 00:00:00 2001
From: Victor Lyuboslavsky <victor.lyuboslavsky@gmail.com>
Date: Tue, 21 May 2024 09:23:03 -0500
Subject: [PATCH] Refactoring fleetd-chrome workflows to use R2 upload action
 (#19157)

Refactoring fleetd-chrome workflows to use the reusable R2 upload
action.
---
 .../workflows/release-fleetd-chrome-beta.yml  | 32 +++++++------------
 .github/workflows/release-fleetd-chrome.yml   | 30 +++++++----------
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/release-fleetd-chrome-beta.yml b/.github/workflows/release-fleetd-chrome-beta.yml
index 90f3d4dc27..536117f13c 100644
--- a/.github/workflows/release-fleetd-chrome-beta.yml
+++ b/.github/workflows/release-fleetd-chrome-beta.yml
@@ -53,26 +53,18 @@ jobs:
           echo "$CHROME_SIGNING_KEY" > chrome.pem
           /usr/bin/google-chrome --pack-extension=./dist --pack-extension-key=chrome.pem
 
-      - name: Upload extension
+      - name: Prepare files for upload
         working-directory: ./ee/fleetd-chrome
+        run: |
+          mv dist.crx fleetd.crx
+          mv updates-beta.xml updates.xml
+
+      - name: Upload extension
+        uses: ./.github/actions/r2-upload
         env:
           R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
-          R2_CHROME_BETA_ACCESS_KEY_ID: ${{ secrets.R2_CHROME_BETA_ACCESS_KEY_ID }}
-          R2_CHROME_BETA_ACCESS_KEY_SECRET: ${{ secrets.R2_CHROME_BETA_ACCESS_KEY_SECRET }}
-        run: |
-          sudo apt-get install rclone
-          mkdir -p ~/.config/rclone
-          echo "[r2]
-          type = s3
-          provider = Cloudflare
-          region = auto
-          no_check_bucket = true
-          access_key_id = $R2_CHROME_BETA_ACCESS_KEY_ID
-          secret_access_key = $R2_CHROME_BETA_ACCESS_KEY_SECRET
-          endpoint = $R2_ENDPOINT
-          
-          " > ~/.config/rclone/rclone.conf
-          mv dist.crx fleetd.crx
-          rclone copy fleetd.crx r2:chrome-beta/
-          mv updates-beta.xml updates.xml
-          rclone copy updates.xml r2:chrome-beta/
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_CHROME_BETA_ACCESS_KEY_ID }}
+          R2_ACCESS_KEY_SECRET: ${{ secrets.R2_CHROME_BETA_ACCESS_KEY_SECRET }}
+          R2_BUCKET: chrome-beta
+        with:
+          filenames: ./ee/fleetd-chrome/fleetd.crx,./ee/fleetd-chrome/updates.xml
diff --git a/.github/workflows/release-fleetd-chrome.yml b/.github/workflows/release-fleetd-chrome.yml
index 1655b1c865..9af9435776 100644
--- a/.github/workflows/release-fleetd-chrome.yml
+++ b/.github/workflows/release-fleetd-chrome.yml
@@ -54,25 +54,17 @@ jobs:
           echo "$CHROME_SIGNING_KEY" > chrome.pem
           /usr/bin/google-chrome --pack-extension=./dist --pack-extension-key=chrome.pem
 
-      - name: Upload extension
+      - name: Prepare files for upload
         working-directory: ./ee/fleetd-chrome
+        run: |
+          mv dist.crx fleetd.crx
+
+      - name: Upload extension
+        uses: ./.github/actions/r2-upload
         env:
           R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
-          R2_CHROME_ACCESS_KEY_ID: ${{ secrets.R2_CHROME_ACCESS_KEY_ID }}
-          R2_CHROME_ACCESS_KEY_SECRET: ${{ secrets.R2_CHROME_ACCESS_KEY_SECRET }}
-        run: |
-          sudo apt-get install rclone
-          mkdir -p ~/.config/rclone
-          echo "[r2]
-          type = s3
-          provider = Cloudflare
-          region = auto
-          no_check_bucket = true
-          access_key_id = $R2_CHROME_ACCESS_KEY_ID
-          secret_access_key = $R2_CHROME_ACCESS_KEY_SECRET
-          endpoint = $R2_ENDPOINT
-          
-          " > ~/.config/rclone/rclone.conf
-          mv dist.crx fleetd.crx
-          rclone copy fleetd.crx r2:chrome/
-          rclone copy updates.xml r2:chrome/
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_CHROME_ACCESS_KEY_ID }}
+          R2_ACCESS_KEY_SECRET: ${{ secrets.R2_CHROME_ACCESS_KEY_SECRET }}
+          R2_BUCKET: chrome
+        with:
+          filenames: ./ee/fleetd-chrome/fleetd.crx,./ee/fleetd-chrome/updates.xml