Develop

.github/actions/build-alpha-release-notes/action.yml

@@ -0,0 +1,39 @@
+name: build-alpha-release-notes
+description: build-alpha-release-notes
+inputs:
+  version:
+    required: true
+    description: The alpha version
+  latest-tag:
+    description: The latest tag or empty
+runs:
+  using: composite
+  steps:
+    - name: Generate alpha release notes
+      if: inputs.latest-tag != ''
+      shell: bash
+      run: |
+        {
+          echo "# Mokapi Release ${{ inputs.version }}"
+          echo
+          echo "⚠️ Automatically generated alpha build."
+          echo
+          echo "- Alpha version: ${{ inputs.version }}"
+          echo "- Commit: $(git rev-parse --short HEAD)"
+          echo "- Built at: $(date -u +"%Y-%m-%d %H:%M:%S UTC")"
+          echo
+          echo "## Changes since ${{ inputs.latest-tag }}"
+          echo
+          git log "${{ inputs.latest-tag }}..HEAD" \
+            --oneline \
+            --no-merges |
+            grep -v -E 'github-actions\[bot\]|dependabot\[bot\]|test|Bump' |
+            sed 's/^[a-f0-9]\{7,40\} //' |  # remove SHA prefix
+            awk '!seen[$0]++' |
+            sed 's/^/- /'
+        } > docs/release.md
+    - name: Upload UI artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: release-notes
+        path: docs/release.md

.github/actions/build-cli-flags-doc/action.yaml

@@ -0,0 +1,18 @@
+name: "Build Mokapi CLI Flags doc"
+runs:
+  using: composite
+  steps:
+    - name: Create directory and file
+      shell: bash
+      run: |
+        mkdir -p webui/dist
+        touch webui/dist/.tmp
+    - name: Build CLI doc
+      shell: bash
+      run: go run ./cmd/internal/gen-cli-docs/main.go
+    - name: Add CLI Flags nav entry
+      working-directory: ./docs
+      shell: bash
+      run: |
+        jq '.Configuration.items.Static.items["CLI Flags"] = "configuration/static/mokapi.md"' ./config.json > ./tmp.json
+        mv ./tmp.json ./config.json

.github/actions/build-mokapi-image/action.yml

@@ -1,5 +1,4 @@
 name: "Build Mokapi image"
-description: "Builds and deploys the React frontend to AWS S3"
 inputs:
   image-name:
     required: true
@@ -10,27 +9,20 @@ inputs:
   version:
     required: true
     description: "The version of mokapi to build"
-    type: string
+  latest-tag:
+    required: true
+    description: "The latest tag"
 runs:
   using: "composite"
   steps:
     - uses: actions/setup-go@v5
       with:
         go-version: 1.25.5
-    - name: Create directory and file
-      run: |
-        mkdir -p webui/dist
-        touch webui/dist/.tmp
-      shell: bash
-    - name: Build CLI doc
-      run: go run ./cmd/internal/gen-cli-docs/main.go
-      shell: bash
-    - name: Add CLI Flags nav entry
-      run: |
-        jq '.Configuration.items.Static.items["CLI Flags"] = "configuration/static/mokapi.md"' ./config.json > ./tmp.json
-        mv ./tmp.json ./config.json
-      working-directory: ./docs
-      shell: bash
+    - uses: ./.github/actions/build-cli-flags-doc
+    - uses: ./.github/actions/build-alpha-release-notes
+      with:
+        version: ${{ inputs.version }}
+        latest-tag: ${{ inputs.latest-tag }}
     - name: Build docker alpha image
       run: docker build --build-arg VERSION=${{ inputs.version }} -t ${{ inputs.image-name }} -t mokapi/mokapi:alpha -f ./images/alpha.Dockerfile .
       shell: bash

.github/actions/build-release-notes/action.yml

@@ -0,0 +1,16 @@
+name: build-release-notes
+description: build-release-notes
+runs:
+  using: composite
+  steps:
+    - name: Write release notes
+      shell: bash
+      run: |
+        VERSION="${{ github.event.release.tag_name }}"
+        BODY="${{ github.event.release.body }}"
+        echo "# Mokapi ${VERSION}\n\n${BODY}" > docs/release.md
+    - name: Upload UI artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: release-notes
+        path: docs/release.md

.github/workflows/alpha.yml

@@ -16,11 +16,15 @@ jobs:
     outputs:
       version: ${{ steps.get_version.outputs.version }}
       image-name: ${{ steps.get_version.outputs.image-name }}
+      latest-tag: ${{ steps.get_version.outputs.latest_tag }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Ensure all tags are fetched
+      - name: Fetch main
+        shell: bash
+        run: git fetch origin main --tags --force
       - name: get version
         id: get_version
         shell: bash
@@ -40,8 +44,9 @@ jobs:
           NEW_VERSION="$MAJOR.$MINOR.$PATCH"
 
           echo "New version: $NEW_VERSION"
-          echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$NEW_VERSION-alpha" >> $GITHUB_OUTPUT
           echo "image-name=mokapi/mokapi:$NEW_VERSION-alpha"  >> $GITHUB_OUTPUT
+          echo "latest_tag=$LATEST_TAG" >> $GITHUB_OUTPUT
 
   build-alpha:
     needs: setup
@@ -52,6 +57,7 @@ jobs:
       artifact-test-report: playwright-report
       report-publish-path: reports/${{ github.ref_name }}
       version: ${{ needs.setup.outputs.version }}
+      latest-tag: ${{ needs.setup.outputs.latest-tag }}
 
   publish-image:
     name: Publish docker image

.github/workflows/release.yml

@@ -10,15 +10,49 @@ permissions:
   contents: write
 
 jobs:
-  release-linux:
-    name: Release
+  build-dashboard:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 1.25.5
+      - uses: ./.github/actions/build-cli-flags-doc
+      - uses: ./.github/actions/build-release-notes
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 23
+          registry-url: 'https://registry.npmjs.org'
+      - run: npm install
+        working-directory: ./webui
+      - name: Install taskfile
+        run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
+      - name: Build
+        run: task build-vue-app
+        env:
+          CGO_ENABLED: 0
+      - name: Upload UI artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dashboard
+          path: webui/dist
+
+  release-unix:
+    needs: build-dashboard
     runs-on: ubuntu-latest
     env:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Download dashboard
+        uses: actions/download-artifact@v4
+        with:
+          name: dashboard
+          path: webui/dist
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -31,17 +65,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: 1.25.5
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 23
-          registry-url: 'https://registry.npmjs.org'
-      - run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
-      - run: npm install
-        working-directory: ./webui
-      - name: Build
-        run: task build-vue-app
-        env:
-          CGO_ENABLED: 0
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
@@ -50,17 +73,19 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAP_GITHUB_TOKEN: ${{ secrets.TAP_GITHUB_TOKEN }}
-      - name: Publish npm
-        run: task publish-npm-package VERSION=${GITHUB_REF##*/v}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   release-windows:
+    needs: build-dashboard
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Download dashboard
+        uses: actions/download-artifact@v4
+        with:
+          name: dashboard
+          path: webui/dist
       - uses: actions/setup-go@v5
         with:
           go-version: 1.25.5
@@ -69,12 +94,6 @@ jobs:
           node-version: 23
           registry-url: 'https://registry.npmjs.org'
       - run: choco install go-task
-      - run: npm install
-        working-directory: ./webui
-      - name: Build
-        run: task build-vue-app
-        env:
-          CGO_ENABLED: 0
       - name: Install goversioninfo
         run: go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.4.0
       - name: Generate Windows metadata (.syso)
@@ -107,3 +126,21 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}
+
+  release-npm:
+    needs: build-dashboard
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download dashboard
+        uses: actions/download-artifact@v4
+        with:
+          name: dashboard
+          path: webui/dist
+      - name: Install taskfile
+        run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
+      - name: Build
+        run: task build-vue-app
+        env:
+          CGO_ENABLED: 0
+      - name: Publish
+        run: task publish-npm-package VERSION=${GITHUB_REF##*/v}

.github/workflows/test.yml

@@ -18,6 +18,9 @@ on:
         required: true
         description: "The version of mokapi to build"
         type: string
+      latest-tag:
+        description: "The latest tag"
+        type: string
 
 jobs:
   build:
@@ -26,11 +29,17 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Fetch main
+        run: git fetch origin main --tags --force
       - uses: ./.github/actions/build-mokapi-image
         with:
           image-name: ${{ inputs.image-name }}
           artifact-name: ${{ inputs.image-artifact-name }}
           version: ${{ inputs.version }}
+          latest-tag: ${{ inputs.latest-tag }}
 
   test:
     name: Run UI tests
@@ -55,9 +64,7 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-        with:
-          path: src
-      - uses: ./src/.github/actions/publish-test-report
+      - uses: ./.github/actions/publish-test-report
         with:
           artifact-test-report: ${{ inputs.artifact-test-report }}
           test-report-path: ${{ inputs.report-publish-path }}

acceptance/mail_test.go

@@ -36,6 +36,8 @@ func (suite *MailSuite) SetupSuite() {
 }
 
 func (suite *MailSuite) TestSendMail() {
+	time.Sleep(2 * time.Second)
+
 	ca := cert.DefaultRootCert()
 
 	err := smtptest.SendMail("from@foo.bar",

acceptance/petstore_test.go

@@ -57,10 +57,12 @@ func (suite *PetStoreSuite) TestApi() {
 			"description": "",
 			"servers": []interface{}{
 				map[string]interface{}{
-					"description": "",
 					"host":        "127.0.0.1:19092",
 					"name":        "broker",
 					"protocol":    "kafka",
+					"title":       "",
+					"summary":     "",
+					"description": "",
 				},
 			},
 
@@ -120,8 +122,8 @@ func (suite *PetStoreSuite) TestApi() {
 				},
 				"name": "petstore.order-event",
 				"partitions": []interface{}{
-					map[string]interface{}{"id": float64(0), "leader": map[string]interface{}{"addr": "127.0.0.1:19092", "name": "broker"}, "offset": float64(1), "segments": float64(1), "startOffset": float64(0)},
-					map[string]interface{}{"id": float64(1), "leader": map[string]interface{}{"addr": "127.0.0.1:19092", "name": "broker"}, "offset": float64(0), "segments": float64(0), "startOffset": float64(0)},
+					map[string]interface{}{"id": float64(0), "offset": float64(1), "segments": float64(1), "startOffset": float64(0)},
+					map[string]interface{}{"id": float64(1), "offset": float64(0), "segments": float64(0), "startOffset": float64(0)},
 				},
 			}},
 		}
@@ -172,7 +174,7 @@ func (suite *PetStoreSuite) TestJsHttpHandler() {
 
 	// test http metrics
 	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%d/api/metrics/http?path=/pet/{petId}", suite.cfg.Api.Port), nil,
-		try.BodyContains(`http_requests_total{service=\"Swagger Petstore\",endpoint=\"/pet/{petId}\"}","value":4}`),
+		try.BodyContains(`http_requests_total{service=\"Swagger Petstore\",endpoint=\"/pet/{petId}\",method=\"GET\"}","value":4}`),
 	)
 }
 

api/handler_events_test.go

@@ -274,7 +274,7 @@ func TestHandler_KafkaEvents(t *testing.T) {
 			fn: func(t *testing.T, h http.Handler, sm *events.StoreManager) {
 				sm.SetStore(1, events.NewTraits().WithNamespace("kafka"))
 
-				err := sm.Push(&store.KafkaLog{
+				err := sm.Push(&store.KafkaMessageLog{
 					Offset:         123,
 					Key:            store.LogValue{},
 					Message:        store.LogValue{},
@@ -283,6 +283,8 @@ func TestHandler_KafkaEvents(t *testing.T) {
 					ProducerId:     3,
 					ProducerEpoch:  1,
 					SequenceNumber: 2,
+					ClientId:       "foo",
+					ScriptFile:     "123-123",
 				}, events.NewTraits().WithNamespace("kafka"))
 				require.NoError(t, err)
 
@@ -315,6 +317,8 @@ func TestHandler_KafkaEvents(t *testing.T) {
 							"producerId":     float64(3),
 							"schemaId":       float64(0),
 							"sequenceNumber": float64(2),
+							"clientId":       "foo",
+							"script":         "123-123",
 						},
 							m[0]["data"])
 					}))