Merge branch 'master' into wasm-rels

.github/workflows/build-and-release-edge.yml

@@ -36,6 +36,10 @@ jobs:
         if: steps.changes.outputs.modified == 'true'
         run: |
           make swagger-docs-build
+
+      - name: Pull changes from remote
+        run: git pull origin master
+
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
@@ -73,6 +77,10 @@ jobs:
         run: |
           cd docs; bundle install; cd ..; \
           make graphql-docs-build
+
+      - name: Pull changes from remote
+        run: git pull origin master
+
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
@@ -117,4 +125,4 @@ jobs:
     needs:
       - docker-build-push
     uses: meshery/meshery/.github/workflows/cncf-staging-playground-deploy-meshery.yaml@master
-    secrets: inherit
+    secrets: inherit

.github/workflows/build-and-release-stable.yml

@@ -32,6 +32,10 @@ jobs:
         if: steps.changes.outputs.modified == 'true'
         run: |
           make swagger-docs-build
+
+      - name: Pull changes from remote
+        run: git pull origin master
+
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
@@ -69,6 +73,10 @@ jobs:
         run: |
           cd docs; bundle install; cd ..; \
           make graphql-docs-build
+
+      - name: Pull changes from remote
+        run: git pull origin master
+
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
@@ -215,4 +223,4 @@ jobs:
           body: |
             The workflow failed. Here are the details:
             ${{ env.EMAIL_BODY }}
-            Workflow run log URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+            Workflow run log URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/build-ui-and-server.yml

@@ -1,6 +1,7 @@
 name: Meshery UI and Server
 on:
-  pull_request:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
     branches:
       - "master"
     paths-ignore:
@@ -96,92 +97,6 @@ jobs:
         with:
           name: provider-ui
           path: /home/runner/work/meshery/meshery/provider-ui/out
-  tests-ui-e2e:
-    needs: [build-backend, ui-build]
-    name: UI end-to-end tests
-    if: github.repository == 'meshery/meshery'
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Check out meshery-istio code
-        uses: actions/checkout@v4
-        with:
-          repository: layer5io/meshery-istio
-          path: ./meshery-istio
-      - name: Check out meshery-consul code
-        uses: actions/checkout@v4
-        with:
-          repository: layer5io/meshery-consul
-          path: ./meshery-consul
-      - name: Create k8s Kind Cluster
-        uses: helm/[email protected]
-        with:
-          cluster_name: "kind-cluster"
-      - name: Setup Go
-        uses: actions/setup-go@master
-        with:
-          go-version: "1.21"
-      - name: Run meshery-istio
-        run: |
-          mkdir -p /home/runner/.meshery/bin
-          cd ./meshery-istio
-          go run main.go &
-          sleep 60
-      - name: Run meshery-consul
-        run: |
-          mkdir -p /home/runner/.meshery/bin
-          cd ./meshery-consul
-          go run main.go &
-          sleep 60
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: Restore node modules cache
-        id: node-cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/cache
-            ~/.cache
-            /home/runner/.cache
-            !~/cache/exclude
-            **/node_modules
-            /home/runner/.cache/Cypress
-            ~/.npm
-            ${{ github.workspace }}/.next/cache
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
-          restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
-      - name: Download meshery-ui artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: meshery-ui
-          path: /home/runner/work/meshery/meshery/ui/out
-      - name: Download provider-ui artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: provider-ui
-          path: /home/runner/work/meshery/meshery/provider-ui/out
-      - name: Run Meshery UI and Server
-        env:
-          PROVIDER_BASE_URLS: http://localhost:9876
-          PORT: 9081
-          ADAPTER_URLS: "localhost:10000 localhost:10001 localhost:10002 localhost:10003 localhost:10004 localhost:10009 localhost:10007"
-        run: |
-          make server &
-          sleep 60
-      - name: Run Playwright End-to-End Tests
-        env:
-          REMOTE_PROVIDER_USER_EMAIL: ${{ secrets.LAYER5_CLOUD_TESTING_BOT_EMAIL }}
-          REMOTE_PROVIDER_USER_PASSWORD: ${{ secrets.LAYER5_CLOUD_TESTING_BOT_PASSWORD }}
-          PROVIDER_TOKEN: ${{ secrets.PROVIDER_TOKEN }}
-        run: |
-          make test-setup-ui
-          make test-ui
   docker-build-test:
     name: Docker build
     if: github.repository == 'meshery/meshery'

.github/workflows/discussions-data-files-update.yml

@@ -18,13 +18,17 @@ jobs:
         run: curl https://discuss.layer5.io/tag/mesheryctl.json -o docs/_data/discuss/mesheryctl.json
       - name: Fetch data for meshery tag
         run: curl https://discuss.layer5.io/tag/meshery.json -o docs/_data/discuss/meshery.json
-      - name: Commit changes 
-        uses: stefanzweifel/git-auto-commit-action@v5 
-        with: 
+
+      - name: Pull changes from remote
+        run: git pull origin master
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
           file_pattern: docs/_data/discuss/*.json
           commit_user_name: Discussions bot
           commit_user_email: [email protected]
           commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           commit_options: "--signoff"
           commit_message: "latest discussion data files added"
-          branch: master
+          branch: master

.github/workflows/e2e-test-playwright.yml

@@ -0,0 +1,107 @@
+name: Run E2E Test on Meshery
+
+on:
+  workflow_run:
+    workflows: ["Meshery UI and Server"]
+    types:
+      - completed
+
+jobs:
+  tests-ui-e2e:
+    name: UI end-to-end tests
+    if: github.repository == 'meshery/meshery'
+    runs-on: ubuntu-22.04
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check out meshery-istio code
+        uses: actions/checkout@v4
+        with:
+          repository: layer5io/meshery-istio
+          path: ./meshery-istio
+      - name: Check out meshery-consul code
+        uses: actions/checkout@v4
+        with:
+          repository: layer5io/meshery-consul
+          path: ./meshery-consul
+      - name: Create k8s Kind Cluster
+        uses: helm/[email protected]
+        with:
+          cluster_name: "kind-cluster"
+      - name: Setup Go
+        uses: actions/setup-go@master
+        with:
+          go-version: "1.21"
+      - name: Run meshery-istio
+        run: |
+          mkdir -p /home/runner/.meshery/bin
+          cd ./meshery-istio
+          go run main.go &
+          sleep 60
+      - name: Run meshery-consul
+        run: |
+          mkdir -p /home/runner/.meshery/bin
+          cd ./meshery-consul
+          go run main.go &
+          sleep 60
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: Restore node modules cache
+        id: node-cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/cache
+            ~/.cache
+            /home/runner/.cache
+            !~/cache/exclude
+            **/node_modules
+            /home/runner/.cache/Cypress
+            ~/.npm
+            ${{ github.workspace }}/.next/cache
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
+          restore-keys: |
+            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+      - name: Download meshery-ui artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: meshery-ui
+          path: /home/runner/work/meshery/meshery/ui/out
+      - name: Download provider-ui artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: provider-ui
+          path: /home/runner/work/meshery/meshery/provider-ui/out
+      - name: Run Meshery UI and Server
+        env:
+          PROVIDER_BASE_URLS: http://localhost:9876
+          PORT: 9081
+          ADAPTER_URLS: "localhost:10000 localhost:10001 localhost:10002 localhost:10003 localhost:10004 localhost:10009 localhost:10007"
+        run: |
+          make server &
+          sleep 60
+      - name: Run Playwright End-to-End Tests
+        env:
+          MESHERY_SERVER_URL: "http://localhost:9081"
+          REMOTE_PROVIDER_URL: "https://meshery.layer5.io"
+          REMOTE_PROVIDER_USER_EMAIL: ${{ secrets.REMOTE_PROVIDER_USER_EMAIL }}
+          REMOTE_PROVIDER_USER_PASSWORD: ${{ secrets.REMOTE_PROVIDER_USER_PASS }}
+          PROVIDER_TOKEN: ${{ secrets.PROVIDER_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
+        run: |
+          make test-setup-ui
+          make test-ui
+      - uses: daun/playwright-report-summary@v3
+        if: always()
+        with:
+          github-token: ${{ secrets.GH_ACCESS_TOKEN }}
+          report-file: ui/results.json
+          comment-title: "Meshery E2E Test with Playwright"
+

.github/workflows/error-codes-updater.yaml

@@ -19,12 +19,12 @@ jobs:
     steps:
       - uses: actions/checkout@master
         if: ${{ github.event_name == 'pull_request' }}
-        with:          
+        with:
           ref: "master"
           fetch-depth: 1
       - uses: actions/checkout@master
         if: ${{ github.event_name == 'push' }}
-        with:          
+        with:
           ref: "master"
           fetch-depth: 1
           token: ${{ secrets.GH_ACCESS_TOKEN }}
@@ -57,6 +57,9 @@ jobs:
           fi
           echo '{ "errors_export": "" }' | jq --slurpfile export ../server/helpers/errorutil_errors_export.json '.errors_export = $export[0]' > ../docs/_data/errorref/mesheryctl_errors_export.json
 
+      - name: Pull changes from remote
+        run: git pull origin master
+
       - name: Commit changes
         if: ${{ github.event_name != 'pull_request' }}  # Skip for pull requests
         uses: stefanzweifel/git-auto-commit-action@v5
@@ -66,4 +69,4 @@ jobs:
           commit_user_email: [email protected]
           commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           commit_options: "--signoff"
-          commit_message: "[Error Codes]: Update Meshery server and mehseryctl error codes and reference"
+          commit_message: "[Error Codes]: Update Meshery server and mehseryctl error codes and reference"

.github/workflows/generate_keys.yml

@@ -1,5 +1,5 @@
 name: Import Keys
-on: 
+on:
   workflow_dispatch:
     inputs:
       spreadsheet_uri:
@@ -20,16 +20,20 @@ jobs:
     - name: Set spreadsheet_uri as environment variable
       run: echo "spreadsheet_uri=${{inputs.spreadsheet_uri}}" >> $GITHUB_ENV
       if: inputs.spreadsheet_uri != ''
-      
+
     - name: Dump keys from the spreadsheet
       run: |
-        curl -L "${{ env.spreadsheet_uri }}" -o "./keys.csv";      
+        curl -L "${{ env.spreadsheet_uri }}" -o "./keys.csv";
     - name: Create permissions folder
       run: |
           [ ! -d "./server/permissions" ] && mkdir -p "./server/permissions";
           mv keys.csv server/permissions/keys.csv;
     - name: Save keys.csv to docs/assets/excel
       run: cp server/permissions/keys.csv docs/assets/excel/keys.csv
+
+    - name: Pull changes from remote
+      run: git pull origin master
+
     - name: Commit changes
       uses: stefanzweifel/git-auto-commit-action@v5
       with:
@@ -38,4 +42,4 @@ jobs:
         commit_options: '--signoff'
         commit_user_name: l5io
         commit_user_email: [email protected]
-        commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run
+        commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run

.github/workflows/go-mod-sync.yaml

@@ -31,6 +31,10 @@ jobs:
     - name: Go mod sync utility
       run: cd meshery-extensions;make graphql-sync;
 
+    - name: Pull changes from remote
+      working-directory: ./meshery-extensions
+      run: git pull origin master
+
     - name: Commit
       uses: stefanzweifel/git-auto-commit-action@v5
       with:
@@ -43,7 +47,7 @@ jobs:
         branch: master
   notify-via-email:
     runs-on: ubuntu-latest
-    needs: 
+    needs:
       - sync
     if: ${{ always() && contains(needs.*.result, 'failure') }}
     steps:
@@ -58,7 +62,7 @@ jobs:
           to: [email protected]
           from: Meshery extensions go.mod sync workflow
           body: |
-            The workflow (https://github.com/meshery/meshery/actions/workflows/go-mod-sync.yml) encountered error(s). This mainly occurs when the go.mod file in the meshery-extensions repository is not in sync with the go.mod file in the meshery/meshery repository. The workflow attempts to update the go.mod file in the meshery-extensions repository to ensure it matches the go.mod file in the meshery/meshery repository. 
+            The workflow (https://github.com/meshery/meshery/actions/workflows/go-mod-sync.yml) encountered error(s). This mainly occurs when the go.mod file in the meshery-extensions repository is not in sync with the go.mod file in the meshery/meshery repository. The workflow attempts to update the go.mod file in the meshery-extensions repository to ensure it matches the go.mod file in the meshery/meshery repository.
 
             The workflow failed. Here are the details:
 
@@ -71,4 +75,3 @@ jobs:
             ${{ toJson(job.steps) }}
 
             Refer to the GitHub Actions log for more details: https://github.com/meshery/meshery/actions/runs/${{ github.run_id }}
-