Merge pull request #659 from marle3003/develop

Author: marle3003

README.md

@@ -78,15 +78,13 @@ For example, you can dynamically change the response based on query parameters:
 import { on } from 'mokapi';
 
 export default function() {
-    on('http', (request, response): boolean => {
+    on('http', (request, response) => {
         switch (request.path.petId) {
             case 2:
                 response.data.name = 'Betty';
-                return true;
             case 9:
                 response.statusCode = 404;
         }
-        return false;
     });
 }
 ```

acceptance/cmd_test.go

@@ -2,8 +2,6 @@ package acceptance
 
 import (
 	"context"
-	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
 	"mokapi/api"
 	"mokapi/config/dynamic"
 	"mokapi/config/dynamic/asyncApi"
@@ -21,6 +19,9 @@ import (
 	"mokapi/server"
 	"mokapi/server/cert"
 	"mokapi/version"
+
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 type Cmd struct {
@@ -67,7 +68,7 @@ func Start(cfg *static.Config) (*Cmd, error) {
 	})
 
 	if u, err := api.BuildUrl(cfg.Api); err == nil {
-		err = http.AddService("api", u, api.New(app, cfg.Api), true)
+		err = http.AddInternalService("api", u, api.New(app, cfg.Api))
 		if err != nil {
 			return nil, err
 		}

cmd/mokapi/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	stdlog "log"
 	"mokapi/api"
 	"mokapi/config/decoders"
@@ -28,6 +27,8 @@ import (
 	"os/signal"
 	"strings"
 	"syscall"
+
+	log "github.com/sirupsen/logrus"
 )
 
 const logo = "888b     d888          888             d8888          d8b \n8888b   d8888          888            d88888          Y8P \n88888b.d88888          888           d88P888              \n888Y88888P888  .d88b.  888  888     d88P 888 88888b.  888 \n888 Y888P 888 d88\"\"88b 888 .88P    d88P  888 888 \"88b 888 \n888  Y8P  888 888  888 888888K    d88P   888 888  888 888 \n888   \"   888 Y88..88P 888 \"88b  d8888888888 888 d88P 888 \n888       888  \"Y88P\"  888  888 d88P     888 88888P\"  888 \n        v%s by Marcel Lehmann%s 888          \n        https://mokapi.io                    888          \n                                             888   \n"
@@ -126,7 +127,7 @@ func createServer(cfg *static.Config) (*server.Server, error) {
 	})
 
 	if u, err := api.BuildUrl(cfg.Api); err == nil {
-		err = http.AddService("api", u, api.New(app, cfg.Api), true)
+		err = http.AddInternalService("api", u, api.New(app, cfg.Api))
 		if err != nil {
 			return nil, err
 		}

config/dynamic/config.go

@@ -2,11 +2,12 @@ package dynamic
 
 import (
 	"bytes"
-	"github.com/Masterminds/sprig"
 	"mokapi/sortedmap"
 	"strings"
 	"sync"
 	"text/template"
+
+	"github.com/Masterminds/sprig"
 )
 
 type Event int
@@ -31,13 +32,21 @@ type Validator interface {
 	Validate() error
 }
 
+type SourceType int
+
+const (
+	SourceMain SourceType = iota
+	SourceReference
+)
+
 type Config struct {
-	Info      ConfigInfo
-	Raw       []byte
-	Data      interface{}
-	Refs      Refs
-	Listeners Listeners
-	Scope     Scope
+	Info       ConfigInfo
+	Raw        []byte
+	Data       interface{}
+	Refs       Refs
+	Listeners  Listeners
+	Scope      Scope
+	SourceType SourceType
 }
 
 type Refs struct {

config/dynamic/provider/file/file.go

@@ -5,8 +5,6 @@ import (
 	"context"
 	"crypto/sha256"
 	"fmt"
-	"github.com/fsnotify/fsnotify"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"io/fs"
 	"math"
@@ -20,6 +18,9 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/fsnotify/fsnotify"
+	log "github.com/sirupsen/logrus"
 )
 
 const mokapiIgnoreFile = ".mokapiignore"
@@ -82,6 +83,7 @@ func (p *Provider) Read(u *url.URL) (*dynamic.Config, error) {
 	if err != nil {
 		return nil, err
 	}
+	config.SourceType = dynamic.SourceReference
 
 	p.watchPath(file)
 	return config, nil

config/dynamic/provider/http/http.go

@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"hash/fnv"
 	"io"
 	"mokapi/config/dynamic"
@@ -16,6 +15,8 @@ import (
 	"os"
 	"sync"
 	"time"
+
+	log "github.com/sirupsen/logrus"
 )
 
 type Provider struct {
@@ -81,6 +82,9 @@ func New(config static.HttpProvider) *Provider {
 
 func (p *Provider) Read(u *url.URL) (*dynamic.Config, error) {
 	c, _, err := p.readUrl(u)
+	if c != nil {
+		c.SourceType = dynamic.SourceReference
+	}
 	return c, err
 }
 

config/dynamic/provider/npm/npm.go

@@ -3,14 +3,15 @@ package npm
 import (
 	"context"
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"mokapi/config/dynamic"
 	"mokapi/config/dynamic/provider/file"
 	"mokapi/config/static"
 	"mokapi/safe"
 	"net/url"
 	"path/filepath"
 	"strings"
+
+	log "github.com/sirupsen/logrus"
 )
 
 type Provider struct {

lib/http.go

@@ -10,7 +10,7 @@ func GetUrl(r *http.Request) string {
 		return r.URL.String()
 	}
 	var sb strings.Builder
-	if strings.HasPrefix(r.Proto, "HTTPS") {
+	if r.TLS != nil {
 		sb.WriteString("https://")
 	} else {
 		sb.WriteString("http://")

providers/openapi/error.go

@@ -5,36 +5,36 @@ import (
 	"net/http"
 )
 
-type httpError struct {
+type HttpError struct {
 	StatusCode int
 	Header     http.Header
-	message    string
+	Message    string
 }
 
-func (h *httpError) Error() string {
-	return h.message
+func (h *HttpError) Error() string {
+	return h.Message
 }
 
-func newHttpError(status int, message string) *httpError {
-	return &httpError{
+func newHttpError(status int, message string) *HttpError {
+	return &HttpError{
 		StatusCode: status,
-		message:    message,
+		Message:    message,
 	}
 }
 
-func newHttpErrorf(status int, format string, args ...interface{}) *httpError {
-	return &httpError{
+func newHttpErrorf(status int, format string, args ...interface{}) *HttpError {
+	return &HttpError{
 		StatusCode: status,
-		message:    fmt.Sprintf(format, args...),
+		Message:    fmt.Sprintf(format, args...),
 	}
 }
 
-func newMethodNotAllowedErrorf(status int, methods []string, format string, args ...interface{}) *httpError {
-	return &httpError{
-		StatusCode: status,
+func newMethodNotAllowedErrorf(methods []string, format string, args ...interface{}) *HttpError {
+	return &HttpError{
+		StatusCode: http.StatusMethodNotAllowed,
 		Header: http.Header{
 			"Allow": methods,
 		},
-		message: fmt.Sprintf(format, args...),
+		Message: fmt.Sprintf(format, args...),
 	}
 }

providers/openapi/event_test.go

@@ -1,8 +1,6 @@
 package openapi_test
 
 import (
-	"github.com/sirupsen/logrus/hooks/test"
-	"github.com/stretchr/testify/require"
 	"mokapi/engine/enginetest"
 	"mokapi/media"
 	"mokapi/providers/openapi"
@@ -11,13 +9,16 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/sirupsen/logrus/hooks/test"
+	"github.com/stretchr/testify/require"
 )
 
 func TestEvent(t *testing.T) {
 	testcases := []struct {
 		name   string
 		config *openapi.Config
-		test   func(t *testing.T, h http.Handler)
+		test   func(t *testing.T, h openapi.Handler)
 	}{
 		{
 			name: "use response example (deprecated)",
@@ -35,12 +36,13 @@ func TestEvent(t *testing.T) {
 					)),
 				)),
 			),
-			test: func(t *testing.T, h http.Handler) {
+			test: func(t *testing.T, h openapi.Handler) {
 				r := httptest.NewRequest("get", "http://localhost/foo", nil)
 				r.Header.Set("Content-Type", "application/json")
 				rr := httptest.NewRecorder()
 
-				h.ServeHTTP(rr, r)
+				err := h.ServeHTTP(rr, r)
+				require.Nil(t, err)
 				require.Equal(t, http.StatusOK, rr.Code)
 				require.Equal(t, `"foo"`, rr.Body.String())
 			},
@@ -71,12 +73,13 @@ func TestEvent(t *testing.T) {
 					)),
 				)),
 			),
-			test: func(t *testing.T, h http.Handler) {
+			test: func(t *testing.T, h openapi.Handler) {
 				r := httptest.NewRequest("get", "http://localhost/foo", nil)
 				r.Header.Set("Content-Type", "application/json")
 				rr := httptest.NewRecorder()
 
-				h.ServeHTTP(rr, r)
+				err := h.ServeHTTP(rr, r)
+				require.Nil(t, err)
 				require.Equal(t, http.StatusOK, rr.Code)
 				require.Equal(t, `"foo"`, rr.Body.String())
 			},