diff --git a/go-earlybird.go b/go-earlybird.go index 3bc5845..6679b2c 100644 --- a/go-earlybird.go +++ b/go-earlybird.go @@ -20,9 +20,9 @@ import ( "flag" "os" - "github.com/americanexpress/earlybird/pkg/core" - "github.com/americanexpress/earlybird/pkg/scan" - "github.com/americanexpress/earlybird/pkg/utils" + "github.com/americanexpress/earlybird/v4/pkg/core" + "github.com/americanexpress/earlybird/v4/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/utils" ) var ( diff --git a/go.mod b/go.mod index 64b9c1e..de4e72c 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ -module github.com/americanexpress/earlybird +module github.com/americanexpress/earlybird/v4 -go 1.18 +go 1.20 require ( - code.sajari.com/docconv v1.2.0 - github.com/dghubble/sling v1.3.0 + code.sajari.com/docconv v1.3.7 + github.com/dghubble/sling v1.4.1 github.com/ghodss/yaml v1.0.0 github.com/gocarina/gocsv v0.0.0-20200330101823-46266ca37bd3 github.com/google/go-github v17.0.0+incompatible - github.com/gorilla/mux v1.7.4 + github.com/gorilla/mux v1.8.0 github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c - golang.org/x/net v0.0.0-20220722155237-a158d28d115b - golang.org/x/text v0.12.0 + golang.org/x/net v0.15.0 + golang.org/x/text v0.13.0 gopkg.in/src-d/go-git.v4 v4.13.1 ) @@ -25,8 +25,7 @@ require ( github.com/fatih/set v0.2.1 // indirect github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 // indirect github.com/go-resty/resty/v2 v2.3.0 // indirect - github.com/golang/protobuf v1.4.2 // indirect - github.com/google/go-querystring v1.0.0 // indirect + github.com/google/go-querystring v1.1.0 // indirect github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect @@ -37,15 +36,15 @@ require ( github.com/otiai10/gosseract/v2 v2.2.4 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/richardlehane/mscfb v1.0.3 // indirect - github.com/richardlehane/msoleps v1.0.1 // indirect + github.com/richardlehane/msoleps v1.0.3 // indirect github.com/sergi/go-diff v1.0.0 // indirect github.com/src-d/gcfg v1.4.0 // indirect github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect github.com/xanzy/ssh-agent v0.2.1 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - google.golang.org/protobuf v1.23.0 // indirect + golang.org/x/crypto v0.13.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/term v0.12.0 // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 2bd5b85..d9976ca 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -code.sajari.com/docconv v1.2.0 h1:4UFgUodoW/hZy8dgghiCSSrcKLJP3Imo6UYFatP0PqI= -code.sajari.com/docconv v1.2.0/go.mod h1:r8yfCP6OKbZ9Xkd87aBa4nfpk6ud/PoyLwex3n6cXSc= +code.sajari.com/docconv v1.3.7 h1:NDXvUefftL5nu2dssTpIYxPWgR7BRppQCP0g3qeaKpM= +code.sajari.com/docconv v1.3.7/go.mod h1:XR0TGHjKNsIVbQ2VF9O3ri3gbjhzekMxewE5uKN7UKY= github.com/JalfResi/justext v0.0.0-20170829062021-c0282dea7198 h1:8P+AjBhGByCuCX2zTkAf6UY+dj0JczX+t6cSdCSyvfw= github.com/JalfResi/justext v0.0.0-20170829062021-c0282dea7198/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0= github.com/PuerkitoBio/goquery v1.4.1/go.mod h1:T9ezsOHcCrDCgA8aF1Cqr3sSYbO/xgdy8/R/XiIMAhA= @@ -24,8 +24,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dghubble/sling v1.3.0 h1:pZHjCJq4zJvc6qVQ5wN1jo5oNZlNE0+8T/h0XeXBUKU= -github.com/dghubble/sling v1.3.0/go.mod h1:XXShWaBWKzNLhu2OxikSNFrlsvowtz4kyRuXUG7oQKY= +github.com/dghubble/sling v1.4.1 h1:AxjTubpVyozMvbBCtXcsWEyGGgUZutC5YGrfxPNVOcQ= +github.com/dghubble/sling v1.4.1/go.mod h1:QoMB1KL3GAo+7HsD8Itd6S+6tW91who8BGZzuLvpOyc= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA= @@ -42,23 +42,17 @@ github.com/go-resty/resty/v2 v2.3.0 h1:JOOeAvjSlapTT92p8xiS19Zxev1neGikoHsXJeOq8 github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU= github.com/gocarina/gocsv v0.0.0-20200330101823-46266ca37bd3 h1:B7k6N+JlLM/u1xrIkpifUfE7GRJsZIYHoHbiAa5cSP4= github.com/gocarina/gocsv v0.0.0-20200330101823-46266ca37bd3/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= -github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c h1:aY2hhxLhjEAbfXOx2nRJxCXezC6CO2V/yN+OCr1srtk= github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= @@ -99,8 +93,9 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/richardlehane/mscfb v1.0.3 h1:rD8TBkYWkObWO0oLDFCbwMeZ4KoalxQy+QgniCj3nKI= github.com/richardlehane/mscfb v1.0.3/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= -github.com/richardlehane/msoleps v1.0.1 h1:RfrALnSNXzmXLbGct/P2b4xkFz4e8Gmj/0Vj9M9xC1o= github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= +github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM= +github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8= @@ -119,8 +114,9 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -129,10 +125,10 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -144,15 +140,16 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -160,13 +157,9 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/api/api.go b/pkg/api/api.go index c3c1d79..764fe7b 100755 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -23,11 +23,11 @@ import ( "os" "time" - cfgreader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/file" - "github.com/americanexpress/earlybird/pkg/git" - "github.com/americanexpress/earlybird/pkg/scan" - "github.com/americanexpress/earlybird/pkg/utils" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/file" + "github.com/americanexpress/earlybird/v4/pkg/git" + "github.com/americanexpress/earlybird/v4/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/utils" "gopkg.in/src-d/go-git.v4/plumbing/transport" ) diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go index f99862b..6f59437 100644 --- a/pkg/api/api_test.go +++ b/pkg/api/api_test.go @@ -27,9 +27,9 @@ import ( "path" "testing" - cfgreader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/scan" - "github.com/americanexpress/earlybird/pkg/utils" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/utils" ) var cfg = cfgreader.EarlybirdConfig{ diff --git a/pkg/broadcast/broadcast.go b/pkg/broadcast/broadcast.go index 9fad1a9..5a2bbd1 100644 --- a/pkg/broadcast/broadcast.go +++ b/pkg/broadcast/broadcast.go @@ -23,7 +23,7 @@ package broadcast import ( "context" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) type BroadcastServer interface { diff --git a/pkg/config/cfgReader_test.go b/pkg/config/cfgReader_test.go index da8581c..fba440f 100644 --- a/pkg/config/cfgReader_test.go +++ b/pkg/config/cfgReader_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/americanexpress/earlybird/pkg/utils" + "github.com/americanexpress/earlybird/v4/pkg/utils" ) var ( diff --git a/pkg/core/const.go b/pkg/core/const.go index bb5edcc..36a2a50 100644 --- a/pkg/core/const.go +++ b/pkg/core/const.go @@ -20,8 +20,8 @@ import ( "flag" "os" - cfgreader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/utils" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/utils" ) const ( diff --git a/pkg/core/core.go b/pkg/core/core.go index f7668cb..73995af 100644 --- a/pkg/core/core.go +++ b/pkg/core/core.go @@ -21,8 +21,8 @@ import ( "context" "flag" "fmt" - "github.com/americanexpress/earlybird/pkg/broadcast" - "github.com/americanexpress/earlybird/pkg/buildflags" + "github.com/americanexpress/earlybird/v4/pkg/broadcast" + "github.com/americanexpress/earlybird/v4/pkg/buildflags" "log" "net/http" "os" @@ -32,14 +32,14 @@ import ( "sync" "time" - "github.com/americanexpress/earlybird/pkg/api" - cfgreader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/file" - "github.com/americanexpress/earlybird/pkg/git" - "github.com/americanexpress/earlybird/pkg/scan" - configupdate "github.com/americanexpress/earlybird/pkg/update" - "github.com/americanexpress/earlybird/pkg/utils" - "github.com/americanexpress/earlybird/pkg/writers" + "github.com/americanexpress/earlybird/v4/pkg/api" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/file" + "github.com/americanexpress/earlybird/v4/pkg/git" + "github.com/americanexpress/earlybird/v4/pkg/scan" + configupdate "github.com/americanexpress/earlybird/v4/pkg/update" + "github.com/americanexpress/earlybird/v4/pkg/utils" + "github.com/americanexpress/earlybird/v4/pkg/writers" "github.com/gorilla/mux" "golang.org/x/net/http2" diff --git a/pkg/core/core_test.go b/pkg/core/core_test.go index 71dc79f..79fb3e2 100644 --- a/pkg/core/core_test.go +++ b/pkg/core/core_test.go @@ -21,9 +21,9 @@ import ( "path/filepath" "testing" - cfgReader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/scan" - "github.com/americanexpress/earlybird/pkg/utils" + cfgReader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/utils" ) var eb EarlybirdCfg diff --git a/pkg/core/structures.go b/pkg/core/structures.go index 54ad577..b505249 100644 --- a/pkg/core/structures.go +++ b/pkg/core/structures.go @@ -17,7 +17,7 @@ package core import ( - cfgReader "github.com/americanexpress/earlybird/pkg/config" + cfgReader "github.com/americanexpress/earlybird/v4/pkg/config" ) //EarlybirdCore is the main interface for interacting with Earlybird as a package diff --git a/pkg/file/fileUtil.go b/pkg/file/fileUtil.go index 2f8ab55..84695d6 100755 --- a/pkg/file/fileUtil.go +++ b/pkg/file/fileUtil.go @@ -33,10 +33,10 @@ import ( "path/filepath" "strings" - cfgreader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/scan" - "github.com/americanexpress/earlybird/pkg/utils" - "github.com/americanexpress/earlybird/pkg/wildcard" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/utils" + "github.com/americanexpress/earlybird/v4/pkg/wildcard" ) var ( diff --git a/pkg/file/fileUtil_test.go b/pkg/file/fileUtil_test.go index 9f1f5ae..5272f83 100644 --- a/pkg/file/fileUtil_test.go +++ b/pkg/file/fileUtil_test.go @@ -17,7 +17,7 @@ package file import ( - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" "reflect" "os" @@ -403,4 +403,4 @@ func TestGetConvertedFiles(t *testing.T) { } }) } -} \ No newline at end of file +} diff --git a/pkg/file/structures.go b/pkg/file/structures.go index 25ad8f1..14dffd6 100644 --- a/pkg/file/structures.go +++ b/pkg/file/structures.go @@ -16,7 +16,7 @@ package file -import "github.com/americanexpress/earlybird/pkg/scan" +import "github.com/americanexpress/earlybird/v4/pkg/scan" //Context is the file system context used for the scan process type Context struct { diff --git a/pkg/git/check.go b/pkg/git/check.go index e9dc70c..131e520 100755 --- a/pkg/git/check.go +++ b/pkg/git/check.go @@ -21,7 +21,7 @@ import ( "io" "strings" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) //ParseGitLog parses the git log into the earlybird file format diff --git a/pkg/git/cloner.go b/pkg/git/cloner.go index da17adc..d8539a2 100755 --- a/pkg/git/cloner.go +++ b/pkg/git/cloner.go @@ -25,7 +25,7 @@ import ( "os" "strings" - "github.com/americanexpress/earlybird/pkg/utils" + "github.com/americanexpress/earlybird/v4/pkg/utils" "github.com/google/go-github/github" "gopkg.in/src-d/go-git.v4" diff --git a/pkg/postprocess/skipSameKeyValue.go b/pkg/postprocess/skipSameKeyValue.go index 361db57..b95300d 100644 --- a/pkg/postprocess/skipSameKeyValue.go +++ b/pkg/postprocess/skipSameKeyValue.go @@ -1,7 +1,7 @@ package postprocess import ( - "github.com/americanexpress/earlybird/pkg/utils" + "github.com/americanexpress/earlybird/v4/pkg/utils" "regexp" "strings" ) diff --git a/pkg/scan/ruleCfgReader.go b/pkg/scan/ruleCfgReader.go index 8eddea6..6f73ebb 100755 --- a/pkg/scan/ruleCfgReader.go +++ b/pkg/scan/ruleCfgReader.go @@ -24,10 +24,10 @@ import ( "path/filepath" "regexp" - cfgreader "github.com/americanexpress/earlybird/pkg/config" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" ) -//Init loads in all the Earlybird rules into the CombinedRules global variable +// Init loads in all the Earlybird rules into the CombinedRules global variable func Init(cfg cfgreader.EarlybirdConfig) { if cfg.OutputFormat != "json" && !cfg.HideMeta { log.Println("Go-EarlyBird version: ", cfg.Version) @@ -113,7 +113,7 @@ func Init(cfg cfgreader.EarlybirdConfig) { } } -//loadRuleConfigs loads the rules from the JSON config file, compiles the rules and defines the search area +// loadRuleConfigs loads the rules from the JSON config file, compiles the rules and defines the search area func loadRuleConfigs(cfg cfgreader.EarlybirdConfig, moduleName, fileName string) []Rule { var rules, tmpRules Rules rulePath := path.Join(cfg.RulesConfigDir, fileName) @@ -137,7 +137,7 @@ func loadRuleConfigs(cfg cfgreader.EarlybirdConfig, moduleName, fileName string) return rules.Rules } -//loadLabelConfigs loads the labels from the config file +// loadLabelConfigs loads the labels from the config file func loadLabelConfigs(dirPath string) (LabelConfigRules map[int]LabelConfigs, err error) { LabelConfigRules = make(map[int]LabelConfigs) @@ -166,7 +166,7 @@ func loadLabelConfigs(dirPath string) (LabelConfigRules map[int]LabelConfigs, er return LabelConfigRules, err } -//loadFalsePositives loads in and compiles all the false positive rules for Earlybird +// loadFalsePositives loads in and compiles all the false positive rules for Earlybird func loadFalsePositives(dirPath string) (FalsePositiveRules map[int]FalsePositives, err error) { FalsePositiveRules = make(map[int]FalsePositives) @@ -196,7 +196,7 @@ func loadFalsePositives(dirPath string) (FalsePositiveRules map[int]FalsePositiv return FalsePositiveRules, err } -//loadSolutions loads in solutions from the json config file +// loadSolutions loads in solutions from the json config file func loadSolutions(dirPath string) (solutionConfigs map[int]Solution, err error) { solutionConfigs = make(map[int]Solution) diff --git a/pkg/scan/ruleCfgReader_test.go b/pkg/scan/ruleCfgReader_test.go index c7c4566..acbe6bd 100644 --- a/pkg/scan/ruleCfgReader_test.go +++ b/pkg/scan/ruleCfgReader_test.go @@ -17,8 +17,8 @@ package scan import ( - cfgreader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/utils" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/utils" "path" "testing" ) diff --git a/pkg/scan/scan.go b/pkg/scan/scan.go index c625de2..9db1830 100755 --- a/pkg/scan/scan.go +++ b/pkg/scan/scan.go @@ -29,8 +29,8 @@ import ( "sync" "time" - cfgReader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/postprocess" + cfgReader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/postprocess" ) var ( diff --git a/pkg/scan/scan_test.go b/pkg/scan/scan_test.go index 37c62ce..3458339 100644 --- a/pkg/scan/scan_test.go +++ b/pkg/scan/scan_test.go @@ -19,8 +19,8 @@ package scan import ( "bufio" "crypto/sha1" - cfgReader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/utils" + cfgReader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/utils" "path" "reflect" "strconv" diff --git a/pkg/update/update.go b/pkg/update/update.go index 1a4b27d..e23d42a 100755 --- a/pkg/update/update.go +++ b/pkg/update/update.go @@ -24,7 +24,7 @@ import ( "net/url" "path" - cfgreader "github.com/americanexpress/earlybird/pkg/config" + cfgreader "github.com/americanexpress/earlybird/v4/pkg/config" ) //UpdateConfigFiles updates all of the modules via the defined module URL in earlybird.json diff --git a/pkg/writers/consoleout.go b/pkg/writers/consoleout.go index f16b370..3ad9273 100644 --- a/pkg/writers/consoleout.go +++ b/pkg/writers/consoleout.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) type issue struct { diff --git a/pkg/writers/consoleout_test.go b/pkg/writers/consoleout_test.go index a2ccba3..2b4106c 100644 --- a/pkg/writers/consoleout_test.go +++ b/pkg/writers/consoleout_test.go @@ -19,7 +19,7 @@ package writers import ( "testing" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) func TestWriteConsole(t *testing.T) { diff --git a/pkg/writers/csvout.go b/pkg/writers/csvout.go index 11e35fc..7d0ba8b 100644 --- a/pkg/writers/csvout.go +++ b/pkg/writers/csvout.go @@ -23,7 +23,7 @@ import ( "github.com/gocarina/gocsv" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) //WriteCSV outputs Earlybird hit findings from the worker channel to files or console diff --git a/pkg/writers/csvout_test.go b/pkg/writers/csvout_test.go index d22ed5c..4682964 100644 --- a/pkg/writers/csvout_test.go +++ b/pkg/writers/csvout_test.go @@ -19,7 +19,7 @@ package writers import ( "testing" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) func TestWriteCSV(t *testing.T) { diff --git a/pkg/writers/jsonout.go b/pkg/writers/jsonout.go index 205d55d..a0ba80e 100755 --- a/pkg/writers/jsonout.go +++ b/pkg/writers/jsonout.go @@ -19,9 +19,9 @@ package writers import ( "encoding/json" "fmt" - cfgReader "github.com/americanexpress/earlybird/pkg/config" - "github.com/americanexpress/earlybird/pkg/file" - "github.com/americanexpress/earlybird/pkg/scan" + cfgReader "github.com/americanexpress/earlybird/v4/pkg/config" + "github.com/americanexpress/earlybird/v4/pkg/file" + "github.com/americanexpress/earlybird/v4/pkg/scan" "io/ioutil" "os" "time" diff --git a/pkg/writers/jsonout_test.go b/pkg/writers/jsonout_test.go index 3290742..73686a0 100644 --- a/pkg/writers/jsonout_test.go +++ b/pkg/writers/jsonout_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/americanexpress/earlybird/pkg/scan" + "github.com/americanexpress/earlybird/v4/pkg/scan" ) func TestWriteJSON(t *testing.T) {