chore: make every command ec2-user

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

.github/workflows/ci.yaml

@@ -105,19 +105,19 @@ jobs:
         run: |
           sudo ls /etc/cni/net.d
           sudo rm /etc/cni/net.d/87-podman-bridge.conflist
-      - name: Verify Rego file presence
-        run: ls -l ${{ github.workspace }}/docs/sample-rego-policies/example.rego
-      - name: Set Rego file path
-        run: echo "REGO_FILE_PATH=${{ github.workspace }}/docs/sample-rego-policies/example.rego" >> $GITHUB_ENV
-      - name: Start finch-daemon with opa Authz
-        run: sudo bin/finch-daemon --debug --experimental --rego-file ${{ github.workspace }}/docs/sample-rego-policies/example.rego --skip-rego-perm-check --socket-owner $UID --socket-addr /run/finch.sock --pidfile /run/finch.pid &
-      - name: Run opa e2e tests
-        run: sudo -E make test-e2e-opa
-      - name: Clean up Daemon socket
-        run: sudo rm /run/finch.sock && sudo rm /run/finch.pid
-      - name: Start finch-daemon
-        run: sudo bin/finch-daemon  --debug --socket-owner $UID &
-      - name: Run e2e test
-        run: sudo make test-e2e
-      - name: Clean up Daemon socket
-        run: sudo rm /var/run/finch.sock && sudo rm /run/finch.pid
+      # - name: Verify Rego file presence
+      #   run: ls -l ${{ github.workspace }}/docs/sample-rego-policies/example.rego
+      # - name: Set Rego file path
+      #   run: echo "REGO_FILE_PATH=${{ github.workspace }}/docs/sample-rego-policies/example.rego" >> $GITHUB_ENV
+      # - name: Start finch-daemon with opa Authz
+      #   run: sudo bin/finch-daemon --debug --experimental --rego-file ${{ github.workspace }}/docs/sample-rego-policies/example.rego --skip-rego-perm-check --socket-owner $UID --socket-addr /run/finch.sock --pidfile /run/finch.pid &
+      # - name: Run opa e2e tests
+      #   run: sudo -E make test-e2e-opa
+      # - name: Clean up Daemon socket
+      #   run: sudo rm /run/finch.sock && sudo rm /run/finch.pid
+      # - name: Start finch-daemon
+      #   run: sudo bin/finch-daemon  --debug --socket-owner $UID &
+      # - name: Run e2e test
+      #   run: sudo make test-e2e
+      # - name: Clean up Daemon socket
+      #   run: sudo rm /var/run/finch.sock && sudo rm /run/finch.pid

.github/workflows/mac-test.yaml

@@ -30,6 +30,12 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: false
+      
+      - name: Configure Go for ec2-user
+        run: |
+          # Ensure Go is properly configured for ec2-user
+          sudo chown -R ec2-user:staff $GOPATH || true
+          sudo chown -R ec2-user:staff $RUNNER_TOOL_CACHE/go || true
       # - name: Clean up previous files
       #   run: |
       #     sudo -u ec2-user bash rm -rf /opt/finch
@@ -44,22 +50,22 @@ jobs:
       # Debug step to see available users
       - name: List available users and system info
         run: |
-          echo "Current user: $(whoami)"
+          sudo -u ec2-user bash -c 'echo "Current user: $(whoami)"
           echo "Current user ID: $(id -u)"
           echo "Current user home: $HOME"
           echo "Console user: $(stat -f "%Su" /dev/console)"
           echo "All users:"
-          dscl . -list /Users | grep -v '^_'
+          dscl . -list /Users | grep -v "^_"
           echo "Users with home directories:"
           ls -la /Users/
           echo "Environment variables:"
           env | sort
           echo "Brew info:"
           which brew || echo "brew not found in PATH"
-          echo "PATH: $PATH"
+          echo "PATH: $PATH"'
           
       - name: Install Rosetta 2
-        run: echo "A" | softwareupdate --install-rosetta || true
+        run: sudo -u ec2-user bash -c 'echo "A" | sudo softwareupdate --install-rosetta || true'
 
       # Fix Homebrew permissions and setup environment
       - name: Fix Homebrew permissions and setup environment
@@ -123,17 +129,17 @@ jobs:
         # Check for Finch socket
       - name: Check for Finch socket
         run: |
-          echo "Checking for Finch socket at /Applications/Finch/lima/data/finch/sock/finch.sock..."
+          sudo -u ec2-user bash -c 'echo "Checking for Finch socket at /Applications/Finch/lima/data/finch/sock/finch.sock..."
           
           # Check if the socket file exists
-          if sudo -u ec2-user bash -c 'test -S /Applications/Finch/lima/data/finch/sock/finch.sock'; then
+          if test -S /Applications/Finch/lima/data/finch/sock/finch.sock; then
             echo "Socket file exists"
           else  
             echo "ERROR: Socket file not found at expected location /Applications/Finch/lima/data/finch/sock/finch.sock"
             exit 1
-          fi
+          fi'
           
-          # Store the socket path for later steps
+          # Store the socket path for later steps (this needs to run as root to modify GITHUB_ENV)
           echo "SOCKET_PATH=/Applications/Finch/lima/data/finch/sock/finch.sock" >> $GITHUB_ENV
         shell: bash
 
@@ -144,6 +150,11 @@ jobs:
           persist-credentials: false
           submodules: recursive
           ssh-user: ec2-user
+          
+      - name: Configure workspace for ec2-user
+        run: |
+          # Ensure workspace is properly owned by ec2-user
+          sudo chown -R ec2-user:staff ${{ github.workspace }}
       # Run e2e tests inside the Finch VM
       - name: Run e2e tests
         run: |