Merge pull request #715 from marle3003/develop

Develop

Author: marle3003

acceptance/cmd_test.go

@@ -21,7 +21,6 @@ import (
 	"mokapi/server/cert"
 	"mokapi/version"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -34,10 +33,6 @@ type Cmd struct {
 func Start(cfg *static.Config) (*Cmd, error) {
 	log.SetLevel(log.DebugLevel)
 
-	if len(cfg.Services) > 0 {
-		return nil, errors.New("static configuration Services are no longer supported. Use patching instead.")
-	}
-
 	feature.Enable(cfg.Features)
 
 	registerDynamicTypes()

api/handler_http.go

@@ -211,44 +211,46 @@ func (h *handler) getHttpService(w http.ResponseWriter, r *http.Request, m *moni
 			op.Parameters = getParameters(p.Value.Parameters)
 			op.Parameters = append(op.Parameters, getParameters(o.Parameters)...)
 
-			for it := o.Responses.Iter(); it.Next(); {
-				statusCode := it.Key()
-				r := it.Value()
-				if r.Value == nil {
-					continue
-				}
-				res := response{
-					StatusCode:  statusCode,
-					Description: r.Value.Description,
-				}
-				if len(r.Description) > 0 {
-					res.Description = r.Description
-				}
-
-				for ct, r := range r.Value.Content {
-					res.Contents = append(res.Contents, mediaType{
-						Type:   ct,
-						Schema: r.Schema,
-					})
-				}
-				for name, h := range r.Value.Headers {
-					if h.Value == nil {
+			if o.Responses != nil {
+				for it := o.Responses.Iter(); it.Next(); {
+					statusCode := it.Key()
+					r := it.Value()
+					if r.Value == nil {
 						continue
 					}
+					res := response{
+						StatusCode:  statusCode,
+						Description: r.Value.Description,
+					}
+					if len(r.Description) > 0 {
+						res.Description = r.Description
+					}
 
-					hi := header{
-						Name:        name,
-						Description: h.Value.Description,
-						Schema:      h.Value.Schema,
+					for ct, r := range r.Value.Content {
+						res.Contents = append(res.Contents, mediaType{
+							Type:   ct,
+							Schema: r.Schema,
+						})
 					}
-					if len(h.Description) > 0 {
-						hi.Description = h.Description
+					for name, h := range r.Value.Headers {
+						if h.Value == nil {
+							continue
+						}
+
+						hi := header{
+							Name:        name,
+							Description: h.Value.Description,
+							Schema:      h.Value.Schema,
+						}
+						if len(h.Description) > 0 {
+							hi.Description = h.Description
+						}
+
+						res.Headers = append(res.Headers, hi)
 					}
 
-					res.Headers = append(res.Headers, hi)
+					op.Responses = append(op.Responses, res)
 				}
-
-				op.Responses = append(op.Responses, res)
 			}
 
 			requirements := append(o.Security, s.Security...)

api/handler_schema.go

@@ -66,7 +66,7 @@ func (h *handler) getExampleData(w http.ResponseWriter, r *http.Request) {
 	case *openApiSchema.Schema:
 		s = openApiSchema.ConvertToJsonSchema(t)
 	case *avro.Schema:
-		s = t.Convert()
+		s = avro.ConvertToJsonSchema(t)
 	default:
 		var ok bool
 		s, ok = t.(*jsonSchema.Schema)
@@ -151,7 +151,7 @@ func encodeExample(v interface{}, schema interface{}, schemaFormat string, conte
 		case *avro.Schema:
 			switch {
 			case ct.Subtype == "json":
-				data, err = encoding.NewEncoder(t.Convert()).Write(v, ct)
+				data, err = encoding.NewEncoder(avro.ConvertToJsonSchema(t)).Write(v, ct)
 			case ct.Key() == "avro/binary" || ct.Key() == "application/avro" || ct.Key() == "application/octet-stream":
 				data, err = t.Marshal(v)
 			default:

api/handler_schema_asyncapi.go

@@ -59,7 +59,7 @@ func getAsyncApiExample(w http.ResponseWriter, r *http.Request, cfg *asyncapi3.C
 	case *openApiSchema.Schema:
 		s = openApiSchema.ConvertToJsonSchema(t)
 	case *avro.Schema:
-		s = t.Convert()
+		s = avro.ConvertToJsonSchema(t)
 	default:
 		var ok bool
 		s, ok = t.(*jsonSchema.Schema)
@@ -85,7 +85,7 @@ func getAsyncApiExample(w http.ResponseWriter, r *http.Request, cfg *asyncapi3.C
 	case *avro.Schema:
 		switch {
 		case ct.Subtype == "json":
-			data, err = encoding.NewEncoder(t.Convert()).Write(rnd, ct)
+			data, err = encoding.NewEncoder(avro.ConvertToJsonSchema(t)).Write(rnd, ct)
 		case ct.Key() == "avro/binary" || ct.Key() == "application/avro" || ct.Key() == "application/octet-stream":
 			data, err = t.Marshal(rnd)
 		default:

cmd/mokapi/main.go

@@ -66,11 +66,6 @@ func main() {
 
 	fmt.Printf(logo, version.BuildVersion, strings.Repeat(" ", 17-len(versionString)))
 
-	if len(cfg.Services) > 0 {
-		fmt.Println("static configuration Services are no longer supported. Use patching instead.")
-		return
-	}
-
 	configureLogging(cfg)
 	registerDynamicTypes()
 
@@ -139,19 +134,17 @@ func createServer(cfg *static.Config) (*server.Server, error) {
 func configureLogging(cfg *static.Config) {
 	stdlog.SetFlags(stdlog.Lshortfile | stdlog.LstdFlags)
 
-	if cfg.Log != nil {
-		level, err := log.ParseLevel(cfg.Log.Level)
-		if err != nil {
-			log.WithField("logLevel", cfg.Log.Level).Errorf("error parsing log level: %v", err.Error())
-		}
-		log.SetLevel(level)
+	level, err := log.ParseLevel(cfg.Log.Level)
+	if err != nil {
+		log.WithField("logLevel", cfg.Log.Level).Errorf("error parsing log level: %v", err.Error())
+	}
+	log.SetLevel(level)
 
-		if strings.ToLower(cfg.Log.Format) == "json" {
-			log.SetFormatter(&log.JSONFormatter{})
-		} else {
-			formatter := &log.TextFormatter{DisableColors: false, FullTimestamp: true, DisableSorting: true}
-			log.SetFormatter(formatter)
-		}
+	if strings.ToLower(cfg.Log.Format) == "json" {
+		log.SetFormatter(&log.JSONFormatter{})
+	} else {
+		formatter := &log.TextFormatter{DisableColors: false, FullTimestamp: true, DisableSorting: true}
+		log.SetFormatter(formatter)
 	}
 }
 

cmd/mokapi/main_test.go

@@ -34,7 +34,7 @@ providers:
     file:
         filenames: []
         directories: []
-        skipprefix:
+        skipPrefix:
             - _
         include: []
     git:
@@ -59,11 +59,8 @@ api:
     dashboard: true
     search:
         enabled: false
-        types: []
 rootCaCert: ""
 rootCaKey: ""
-js:
-    globalfolders: []
 configs: []
 event:
     store:
@@ -83,7 +80,7 @@ data-gen:
 				require.Equal(t, `file:
     filenames: []
     directories: []
-    skipprefix:
+    skipPrefix:
         - _
     include: []
 git:

config/dynamic/provider/file/file.go

@@ -83,6 +83,7 @@ func (p *Provider) Read(u *url.URL) (*dynamic.Config, error) {
 	if err != nil {
 		return nil, err
 	}
+	config.Info.Url = u
 	config.SourceType = dynamic.SourceReference
 
 	p.watchPath(file)

config/static/static_config.go

@@ -12,14 +12,12 @@ import (
 )
 
 type Config struct {
-	Log              *MokApiLog        `json:"log" yaml:"log"`
-	ConfigFile       string            `json:"-" yaml:"-"`
+	Log              MokApiLog         `json:"log" yaml:"log"`
+	ConfigFile       string            `json:"-" yaml:"-" flag:"-"`
 	Providers        Providers         `json:"providers" yaml:"providers"`
 	Api              Api               `json:"api" yaml:"api"`
-	RootCaCert       tls.FileOrContent `json:"rootCaCert" yaml:"rootCaCert"`
-	RootCaKey        tls.FileOrContent `json:"rootCaKey" yaml:"rootCaKey"`
-	Services         Services          `json:"-" yaml:"-"`
-	Js               JsConfig          `json:"js" yaml:"js"`
+	RootCaCert       tls.FileOrContent `json:"rootCaCert" yaml:"rootCaCert" name:"root-ca-cert"`
+	RootCaKey        tls.FileOrContent `json:"rootCaKey" yaml:"rootCaKey" name:"root-ca-cert"`
 	Configs          Configs           `json:"configs" yaml:"configs" explode:"config"`
 	Help             bool              `json:"-" yaml:"-" aliases:"h"`
 	GenerateSkeleton interface{}       `json:"-" yaml:"-" flag:"generate-cli-skeleton"`
@@ -33,7 +31,7 @@ type Config struct {
 
 func NewConfig() *Config {
 	cfg := &Config{}
-	cfg.Log = &MokApiLog{Level: "info", Format: "text"}
+	cfg.Log = MokApiLog{Level: "info", Format: "text"}
 
 	cfg.Api.Port = "8080"
 	cfg.Api.Dashboard = true
@@ -67,37 +65,31 @@ type Api struct {
 
 type Search struct {
 	Enabled bool
-	Types   []string
-}
-
-type NgramAnalyzer struct {
-	Min int
-	Max int
 }
 
 type FileProvider struct {
 	Filenames   []string `explode:"filename"`
 	Directories []string `explode:"directory"`
-	SkipPrefix  []string `flag:"skip-prefix"`
+	SkipPrefix  []string `yaml:"skipPrefix" json:"skipPrefix" flag:"skip-prefix"`
 	Include     []string
 }
 
 type GitProvider struct {
 	Urls         []string `explode:"url"`
-	PullInterval string   `yaml:"pullInterval" name:"pull-interval"`
-	TempDir      string   `yaml:"tempDir" name:"temp-dir"`
+	PullInterval string   `yaml:"pullInterval" json:"pullInterval" name:"pull-interval"`
+	TempDir      string   `yaml:"tempDir" json:"tempDir" name:"temp-dir"`
 
 	Repositories []GitRepo `explode:"repository"`
 }
 
 type GitRepo struct {
 	Url string
 	// Specifies an allow list of files to include in mokapi
-	Files []string
+	Files []string `explode:"file"`
 	// Specifies an array of filenames pr pattern to include in mokapi
 	Include      []string
 	Auth         *GitAuth
-	PullInterval string `yaml:"pullInterval"`
+	PullInterval string `yaml:"pullInterval" name:"pull-interval"`
 }
 
 type GitAuth struct {
@@ -112,15 +104,15 @@ type GitHubAuth struct {
 
 type HttpProvider struct {
 	Urls          []string `explode:"url"`
-	PollInterval  string   `yaml:"pollInterval" flag:"poll-interval"`
-	PollTimeout   string   `yaml:"pollTimeout" flag:"poll-timeout"`
+	PollInterval  string   `yaml:"pollInterval" name:"poll-interval"`
+	PollTimeout   string   `yaml:"pollTimeout" name:"poll-timeout"`
 	Proxy         string
 	TlsSkipVerify bool              `yaml:"tlsSkipVerify" flag:"tls-skip-verify"`
 	Ca            tls.FileOrContent `yaml:"ca"`
 }
 
 type NpmProvider struct {
-	GlobalFolders []string     `yaml:"globalFolders" flag:"global-folders"`
+	GlobalFolders []string     `yaml:"globalFolders" name:"global-folders" explode:"global-folders"`
 	Packages      []NpmPackage `explode:"package"`
 }
 
@@ -132,36 +124,6 @@ type NpmPackage struct {
 	Include []string
 }
 
-type Services map[string]*Service
-
-func (s Services) GetByName(name string) *Service {
-	key := strings.ReplaceAll(name, " ", "-")
-	key = strings.ToLower(key)
-	return s[key]
-}
-
-type Service struct {
-	Config ServiceConfig
-	Http   *HttpService
-}
-
-type ServiceConfig struct {
-	File string
-	Url  string
-}
-
-type HttpService struct {
-	Servers []HttpServer
-}
-
-type HttpServer struct {
-	Url string
-}
-
-type JsConfig struct {
-	GlobalFolders []string
-}
-
 type Event struct {
 	Store map[string]Store
 }
@@ -182,7 +144,7 @@ type Certificate struct {
 }
 
 type DataGen struct {
-	OptionalProperties string `yaml:"optionalProperties" json:"optionalProperties"`
+	OptionalProperties string `yaml:"optionalProperties" json:"optionalProperties" name:"optional-properties"`
 }
 
 func (c *Configs) UnmarshalJSON(b []byte) error {

engine/kafka.go

@@ -206,7 +206,7 @@ func createValue(r *asyncapi3.SchemaRef) (value interface{}, err error) {
 	case *openapi.Schema:
 		value, err = openapi.CreateValue(v)
 	case *avro.Schema:
-		jsSchema := v.Convert()
+		jsSchema := avro.ConvertToJsonSchema(v)
 		value, err = generator.New(&generator.Request{Schema: jsSchema})
 	default:
 		err = fmt.Errorf("schema format not supported: %v", r.Value.Format)
@@ -289,7 +289,7 @@ func valueMatchMessagePayload(value any, msg *asyncapi3.Message) bool {
 		_, err := v.Marshal(value, media.ParseContentType("application/json"))
 		return err == nil
 	case *avro.Schema:
-		jsSchema := v.Convert()
+		jsSchema := avro.ConvertToJsonSchema(v)
 		_, err := encoding.NewEncoder(jsSchema).Write(value, media.ParseContentType("application/json"))
 		return err == nil
 	default:

engine/scripts.go

@@ -35,7 +35,7 @@ func (l *DefaultScriptLoader) Load(file *dynamic.Config, host common.Host) (comm
 	filename := file.Info.Path()
 	switch filepath.Ext(filename) {
 	case ".js", ".cjs", ".mjs", ".ts":
-		return js.New(file, host, l.config.Js)
+		return js.New(file, host)
 	case ".lua":
 		return lua.New(getScriptPath(file.Info.Url), s, host)
 	default: