From f27e2b1f6217240f7e56c38add1460ba10a88ecd Mon Sep 17 00:00:00 2001 From: edoardottt Date: Sun, 6 Nov 2022 09:58:27 +0100 Subject: [PATCH] Use utils helpers + fix double default value in StringSlice --- go.mod | 5 ++--- go.sum | 4 ++++ goflags.go | 3 +-- port.go | 2 +- runtime_map.go | 2 +- slice_common.go | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index a6292d9..e596691 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,6 @@ go 1.18 require ( github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 github.com/pkg/errors v0.9.1 - github.com/projectdiscovery/fileutil v0.0.0-20220705195237-01becc2a8963 - github.com/projectdiscovery/stringsutil v0.0.2 github.com/stretchr/testify v1.8.1 gopkg.in/yaml.v3 v3.0.1 ) @@ -18,6 +16,7 @@ require ( github.com/gorilla/css v1.0.0 // indirect github.com/microcosm-cc/bluemonday v1.0.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/projectdiscovery/utils v0.0.2 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect - golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect + golang.org/x/net v0.1.0 // indirect ) diff --git a/go.sum b/go.sum index 3e9766b..2742650 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ github.com/projectdiscovery/fileutil v0.0.0-20220705195237-01becc2a8963/go.mod h github.com/projectdiscovery/stringsutil v0.0.0-20220422150559-b54fb5dc6833/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I= github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= +github.com/projectdiscovery/utils v0.0.2 h1:lif4OYBqd8jCf0glRBfSs2lT4nMtNjHjeysRw8HIW8M= +github.com/projectdiscovery/utils v0.0.2/go.mod h1:PEYYkpCedmtydQRUvfWLPw0VRWpaFms4GFqNAziBANI= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -33,6 +35,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/goflags.go b/goflags.go index 3569e70..496ae6b 100644 --- a/goflags.go +++ b/goflags.go @@ -15,7 +15,7 @@ import ( "time" "github.com/cnf/structhash" - "github.com/projectdiscovery/fileutil" + fileutil "github.com/projectdiscovery/utils/file" "gopkg.in/yaml.v3" ) @@ -345,7 +345,6 @@ func (flagSet *FlagSet) IntVar(field *int, long string, defaultValue int, usage func (flagSet *FlagSet) StringSliceVarP(field *StringSlice, long, short string, defaultValue StringSlice, usage string, options Options) *FlagData { optionMap[field] = options for _, defaultItem := range defaultValue { - _ = field.Set(defaultItem) values, _ := ToStringSlice(defaultItem, options) for _, value := range values { _ = field.Set(value) diff --git a/port.go b/port.go index ad5ba9b..4a4b172 100644 --- a/port.go +++ b/port.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/projectdiscovery/stringsutil" + stringsutil "github.com/projectdiscovery/utils/strings" ) // Port is a list of unique ports in a normalized format diff --git a/runtime_map.go b/runtime_map.go index c0eaa5a..f0af3e7 100644 --- a/runtime_map.go +++ b/runtime_map.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/projectdiscovery/stringsutil" + stringsutil "github.com/projectdiscovery/utils/strings" ) const ( diff --git a/slice_common.go b/slice_common.go index ffd4eda..e09d681 100644 --- a/slice_common.go +++ b/slice_common.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/projectdiscovery/fileutil" + fileutil "github.com/projectdiscovery/utils/file" ) var quotes = []rune{'"', '\'', '`'}