From 7c3dc87e77b5ff0f81137cdfdd1f1a3501741a8c Mon Sep 17 00:00:00 2001 From: Sendu Bala Date: Fri, 23 Aug 2024 10:37:25 +0100 Subject: [PATCH] Change to v1, using wrstat v5 (#1) * Add github workflows and lint config. * Make this v1, depending on wrstat v5. --- .github/workflows/golangci-lint.yml | 26 ++++ .github/workflows/tests.yml | 29 ++++ .golangci.yml | 198 ++++++++++++++++++++++++++++ Makefile | 12 +- cmd/dbinfo.go | 6 +- cmd/server.go | 2 +- cmd/where.go | 2 +- go.mod | 43 +++--- go.sum | 80 +++++------ internal/data/data.go | 2 +- internal/db/basedirs.go | 4 +- internal/db/dgut.go | 6 +- main.go | 2 +- server/basedirs.go | 6 +- server/dgutdb.go | 6 +- server/filter.go | 4 +- server/server.go | 6 +- server/server_test.go | 14 +- server/summary.go | 4 +- server/tree.go | 2 +- server/where.go | 2 +- 21 files changed, 352 insertions(+), 104 deletions(-) create mode 100644 .github/workflows/golangci-lint.yml create mode 100644 .github/workflows/tests.yml create mode 100644 .golangci.yml diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml new file mode 100644 index 0000000..07d97a8 --- /dev/null +++ b/.github/workflows/golangci-lint.yml @@ -0,0 +1,26 @@ +name: golangci-lint + +on: + push: + branches: + - master + - develop + pull_request: + branches: + - master + - develop + +jobs: + golangci: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/setup-go@v3 + with: + go-version: 1.22.4 + - uses: actions/checkout@v3 + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + version: v1.59.1 + only-new-issues: true diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..fefec55 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,29 @@ +name: tests + +on: + push: + branches: + - master + - develop + pull_request: + branches: + - master + - develop + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Setup Go + uses: actions/setup-go@v3 + with: + go-version: '1.22.4' + + - name: Run tests + run: make test + + - name: Run tests with race detection + run: make race diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..b0362e2 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,198 @@ +run: + deadline: 4m + build-tags: + - netgo + modules-download-mode: readonly + +linters-settings: + dupl: + threshold: 100 + errcheck: + check-type-assertions: true + check-blank: true + exhaustive: + default-signifies-exhaustive: true + funlen: + lines: 30 + statements: 20 + gocognit: + min-complexity: 9 + gocyclo: + min-complexity: 7 + gomnd: + ignored-functions: + - 'strconv.Parse*' + govet: + shadow: true + enable-all: true + disable-all: false + disable: + - fieldalignment + lll: + line-length: 120 + misspell: + locale: UK + nakedret: + max-func-lines: 20 + nestif: + min-complexity: 2 + prealloc: + simple: true + range-loops: true + for-loops: true + unparam: + check-exported: true + unused: + check-exported: false + whitespace: + multi-if: true + multi-func: false + wsl: + allow-cuddle-declarations: false + force-err-cuddling: true + +issues: + exclude-rules: + - path: _test\.go + linters: + - funlen + - maintidx + - contextcheck + - gocognit + - gocyclo + - cyclop + - revive + - path: internal + linters: + - gomnd + - funlen + - path: cmd + linters: + - gochecknoinits + - gochecknoglobals + - dupl + - forbidigo + - path: version\.go + linters: + - forbidigo + - path: ch/from\.go + linters: + - gci + - goimports + max-issues-per-linter: 0 + max-same-issues: 0 + new-from-rev: master + +linters: + disable-all: true + enable: + # defaults + - errcheck + - gosimple + - govet + - ineffassign + - staticcheck + - unused + # extras + - containedctx + - contextcheck + #- copyloopvar + - cyclop + - dogsled + - dupl + - dupword + - durationcheck + - err113 + - errchkjson + - errname + - errorlint + - exhaustive + - exportloopref + - fatcontext + - forbidigo + - forcetypeassert + - funlen + - gci + - gocheckcompilerdirectives + - gochecknoglobals + - gochecknoinits + - gochecksumtype + - gocognit + - goconst + - gocritic + - gocyclo + - godot + - godox + - goimports + - gosec + - gosmopolitan + - grouper + - importas + - inamedparam + - interfacebloat + #- intrange + - ireturn + - lll + - maintidx + - makezero + - mirror + - misspell + - mnd + - nakedret + - nestif + - nilerr + - nilnil + - nlreturn + - noctx + - nolintlint + - nosprintfhostport + - perfsprint + - prealloc + - predeclared + - reassign + - revive + - sloglint + - stylecheck + - tagalign + - tenv + - thelper + - tparallel + - unconvert + - unparam + - usestdlibvars + - wastedassign + - whitespace + - wsl + + #disable: + # - asasalint + # - asciicheck + # - bidichk + # - bodyclose + # - canonicalheader + # - decorder + # - depguard + # - exhaustruct + # - ginkgolinter + # - gofmt + # - gofumpt + # - goheader + # - gomoddirectives + # - gomodguard + # - goprintffuncname + # - loggercheck + # - musttag + # - nonamedreturns + # - paralleltest + # - promlinter + # - protogetter + # - rowserrcheck + # - spancheck + # - sqlclosecheck + # - tagliatelle + # - testableexamples + # - testifylint + # - testpackage + # - varnamelen + # - wrapcheck + # - zerologlint diff --git a/Makefile b/Makefile index 840727f..54d0cf2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PKG := github.com/wtsi-ssg/wrstat/v4 +PKG := github.com/wtsi-ssg/wrstat-ui/v1 VERSION := $(shell git describe --tags --always --long --dirty) TAG := $(shell git describe --abbrev=0 --tags) LDFLAGS = -ldflags "-X ${PKG}/cmd.Version=${VERSION}" @@ -26,13 +26,13 @@ install: @cd server/static/wrstat; npm install && npm run build:prod @echo Starting go install @go install -tags netgo ${LDFLAGS} - @echo Installed to ${GOPATH}/bin/wrstat + @echo Installed to ${GOPATH}/bin/wrstat-ui installnonpm: export CGO_ENABLED = 1 installnonpm: @rm -f ${GOPATH}/bin/wrstat @go install -tags netgo ${LDFLAGS} - @echo installed to ${GOPATH}/bin/wrstat + @echo installed to ${GOPATH}/bin/wrstat-ui test: export CGO_ENABLED = 1 test: @@ -60,7 +60,7 @@ lintnonpm: @golangci-lint run --timeout 2m clean: - @rm -f ./wrstat + @rm -f ./wrstat-ui @rm -f ./dist.zip dist: export CGO_ENABLED = 1 @@ -69,7 +69,7 @@ dist: export CGO_ENABLED = 1 dist: gopack pack --os linux --arch amd64 -o linux-dist.zip github-release release --tag ${TAG} --pre-release - github-release upload --tag ${TAG} --name wrstat-linux-x86-64.zip --file linux-dist.zip - @rm -f wrstat linux-dist.zip + github-release upload --tag ${TAG} --name wrstat-ui-linux-x86-64.zip --file linux-dist.zip + @rm -f wrstat-ui linux-dist.zip .PHONY: test race bench lint build install clean dist diff --git a/cmd/dbinfo.go b/cmd/dbinfo.go index efabe31..87babea 100644 --- a/cmd/dbinfo.go +++ b/cmd/dbinfo.go @@ -30,9 +30,9 @@ import ( "log/slog" "github.com/spf13/cobra" - "github.com/wtsi-hgi/wrstat-ui/v4/server" - "github.com/wtsi-ssg/wrstat/v4/basedirs" - "github.com/wtsi-ssg/wrstat/v4/dgut" + "github.com/wtsi-hgi/wrstat-ui/v1/server" + "github.com/wtsi-ssg/wrstat/v5/basedirs" + "github.com/wtsi-ssg/wrstat/v5/dgut" ) // dbinfoCmd represents the server command. diff --git a/cmd/server.go b/cmd/server.go index 43d51f6..b0e4309 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -38,7 +38,7 @@ import ( "github.com/inconshreveable/log15" "github.com/spf13/cobra" - "github.com/wtsi-hgi/wrstat-ui/v4/server" + "github.com/wtsi-hgi/wrstat-ui/v1/server" ) const ( diff --git a/cmd/where.go b/cmd/where.go index af0df1a..8157f2a 100644 --- a/cmd/where.go +++ b/cmd/where.go @@ -40,7 +40,7 @@ import ( "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" gas "github.com/wtsi-hgi/go-authserver" - "github.com/wtsi-hgi/wrstat-ui/v4/server" + "github.com/wtsi-hgi/wrstat-ui/v1/server" ) type Error string diff --git a/go.mod b/go.mod index 92db4df..b3638ef 100644 --- a/go.mod +++ b/go.mod @@ -1,36 +1,25 @@ -module github.com/wtsi-hgi/wrstat-ui/v4 +module github.com/wtsi-hgi/wrstat-ui/v1 go 1.22 require ( + code.cloudfoundry.org/bytefmt v0.2.0 github.com/dustin/go-humanize v1.0.1 github.com/gin-gonic/gin v1.10.0 - github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/inconshreveable/log15 v2.16.0+incompatible - github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/olekukonko/tablewriter v0.0.5 github.com/smartystreets/goconvey v1.7.2 github.com/spf13/cobra v1.8.1 - github.com/ugorji/go/codec v1.2.12 // indirect github.com/wtsi-hgi/go-authserver v1.3.0 - github.com/wtsi-ssg/wr v0.5.9 // indirect - go.etcd.io/bbolt v1.3.10 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + github.com/wtsi-ssg/wrstat/v5 v5.0.0 ) -require github.com/wtsi-ssg/wrstat/v4 v4.10.5 - require ( + github.com/appleboy/gin-jwt/v2 v2.9.2 // indirect + github.com/bytedance/sonic v1.11.9 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/kr/text v0.2.0 // indirect -) - -require ( - code.cloudfoundry.org/bytefmt v0.0.0-20240625174231-fca5dc407bce - github.com/appleboy/gin-jwt/v2 v2.9.2 // indirect - github.com/bytedance/sonic v1.11.9 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/gabriel-vasile/mimetype v1.4.4 // indirect github.com/gin-contrib/secure v1.1.0 // indirect @@ -46,6 +35,7 @@ require ( github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/sessions v1.3.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect @@ -59,7 +49,8 @@ require ( github.com/lestrrat-go/option v1.0.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/moby/sys/mountinfo v0.7.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/okta/okta-jwt-verifier-golang v1.3.1 // indirect @@ -71,14 +62,18 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/thanhpk/randstr v1.0.6 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + github.com/wtsi-ssg/wr v0.5.9 // indirect + go.etcd.io/bbolt v1.3.11 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/tylerb/graceful.v1 v1.2.15 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index a6757c9..35e27a8 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -code.cloudfoundry.org/bytefmt v0.0.0-20240625174231-fca5dc407bce h1:r0OD9Ami2UpTFvll2EPB4PeBibq0MJpRdRYBRI9Vr2g= -code.cloudfoundry.org/bytefmt v0.0.0-20240625174231-fca5dc407bce/go.mod h1:4RuoEh4g45Sl0b1JOmJvVs2d+2mrdd9NzWHx3VbGx9Y= +code.cloudfoundry.org/bytefmt v0.2.0 h1:LHWljJYEhao2CPmi7TfTwS7S+n8Bb3CQPjb1v9YhqCc= +code.cloudfoundry.org/bytefmt v0.2.0/go.mod h1:opZCcmpD4B9OA+v/kd6gsT8C0jN8kY4VhbnIh2rKNQU= github.com/appleboy/gin-jwt/v2 v2.9.2 h1:GeS3lm9mb9HMmj7+GNjYUtpp3V1DAQ1TkUFa5poiZ7Y= github.com/appleboy/gin-jwt/v2 v2.9.2/go.mod h1:mxGjKt9Lrx9Xusy1SrnmsCJMZG6UJwmdHN9bN27/QDw= github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4= @@ -13,7 +13,6 @@ github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJ github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -60,8 +59,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0 h1:e+8XbKB6IMn8A4OAyZccO4pYfB3s7bt6azNIPE7AnPg= -github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= @@ -86,8 +85,8 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= @@ -118,10 +117,10 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= -github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g= -github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= +github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -131,10 +130,10 @@ github.com/okta/okta-jwt-verifier-golang v1.3.1 h1:V+9W5KD3nG7xN0UYtnzXtkurGcs71 github.com/okta/okta-jwt-verifier-golang v1.3.1/go.mod h1:cHffA777f7Yi4K+yDzUp89sGD5v8sk04Pc3CiT1OMR8= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= @@ -147,8 +146,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs= @@ -189,12 +188,12 @@ github.com/wtsi-hgi/go-authserver v1.3.0 h1:pEqBt0+lPl5tH+aq5eQD+0DNiB5K7Owa5ZuO github.com/wtsi-hgi/go-authserver v1.3.0/go.mod h1:itSUjEbYvkhkWkE0OVnZCuEmcmZjtqoDvkhi7b2sTjc= github.com/wtsi-ssg/wr v0.5.9 h1:lJWNuJfVvhTpXQqxRN5RbffhvK3HMog0fFpUFznvoz8= github.com/wtsi-ssg/wr v0.5.9/go.mod h1:njSdCX+xv1xzzw3Oy3Smid6s/IyIQEvLsKbRwaq4fC8= -github.com/wtsi-ssg/wrstat/v4 v4.10.5 h1:x4zysAoxDO5wBCSVClqwRJoaZ/YfiNCCNAx4TCDjiIU= -github.com/wtsi-ssg/wrstat/v4 v4.10.5/go.mod h1:IozQImmGJso54LsgsQ9NU8eHbjy9WODn10L4hkObBZU= +github.com/wtsi-ssg/wrstat/v5 v5.0.0 h1:Z2hpy6krx52YZvQhpUdMC72u3WxVWQ2HL3m8OYbcA8M= +github.com/wtsi-ssg/wrstat/v5 v5.0.0/go.mod h1:RYQ5bap0qtZGT6JFCmbHh255GbfyLQ5hm79bb3FhkF4= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= -go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= +go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= +go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= @@ -206,10 +205,10 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -225,17 +224,17 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -252,8 +251,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= @@ -262,8 +261,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -271,10 +270,11 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -282,8 +282,8 @@ golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4X golang.org/x/tools v0.0.0-20210114065538-d78b04bdf963/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/data/data.go b/internal/data/data.go index 3b36798..166fc3a 100644 --- a/internal/data/data.go +++ b/internal/data/data.go @@ -39,7 +39,7 @@ import ( "testing" "time" - "github.com/wtsi-ssg/wrstat/v4/summary" + "github.com/wtsi-ssg/wrstat/v5/summary" ) const filePerms = 0644 diff --git a/internal/db/basedirs.go b/internal/db/basedirs.go index fb6168f..9f024b2 100644 --- a/internal/db/basedirs.go +++ b/internal/db/basedirs.go @@ -29,8 +29,8 @@ package internaldb import ( "testing" - internaldata "github.com/wtsi-hgi/wrstat-ui/v4/internal/data" - "github.com/wtsi-ssg/wrstat/v4/dgut" + internaldata "github.com/wtsi-hgi/wrstat-ui/v1/internal/data" + "github.com/wtsi-ssg/wrstat/v5/dgut" ) // CreateExampleDGUTDBForBasedirs makes a tree database with data useful for diff --git a/internal/db/dgut.go b/internal/db/dgut.go index 7262fe5..70f33a9 100644 --- a/internal/db/dgut.go +++ b/internal/db/dgut.go @@ -36,9 +36,9 @@ import ( "testing" "time" - internaldata "github.com/wtsi-hgi/wrstat-ui/v4/internal/data" - "github.com/wtsi-hgi/wrstat-ui/v4/internal/fs" - "github.com/wtsi-ssg/wrstat/v4/dgut" + internaldata "github.com/wtsi-hgi/wrstat-ui/v1/internal/data" + "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs" + "github.com/wtsi-ssg/wrstat/v5/dgut" ) const ( diff --git a/main.go b/main.go index 30712d0..8ddc41e 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ package main import ( - "github.com/wtsi-hgi/wrstat-ui/v4/cmd" + "github.com/wtsi-hgi/wrstat-ui/v1/cmd" ) func main() { diff --git a/server/basedirs.go b/server/basedirs.go index b7a1fa0..fe7f77a 100644 --- a/server/basedirs.go +++ b/server/basedirs.go @@ -34,9 +34,9 @@ import ( "github.com/gin-gonic/gin" gas "github.com/wtsi-hgi/go-authserver" - ifs "github.com/wtsi-hgi/wrstat-ui/v4/internal/fs" - "github.com/wtsi-ssg/wrstat/v4/basedirs" - "github.com/wtsi-ssg/wrstat/v4/watch" + ifs "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs" + "github.com/wtsi-ssg/wrstat/v5/basedirs" + "github.com/wtsi-ssg/wrstat/v5/watch" ) const ErrBadBasedirsQuery = gas.Error("bad query; check id and basedir") diff --git a/server/dgutdb.go b/server/dgutdb.go index 0f8bb75..fae376b 100644 --- a/server/dgutdb.go +++ b/server/dgutdb.go @@ -31,9 +31,9 @@ import ( "path/filepath" "time" - ifs "github.com/wtsi-hgi/wrstat-ui/v4/internal/fs" - "github.com/wtsi-ssg/wrstat/v4/dgut" - "github.com/wtsi-ssg/wrstat/v4/watch" + ifs "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs" + "github.com/wtsi-ssg/wrstat/v5/dgut" + "github.com/wtsi-ssg/wrstat/v5/watch" ) // LoadDGUTDBs loads the given dgut.db directories (as produced by one or more diff --git a/server/filter.go b/server/filter.go index a4f96b5..0825172 100644 --- a/server/filter.go +++ b/server/filter.go @@ -32,8 +32,8 @@ import ( "github.com/gin-gonic/gin" gas "github.com/wtsi-hgi/go-authserver" - "github.com/wtsi-ssg/wrstat/v4/dgut" - "github.com/wtsi-ssg/wrstat/v4/summary" + "github.com/wtsi-ssg/wrstat/v5/dgut" + "github.com/wtsi-ssg/wrstat/v5/summary" ) // makeFilterFromContext extracts the user's filter requests, and returns a tree diff --git a/server/server.go b/server/server.go index 152079b..989ab29 100644 --- a/server/server.go +++ b/server/server.go @@ -35,9 +35,9 @@ import ( "time" gas "github.com/wtsi-hgi/go-authserver" - "github.com/wtsi-ssg/wrstat/v4/basedirs" - "github.com/wtsi-ssg/wrstat/v4/dgut" - "github.com/wtsi-ssg/wrstat/v4/watch" + "github.com/wtsi-ssg/wrstat/v5/basedirs" + "github.com/wtsi-ssg/wrstat/v5/dgut" + "github.com/wtsi-ssg/wrstat/v5/watch" ) //go:embed static diff --git a/server/server_test.go b/server/server_test.go index daa8a89..13e8291 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -44,13 +44,13 @@ import ( "github.com/gin-gonic/gin" . "github.com/smartystreets/goconvey/convey" gas "github.com/wtsi-hgi/go-authserver" - internaldata "github.com/wtsi-hgi/wrstat-ui/v4/internal/data" - internaldb "github.com/wtsi-hgi/wrstat-ui/v4/internal/db" - "github.com/wtsi-hgi/wrstat-ui/v4/internal/fixtimes" - ifs "github.com/wtsi-hgi/wrstat-ui/v4/internal/fs" - "github.com/wtsi-hgi/wrstat-ui/v4/internal/split" - "github.com/wtsi-ssg/wrstat/v4/basedirs" - "github.com/wtsi-ssg/wrstat/v4/dgut" + internaldata "github.com/wtsi-hgi/wrstat-ui/v1/internal/data" + internaldb "github.com/wtsi-hgi/wrstat-ui/v1/internal/db" + "github.com/wtsi-hgi/wrstat-ui/v1/internal/fixtimes" + ifs "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs" + "github.com/wtsi-hgi/wrstat-ui/v1/internal/split" + "github.com/wtsi-ssg/wrstat/v5/basedirs" + "github.com/wtsi-ssg/wrstat/v5/dgut" ) func TestIDsToWanted(t *testing.T) { diff --git a/server/summary.go b/server/summary.go index 3d04308..6afea96 100644 --- a/server/summary.go +++ b/server/summary.go @@ -31,8 +31,8 @@ import ( "sort" "time" - "github.com/wtsi-ssg/wrstat/v4/dgut" - "github.com/wtsi-ssg/wrstat/v4/summary" + "github.com/wtsi-ssg/wrstat/v5/dgut" + "github.com/wtsi-ssg/wrstat/v5/summary" ) // DirSummary holds nested file count, size and atime information on a diff --git a/server/tree.go b/server/tree.go index bf39ba9..5b36c96 100644 --- a/server/tree.go +++ b/server/tree.go @@ -35,7 +35,7 @@ import ( "github.com/gin-gonic/gin" gas "github.com/wtsi-hgi/go-authserver" - "github.com/wtsi-ssg/wrstat/v4/dgut" + "github.com/wtsi-ssg/wrstat/v5/dgut" ) // javascriptToJSONFormat is the date format emitted by javascript's Date's diff --git a/server/where.go b/server/where.go index aab2cec..1bffa21 100644 --- a/server/where.go +++ b/server/where.go @@ -30,7 +30,7 @@ import ( "strconv" "github.com/gin-gonic/gin" - "github.com/wtsi-hgi/wrstat-ui/v4/internal/split" + "github.com/wtsi-hgi/wrstat-ui/v1/internal/split" ) const (