Merge pull request #625 from marle3003/develop

Develop

Author: marle3003

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 23
       - name: build webui
         working-directory: ./webui
         run: |
@@ -29,7 +29,7 @@ jobs:
           npm run build
 
       - name: Run Unit tests.
-        run: go test -v  -coverprofile=coverage.out -covermode=atomic ./...
+        run: go test -v --cover -coverprofile=coverage.out -covermode=atomic ./...
 
       - name: Upload Coverage report to CodeCov
         uses: codecov/codecov-action@v3

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
           go-version: 1.23.4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          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
@@ -62,7 +62,7 @@ jobs:
           go-version: 1.23.4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 23
           registry-url: 'https://registry.npmjs.org'
       - run: choco install go-task
       - run: npm install

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
 
   publish-report:
     name: Publish Playwright Report
-    if: "(success() || needs.test.result == 'failure') && github.repository == 'marle3003/mokapi'"
+    if: "(success() || needs.test.result == 'failure') && github.event.pull_request.head.repo.full_name == 'marle3003/mokapi'"
     needs: [ test ]
     runs-on: ubuntu-latest
     continue-on-error: true

README.md

@@ -122,9 +122,9 @@ Explore tutorials that walk you through mocking different protocols and scenario
 
 - [Get Started](https://mokapi.io/docs/guides/welcome)
 - [HTTP](https://mokapi.io/docs/guides/http)
-- [Kafka](https://mokapi.io/docs/guides/kafka/overview)
-- [LDAP](https://mokapi.io/docs/guides/ldap/overview)
-- [SMTP](https://mokapi.io/docs/guides/smtp/overview)
+- [Kafka](https://mokapi.io/docs/guides/kafka)
+- [LDAP](https://mokapi.io/docs/guides/ldap)
+- [SMTP](https://mokapi.io/docs/guides/mail)
 - [Javascript API](https://mokapi.io/docs/javascript-api)
 - [Resources](https://mokapi.io/docs/resources)
 

acceptance/acceptance_test.go

@@ -4,7 +4,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"mokapi/config/static"
-	"mokapi/runtime/events"
 	"testing"
 	"time"
 )
@@ -24,11 +23,6 @@ type BaseSuite struct {
 func (suite *BaseSuite) initCmd(cfg *static.Config) {
 	//logrus.SetOutput(io.Discard)
 
-	events.SetStore(20, events.NewTraits().WithNamespace("http"))
-	events.SetStore(20, events.NewTraits().WithNamespace("kafka"))
-	events.SetStore(20, events.NewTraits().WithNamespace("smtp"))
-	events.SetStore(20, events.NewTraits().WithNamespace("ldap"))
-
 	suite.cfg = cfg
 	cmd, err := Start(cfg)
 	require.NoError(suite.T(), err)

acceptance/cmd_test.go

@@ -13,6 +13,7 @@ import (
 	"mokapi/feature"
 	"mokapi/providers/asyncapi3"
 	"mokapi/providers/directory"
+	mail2 "mokapi/providers/mail"
 	"mokapi/providers/openapi"
 	"mokapi/providers/swagger"
 	"mokapi/runtime"
@@ -51,13 +52,13 @@ func Start(cfg *static.Config) (*Cmd, error) {
 
 	http := server.NewHttpManager(scriptEngine, certStore, app)
 	kafka := server.NewKafkaManager(scriptEngine, app)
-	smtp := server.NewSmtpManager(app, scriptEngine, certStore)
+	mailManager := server.NewMailManager(app, scriptEngine, certStore)
 	ldap := server.NewLdapDirectoryManager(scriptEngine, certStore, app)
 
 	watcher.AddListener(func(e dynamic.ConfigEvent) {
 		kafka.UpdateConfig(e)
 		http.Update(e)
-		smtp.UpdateConfig(e)
+		mailManager.UpdateConfig(e)
 		ldap.UpdateConfig(e)
 		if err := scriptEngine.AddScript(e); err != nil {
 			panic(err)
@@ -76,7 +77,7 @@ func Start(cfg *static.Config) (*Cmd, error) {
 
 	pool := safe.NewPool(context.Background())
 	ctx, cancel := context.WithCancel(context.Background())
-	s := server.NewServer(pool, app, watcher, kafka, http, smtp, ldap, scriptEngine)
+	s := server.NewServer(pool, app, watcher, kafka, http, mailManager, ldap, scriptEngine)
 	s.StartAsync(ctx)
 
 	return &Cmd{
@@ -110,4 +111,7 @@ func registerDynamicTypes() {
 	dynamic.Register("smtp", func(v version.Version) bool {
 		return true
 	}, &mail.Config{})
+	dynamic.Register("mail", func(v version.Version) bool {
+		return true
+	}, &mail2.Config{})
 }

acceptance/ldap_test.go

@@ -1,12 +1,13 @@
 package acceptance
 
 import (
+	"fmt"
 	"github.com/stretchr/testify/require"
 	"mokapi/config/static"
 	"mokapi/ldap"
-	"mokapi/providers/directory"
-	"mokapi/runtime/events"
 	"mokapi/runtime/metrics"
+	"mokapi/try"
+	"net/http"
 	"time"
 )
 
@@ -30,12 +31,7 @@ func (suite *LdapSuite) TearDownSuite() {
 	suite.Client.Close()
 }
 
-func (suite *BaseSuite) BeforeTest(_, _ string) {
-	events.SetStore(20, events.NewTraits().WithNamespace("ldap"))
-}
-
 func (suite *LdapSuite) AfterTest(_, _ string) {
-	events.Reset()
 	suite.cmd.App.Monitor.Reset()
 }
 
@@ -66,14 +62,12 @@ func (suite *LdapSuite) TestLog() {
 	}
 	_, err := suite.Client.Search(search)
 	require.NoError(suite.T(), err)
-	e := events.GetEvents(events.NewTraits().WithNamespace("ldap"))
-	require.Len(suite.T(), e, 1)
-	data := e[0].Data.(*directory.SearchLog)
-	require.Equal(suite.T(), "WholeSubtree", data.Request.Scope)
-	require.Equal(suite.T(), "(objectClass=user)", data.Request.Filter)
-	require.Equal(suite.T(), []string{"mail"}, data.Request.Attributes)
-	require.Len(suite.T(), data.Response.Results, 4)
-	require.Equal(suite.T(), "Success", data.Response.Status)
+
+	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%v/api/events?namespace=ldap", suite.cfg.Api.Port),
+		nil,
+		try.HasStatusCode(http.StatusOK),
+		try.BodyContains(`:{"request":{"operation":"Search","baseDN":"","scope":"WholeSubtree","dereferencePolicy":0,"sizeLimit":0,"timeLimit":0,"typesOnly":false,"filter":"(objectClass=user)","attributes":["mail"],"controls":null}`),
+	)
 }
 
 func (suite *LdapSuite) TestMetric() {

acceptance/mail/config.yml

@@ -0,0 +1,11 @@
+mail: 1.0
+info:
+  title: Mokapi MailServer
+servers:
+  smtps:
+    host: localhost:8025
+    protocol: smtps
+rules:
+  allowSender:
+    sender: .*@foo.bar
+    action: allow

acceptance/mail/config_old.yml

@@ -0,0 +1,4 @@
+smtp: 1.0
+info:
+  title: Mokapi MailServer Old
+server: smtp://localhost:8030