diff --git a/README.md b/README.md index 3836a7b..7490899 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ import ( "fmt" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" + "github.com/PxyUp/fitter/pkg/builder" pl "github.com/PxyUp/fitter/pkg/plugins/plugin" ) diff --git a/cmd/fitter/main.go b/cmd/fitter/main.go index 8bcf55a..b256a16 100644 --- a/cmd/fitter/main.go +++ b/cmd/fitter/main.go @@ -31,6 +31,11 @@ func getConfig(filePath string) *config.Config { return nil } + if len(cfg.Items) == 0 { + log.Fatal("empty config") + return nil + } + return cfg } diff --git a/examples/plugin/README.md b/examples/plugin/README.md index ba930e9..3442882 100644 --- a/examples/plugin/README.md +++ b/examples/plugin/README.md @@ -33,7 +33,7 @@ import ( "fmt" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" + "github.com/PxyUp/fitter/pkg/builder" pl "github.com/PxyUp/fitter/pkg/plugins/plugin" ) diff --git a/examples/plugin/connector/connector.go b/examples/plugin/connector/connector.go index 1e36988..dbc4bb3 100644 --- a/examples/plugin/connector/connector.go +++ b/examples/plugin/connector/connector.go @@ -3,9 +3,9 @@ package main import ( "encoding/json" "fmt" + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" pl "github.com/PxyUp/fitter/pkg/plugins/plugin" ) diff --git a/examples/plugin/hardcoder/hardcoder.go b/examples/plugin/hardcoder/hardcoder.go index fb0198f..9da9b46 100644 --- a/examples/plugin/hardcoder/hardcoder.go +++ b/examples/plugin/hardcoder/hardcoder.go @@ -3,9 +3,9 @@ package main import ( "encoding/json" "fmt" + builder "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" pl "github.com/PxyUp/fitter/pkg/plugins/plugin" ) diff --git a/pkg/parser/builder/array.go b/pkg/builder/array.go similarity index 100% rename from pkg/parser/builder/array.go rename to pkg/builder/array.go diff --git a/pkg/parser/builder/bool.go b/pkg/builder/bool.go similarity index 100% rename from pkg/parser/builder/bool.go rename to pkg/builder/bool.go diff --git a/pkg/parser/builder/builder.go b/pkg/builder/builder.go similarity index 100% rename from pkg/parser/builder/builder.go rename to pkg/builder/builder.go diff --git a/pkg/parser/builder/float.go b/pkg/builder/float.go similarity index 100% rename from pkg/parser/builder/float.go rename to pkg/builder/float.go diff --git a/pkg/parser/builder/int.go b/pkg/builder/int.go similarity index 100% rename from pkg/parser/builder/int.go rename to pkg/builder/int.go diff --git a/pkg/parser/builder/null.go b/pkg/builder/null.go similarity index 100% rename from pkg/parser/builder/null.go rename to pkg/builder/null.go diff --git a/pkg/parser/builder/object.go b/pkg/builder/object.go similarity index 100% rename from pkg/parser/builder/object.go rename to pkg/builder/object.go diff --git a/pkg/parser/builder/pure_string.go b/pkg/builder/pure_string.go similarity index 100% rename from pkg/parser/builder/pure_string.go rename to pkg/builder/pure_string.go diff --git a/pkg/parser/builder/static.go b/pkg/builder/static.go similarity index 100% rename from pkg/parser/builder/static.go rename to pkg/builder/static.go diff --git a/pkg/parser/builder/string.go b/pkg/builder/string.go similarity index 100% rename from pkg/parser/builder/string.go rename to pkg/builder/string.go diff --git a/pkg/parser/builder/uuid.go b/pkg/builder/uuid.go similarity index 100% rename from pkg/parser/builder/uuid.go rename to pkg/builder/uuid.go diff --git a/pkg/connectors/browser.go b/pkg/connectors/browser.go index b17b0b7..37008f5 100644 --- a/pkg/connectors/browser.go +++ b/pkg/connectors/browser.go @@ -1,9 +1,9 @@ package connectors import ( + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/PxyUp/fitter/pkg/utils" ) diff --git a/pkg/connectors/connectors.go b/pkg/connectors/connectors.go index fb23757..151065a 100644 --- a/pkg/connectors/connectors.go +++ b/pkg/connectors/connectors.go @@ -2,7 +2,7 @@ package connectors import ( "errors" - "github.com/PxyUp/fitter/pkg/parser/builder" + "github.com/PxyUp/fitter/pkg/builder" ) var ( diff --git a/pkg/connectors/server.go b/pkg/connectors/server.go index 222c5cd..578ab74 100644 --- a/pkg/connectors/server.go +++ b/pkg/connectors/server.go @@ -3,11 +3,11 @@ package connectors import ( "bytes" "context" + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/connectors/limitter" "github.com/PxyUp/fitter/pkg/http_client" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/PxyUp/fitter/pkg/utils" "golang.org/x/sync/semaphore" "io" diff --git a/pkg/connectors/static.go b/pkg/connectors/static.go index b50fa28..ae54b09 100644 --- a/pkg/connectors/static.go +++ b/pkg/connectors/static.go @@ -1,9 +1,9 @@ package connectors import ( + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/PxyUp/fitter/pkg/utils" ) diff --git a/pkg/notifier/notifier.go b/pkg/notifier/notifier.go index 0fa1bd0..6803817 100644 --- a/pkg/notifier/notifier.go +++ b/pkg/notifier/notifier.go @@ -2,9 +2,9 @@ package notifier import ( "fmt" + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/parser" - "github.com/PxyUp/fitter/pkg/parser/builder" "strconv" ) diff --git a/pkg/parser/expression.go b/pkg/parser/expression.go index a6f1284..85bf430 100644 --- a/pkg/parser/expression.go +++ b/pkg/parser/expression.go @@ -1,7 +1,7 @@ package parser import ( - "github.com/PxyUp/fitter/pkg/parser/builder" + "github.com/PxyUp/fitter/pkg/builder" "github.com/antonmedv/expr" ) diff --git a/pkg/parser/file.go b/pkg/parser/file.go index e23fbcf..b52e440 100644 --- a/pkg/parser/file.go +++ b/pkg/parser/file.go @@ -2,11 +2,11 @@ package parser import ( "errors" + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/connectors" "github.com/PxyUp/fitter/pkg/http_client" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/PxyUp/fitter/pkg/utils" "mime" "net/url" diff --git a/pkg/parser/html.go b/pkg/parser/html.go index bb27d08..d5b34b2 100644 --- a/pkg/parser/html.go +++ b/pkg/parser/html.go @@ -2,13 +2,13 @@ package parser import ( "bytes" + builder "github.com/PxyUp/fitter/pkg/builder" "strconv" "sync" "github.com/PuerkitoBio/goquery" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" ) type htmlParser struct { diff --git a/pkg/parser/json.go b/pkg/parser/json.go index 921fbaf..bfdb430 100644 --- a/pkg/parser/json.go +++ b/pkg/parser/json.go @@ -1,11 +1,11 @@ package parser import ( + builder "github.com/PxyUp/fitter/pkg/builder" "sync" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/tidwall/gjson" ) diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go index d12c91c..5e2baae 100644 --- a/pkg/parser/parser.go +++ b/pkg/parser/parser.go @@ -2,10 +2,10 @@ package parser import ( "fmt" + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/connectors" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/PxyUp/fitter/pkg/plugins/store" "github.com/PxyUp/fitter/pkg/utils" "github.com/tidwall/gjson" diff --git a/pkg/parser/xpath.go b/pkg/parser/xpath.go index 3e916fc..de28151 100644 --- a/pkg/parser/xpath.go +++ b/pkg/parser/xpath.go @@ -2,12 +2,12 @@ package parser import ( "bytes" + "github.com/PxyUp/fitter/pkg/builder" "strconv" "sync" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/antchfx/htmlquery" "golang.org/x/net/html" ) diff --git a/pkg/plugins/plugin/plugin.go b/pkg/plugins/plugin/plugin.go index a5f8aa2..e6badb8 100644 --- a/pkg/plugins/plugin/plugin.go +++ b/pkg/plugins/plugin/plugin.go @@ -1,10 +1,10 @@ package plugin import ( + "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/connectors" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" ) type FieldPlugin interface { diff --git a/pkg/plugins/store/store.go b/pkg/plugins/store/store.go index e84d4cb..8e394ca 100644 --- a/pkg/plugins/store/store.go +++ b/pkg/plugins/store/store.go @@ -2,9 +2,9 @@ package store import ( "fmt" + builder "github.com/PxyUp/fitter/pkg/builder" "github.com/PxyUp/fitter/pkg/config" "github.com/PxyUp/fitter/pkg/logger" - "github.com/PxyUp/fitter/pkg/parser/builder" "github.com/PxyUp/fitter/pkg/plugins/plugin" "os" "path" diff --git a/pkg/utils/formatter.go b/pkg/utils/formatter.go index 8e781fd..c84460b 100644 --- a/pkg/utils/formatter.go +++ b/pkg/utils/formatter.go @@ -2,7 +2,7 @@ package utils import ( "fmt" - "github.com/PxyUp/fitter/pkg/parser/builder" + builder "github.com/PxyUp/fitter/pkg/builder" "github.com/tidwall/gjson" "strings" )