From cb3f50845700dc6bd36692554d914cdaa99b5102 Mon Sep 17 00:00:00 2001 From: Ian Rees Date: Wed, 7 Feb 2024 15:47:59 -0800 Subject: [PATCH] bump --- go.mod | 11 +++++------ go.sum | 14 ++++++++------ server/gql/validation_report_resolver_test.go | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 353dedb0..e9bf147b 100644 --- a/go.mod +++ b/go.mod @@ -17,12 +17,12 @@ require ( github.com/hypirion/go-filecache v0.0.0-20160810125507-e3e6ef6981f0 github.com/interline-io/log v0.0.0-20240126000327-05bb90e4de4f github.com/interline-io/transitland-dbutil v0.0.0-20240126000951-f2dcc062261d - github.com/interline-io/transitland-lib v0.14.1-0.20240203022154-43b45c50e2b1 - github.com/interline-io/transitland-mw v0.0.0-20240126001316-f41a91e24d87 + github.com/interline-io/transitland-lib v0.14.1-0.20240207234642-f18c064a947a + github.com/interline-io/transitland-mw v0.0.0-20240207214751-5c95bfb089fb github.com/jellydator/ttlcache/v2 v2.11.1 github.com/jmoiron/sqlx v1.3.5 github.com/lib/pq v1.10.7 - github.com/rs/zerolog v1.31.0 + github.com/rs/zerolog v1.32.0 github.com/stretchr/testify v1.8.4 github.com/tidwall/gjson v1.17.0 github.com/tidwall/rtree v1.10.0 @@ -108,7 +108,7 @@ require ( golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.16.0 // indirect + golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -118,8 +118,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/interline-io/transitland-lib => /Users/irees/src/interline-io/transitland-lib - +// replace github.com/interline-io/transitland-lib => /Users/irees/src/interline-io/transitland-lib // replace github.com/interline-io/transitland-mw => /Users/irees/src/interline-io/transitland-mw // replace github.com/interline-io/log => /Users/irees/src/interline-io/log // replace github.com/interline-io/transitland-dbutil => /Users/irees/src/interline-io/transitland-dbutil diff --git a/go.sum b/go.sum index 97876397..be971b08 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,10 @@ github.com/interline-io/log v0.0.0-20240126000327-05bb90e4de4f h1:yZuyLK/XJqVOHx github.com/interline-io/log v0.0.0-20240126000327-05bb90e4de4f/go.mod h1:chJaM8SKcHI6ivoeFuZ8M8axTjSV4TPmuQ+sAyAHa34= github.com/interline-io/transitland-dbutil v0.0.0-20240126000951-f2dcc062261d h1:LL9U0HlBmgq924fQojTSKc7v5VqXdwLVp8ULb701Dz0= github.com/interline-io/transitland-dbutil v0.0.0-20240126000951-f2dcc062261d/go.mod h1:g10ZeVhMjO+D/DDggLAjqJ4RhYfuQu4MEpgh9vuWmVc= -github.com/interline-io/transitland-mw v0.0.0-20240126001316-f41a91e24d87 h1:uuzbxmdL+vQc4gQIjaERfjmhpfwwo+nTemPRPPbOAwo= -github.com/interline-io/transitland-mw v0.0.0-20240126001316-f41a91e24d87/go.mod h1:BD6S0PL96r/ZWpw4jxRAqnvvcdZKj7Dh0Qqpxsz42AY= +github.com/interline-io/transitland-lib v0.14.1-0.20240207234642-f18c064a947a h1:RQzgHmaOLzoDFZaKlgk3aIu2qxPdye4dUj/W/JktY7M= +github.com/interline-io/transitland-lib v0.14.1-0.20240207234642-f18c064a947a/go.mod h1:QeAjZTDdxWJlD+lGCeoImiM3FsKy8WS1lOQi3/lRydk= +github.com/interline-io/transitland-mw v0.0.0-20240207214751-5c95bfb089fb h1:/Aa9sphq4SuS4OPADp7/YPYUS7mT2+goJzCl2CmX6+8= +github.com/interline-io/transitland-mw v0.0.0-20240207214751-5c95bfb089fb/go.mod h1:BD6S0PL96r/ZWpw4jxRAqnvvcdZKj7Dh0Qqpxsz42AY= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4= @@ -384,8 +386,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -577,8 +579,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/server/gql/validation_report_resolver_test.go b/server/gql/validation_report_resolver_test.go index 9af502a1..b03b94a6 100644 --- a/server/gql/validation_report_resolver_test.go +++ b/server/gql/validation_report_resolver_test.go @@ -12,7 +12,7 @@ import ( func TestValidationReportResolver(t *testing.T) { c, cfg := newTestClient(t) fvsha1 := "96b67c0934b689d9085c52967365d8c233ea321d" - q := `query($feed_version_sha1: String!, $where: ValidationReportFilter) { feed_versions(where:{sha1:$feed_version_sha1}) {validation_reports(where:$where) {id success failure_reason includes_static includes_rt validator validator_version errors { filename error_type error_code field count errors { filename error_type error_code entity_id field line value message geometry }} }} }` + q := `query($feed_version_sha1: String!, $where: ValidationReportFilter) { feed_versions(where:{sha1:$feed_version_sha1}) {validation_reports(where:$where) {id success failure_reason includes_static includes_rt validator validator_version errors { filename error_type error_code field count errors { filename error_type error_code entity_id field line value message geometry entity_json }} }} }` var reportId int if err := cfg.Finder.DBX().QueryRowx("select rp.id from tl_validation_reports rp join feed_versions fv on fv.id = rp.feed_version_id where fv.sha1 = $1 limit 1", fvsha1).Scan(&reportId); err != nil { panic(err)