From 1b4ffe767e80e05023fc51609d8cfd91641610db Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 12:32:30 +0200 Subject: [PATCH 01/10] update dependencies --- go.mod | 102 ++++++++++---------- go.sum | 299 +++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 245 insertions(+), 156 deletions(-) diff --git a/go.mod b/go.mod index 64e8b6d069..a83c14b929 100644 --- a/go.mod +++ b/go.mod @@ -4,29 +4,29 @@ go 1.18 require ( bou.ke/monkey v1.0.2 - contrib.go.opencensus.io/exporter/prometheus v0.4.1 - github.com/BurntSushi/toml v1.2.0 + contrib.go.opencensus.io/exporter/prometheus v0.4.2 + github.com/BurntSushi/toml v1.2.1 github.com/CiscoM31/godata v1.0.5 github.com/Masterminds/sprig v2.22.0+incompatible - github.com/aws/aws-sdk-go v1.44.94 + github.com/aws/aws-sdk-go v1.44.122 github.com/beevik/etree v1.1.0 github.com/bluele/gcache v0.0.2 - github.com/c-bata/go-prompt v0.2.5 + github.com/c-bata/go-prompt v0.2.6 github.com/cenkalti/backoff v2.2.1+incompatible - github.com/ceph/go-ceph v0.15.0 + github.com/ceph/go-ceph v0.18.0 github.com/cheggaaa/pb v1.0.29 github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 - github.com/dgraph-io/ristretto v0.1.0 + github.com/dgraph-io/ristretto v0.1.1 github.com/emvi/iso-639-1 v1.0.1 github.com/eventials/go-tus v0.0.0-20220610120217-05d0564bb571 github.com/gdexlab/go-render v1.0.1 github.com/go-chi/chi/v5 v5.0.7 github.com/go-ldap/ldap/v3 v3.4.4 github.com/go-micro/plugins/v4/events/natsjs v1.1.0 - github.com/go-micro/plugins/v4/server/http v1.1.0 + github.com/go-micro/plugins/v4/server/http v1.1.1 github.com/go-micro/plugins/v4/store/nats-js v1.1.0 github.com/go-micro/plugins/v4/store/redis v1.1.0 github.com/go-sql-driver/mysql v1.6.0 @@ -34,53 +34,53 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang/protobuf v1.5.2 github.com/gomodule/redigo v1.8.9 - github.com/google/go-cmp v0.5.8 + github.com/google/go-cmp v0.5.9 github.com/google/go-github v17.0.0+incompatible github.com/google/uuid v1.3.0 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/hashicorp/go-hclog v1.3.1 - github.com/hashicorp/go-plugin v1.4.4 + github.com/hashicorp/go-plugin v1.4.5 github.com/iancoleman/strcase v0.2.0 github.com/jedib0t/go-pretty v4.3.0+incompatible github.com/jellydator/ttlcache/v2 v2.11.1 github.com/juliangruber/go-intersect v1.1.0 github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b - github.com/mileusna/useragent v1.2.0 - github.com/minio/minio-go/v7 v7.0.32 + github.com/mileusna/useragent v1.2.1 + github.com/minio/minio-go/v7 v7.0.42 github.com/mitchellh/mapstructure v1.5.0 - github.com/nats-io/nats-server/v2 v2.9.1 - github.com/nats-io/nats.go v1.17.0 - github.com/onsi/ginkgo/v2 v2.2.0 - github.com/onsi/gomega v1.20.2 + github.com/nats-io/nats-server/v2 v2.9.3 + github.com/nats-io/nats.go v1.18.0 + github.com/onsi/ginkgo/v2 v2.4.0 + github.com/onsi/gomega v1.22.1 github.com/owncloud/ocis/v2 v2.0.0-beta2.0.20220929090834-3b95dcc545dc github.com/pkg/errors v0.9.1 - github.com/pkg/xattr v0.4.7 + github.com/pkg/xattr v0.4.9 github.com/prometheus/alertmanager v0.24.0 github.com/prometheus/client_golang v1.13.0 github.com/rs/cors v1.8.2 github.com/rs/zerolog v1.28.0 github.com/sciencemesh/meshdirectory-web v1.0.4 github.com/sethvargo/go-password v0.2.0 - github.com/stretchr/testify v1.8.0 - github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62 + github.com/stretchr/testify v1.8.1 + github.com/studio-b12/gowebdav v0.0.0-20221015232716-17255f2e7423 github.com/thanhpk/randstr v1.0.4 - github.com/tus/tusd v1.9.2 + github.com/tus/tusd v1.10.0 github.com/wk8/go-ordered-map v1.0.0 - go-micro.dev/v4 v4.8.1 + go-micro.dev/v4 v4.9.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.1 - go.opentelemetry.io/otel v1.10.0 - go.opentelemetry.io/otel/exporters/jaeger v1.10.0 - go.opentelemetry.io/otel/sdk v1.10.0 - go.opentelemetry.io/otel/trace v1.10.0 - golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 - golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 - golang.org/x/sync v0.0.0-20220907140024-f12130a52804 - golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 - google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006 - google.golang.org/grpc v1.49.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 + go.opentelemetry.io/otel v1.11.1 + go.opentelemetry.io/otel/exporters/jaeger v1.11.1 + go.opentelemetry.io/otel/sdk v1.11.1 + go.opentelemetry.io/otel/trace v1.11.1 + golang.org/x/crypto v0.1.0 + golang.org/x/oauth2 v0.1.0 + golang.org/x/sync v0.1.0 + golang.org/x/sys v0.1.0 + golang.org/x/term v0.1.0 + google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e + google.golang.org/grpc v1.50.1 google.golang.org/protobuf v1.28.1 gotest.tools v2.2.0+incompatible ) @@ -112,7 +112,7 @@ require ( github.com/go-git/gcfg v1.5.0 // indirect github.com/go-git/go-billy/v5 v5.3.1 // indirect github.com/go-git/go-git/v5 v5.4.2 // indirect - github.com/go-kit/log v0.2.0 // indirect + github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -125,7 +125,6 @@ require ( github.com/go-openapi/errors v0.20.2 // indirect github.com/go-openapi/strfmt v0.21.2 // indirect github.com/go-redis/redis/v8 v8.10.0 // indirect - github.com/go-stack/stack v1.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -143,8 +142,8 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/klauspost/compress v1.15.10 // indirect - github.com/klauspost/cpuid/v2 v2.0.9 // indirect + github.com/klauspost/compress v1.15.11 // indirect + github.com/klauspost/cpuid/v2 v2.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.16 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect @@ -169,41 +168,40 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/pkg/term v1.1.0 // indirect + github.com/pkg/term v1.2.0-beta.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/prometheus/statsd_exporter v0.22.4 // indirect - github.com/rivo/uniseg v0.2.0 // indirect + github.com/prometheus/statsd_exporter v0.22.8 // indirect + github.com/rivo/uniseg v0.4.2 // indirect github.com/rs/xid v1.4.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect github.com/sirupsen/logrus v1.9.0 // indirect - github.com/stretchr/objx v0.4.0 // indirect - github.com/tidwall/pretty v1.2.0 // indirect - github.com/urfave/cli/v2 v2.16.3 // indirect + github.com/stretchr/objx v0.5.0 // indirect + github.com/tidwall/pretty v1.2.1 // indirect + github.com/urfave/cli/v2 v2.20.3 // indirect github.com/xanzy/ssh-agent v0.3.2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect go.etcd.io/etcd/api/v3 v3.5.5 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect go.etcd.io/etcd/client/v3 v3.5.5 // indirect - go.mongodb.org/mongo-driver v1.8.3 // indirect - go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect - go.opentelemetry.io/otel/metric v0.27.0 // indirect + go.mongodb.org/mongo-driver v1.10.3 // indirect + go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220921155015-db77216a4ee9 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/mod v0.6.0 // indirect + golang.org/x/net v0.1.0 // indirect + golang.org/x/text v0.4.0 // indirect + golang.org/x/time v0.1.0 // indirect + golang.org/x/tools v0.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index 55098e8474..5d85d78c41 100644 --- a/go.sum +++ b/go.sum @@ -31,14 +31,24 @@ cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Ud cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= -cloud.google.com/go v0.102.1 h1:vpK6iQWv/2uUeFJth4/cBHsQAGjn1iIE6AAlxipRaA0= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= +cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8= +cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= +cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= +cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= +cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= +cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= +cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= +cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= +cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= +cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= @@ -46,22 +56,68 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= +cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= +cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= +cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= +cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= +cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= +cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= +cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= +cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= +cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= +cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= +cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= +cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= +cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= +cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= +cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= +cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= +cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= +cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= +cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= +cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= +cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= +cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= +cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= +cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= +cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= +cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= +cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= +cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= +cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= +cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= +cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= +cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= +cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= +cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= +cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= +cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= -cloud.google.com/go/storage v1.26.0/go.mod h1:mk/N7YwIKEWyTvXAWQCIeiCTdLoRH6Pd5xmSnolQLTI= -contrib.go.opencensus.io/exporter/prometheus v0.4.1 h1:oObVeKo2NxpdF/fIfrPsNj6K0Prg0R0mHM+uANlYMiM= -contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= +cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= +cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= +cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= +cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= +cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= +cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= +cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= +cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= +contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= @@ -74,8 +130,8 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU= github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= -github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CiscoM31/godata v1.0.5 h1:AITXpa/5ybXEq59A0nqUGiS7ZXVJnQtFw5o09tyN/UA= github.com/CiscoM31/godata v1.0.5/go.mod h1:wcmFm66GMdOE316TgwFO1wo5ainCvTK26omd93oZf2M= @@ -122,11 +178,11 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:W github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.94 h1:hDqJSv03ZVvqT448gUE63JEIHKx++vKLoDkiZxbNmIk= -github.com/aws/aws-sdk-go v1.44.94/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.114/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= +github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -146,14 +202,14 @@ github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f h1:gOO/tNZMjjvTKZWpY github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/bwesterb/go-ristretto v1.2.1/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/c-bata/go-prompt v0.2.5 h1:3zg6PecEywxNn0xiqcXHD96fkbxghD+gdB2tbsYfl+Y= -github.com/c-bata/go-prompt v0.2.5/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw= +github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI= +github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/ceph/go-ceph v0.15.0 h1:ILB3NaLWOtt4u/2d8I8HZTC4Ycm1PsOYVar3IFU1xlo= -github.com/ceph/go-ceph v0.15.0/go.mod h1:mafFpf5Vg8Ai8Bd+FAMvKBHLmtdpTXdRP/TNq8XWegY= +github.com/ceph/go-ceph v0.18.0 h1:4WM6yAq/iqBDaeeADDiPKLqKiP0iZ4fffdgCr1lnOL4= +github.com/ceph/go-ceph v0.18.0/go.mod h1:cflETVTBNAQM6jdr7hpNHHFHKYiJiWWcAeRDrRx/1ng= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -198,8 +254,8 @@ github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4a 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/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= @@ -260,8 +316,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs= github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -288,8 +345,8 @@ github.com/go-micro/plugins/v4/registry/memory v1.1.0 h1:omyL8l12mzNCjNSDxMkAReE github.com/go-micro/plugins/v4/registry/memory v1.1.0/go.mod h1:7gsV2dwpFr+1rFhncmnxA9Tjv/NjQr9Zy8KpVKS7/jQ= github.com/go-micro/plugins/v4/registry/nats v1.1.0 h1:oqQzP5P2FkfoYZiBRuCWsKqh4BCJG6MQkxYmLw2lNrU= github.com/go-micro/plugins/v4/registry/nats v1.1.0/go.mod h1:4tTfa958PiYUOZNBBNoY1awmgfxFcqQOmix8cR3UM+E= -github.com/go-micro/plugins/v4/server/http v1.1.0 h1:3zigMm74qsuGJDMHCuYFy+2PEvnKND3S5AcabuWWyr8= -github.com/go-micro/plugins/v4/server/http v1.1.0/go.mod h1:ZjVZi1l16RjzyT3IISirh9BEZdqzaLLwiE/1fvdSbnI= +github.com/go-micro/plugins/v4/server/http v1.1.1 h1:n45l9rrJUWXT25W3DmTBl9DJoc31DxwiL6t3zUoa0e0= +github.com/go-micro/plugins/v4/server/http v1.1.1/go.mod h1:ZjVZi1l16RjzyT3IISirh9BEZdqzaLLwiE/1fvdSbnI= github.com/go-micro/plugins/v4/store/nats-js v1.1.0 h1:6Fe1/eLtg8kRyaGvMILp4olYtTDGwYNBXyb1sYfAWGk= github.com/go-micro/plugins/v4/store/nats-js v1.1.0/go.mod h1:jJf7Gm39OafZlT3s3UE2/9NIYj6OlI2fmZ4czSA3gvo= github.com/go-micro/plugins/v4/store/redis v1.1.0 h1:QWl5FAfMaekppZGNcj0mSyi8vCkjZGvHoGdaBNeKNm4= @@ -322,7 +379,6 @@ github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= @@ -355,7 +411,6 @@ github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3K github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -421,8 +476,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -461,6 +517,7 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= @@ -494,8 +551,8 @@ github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHh github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-plugin v1.4.4 h1:NVdrSdFRt3SkZtNckJ6tog7gbpRrcbOjQi/rgF7JYWQ= -github.com/hashicorp/go-plugin v1.4.4/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= +github.com/hashicorp/go-plugin v1.4.5 h1:oTE/oQR4eghggRg8VY7PAz3dr++VwDNBGCcOfIvHpBo= +github.com/hashicorp/go-plugin v1.4.5/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -570,12 +627,12 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.10 h1:Ai8UzuomSCDw90e1qNMtb15msBXsNpH6gzkkENQNcJo= -github.com/klauspost/compress v1.15.10/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= +github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= -github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0= +github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -633,14 +690,14 @@ github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKju github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/mileusna/useragent v1.2.0 h1:oNhWt/O3WXgj+8ChRTiNQcLntQFAApmXcO6ID0hDo7c= -github.com/mileusna/useragent v1.2.0/go.mod h1:3d8TOmwL/5I8pJjyVDteHtgDGcefrFUX4ccGOMKNYYc= +github.com/mileusna/useragent v1.2.1 h1:p3RJWhi3LfuI6BHdddojREyK3p6qX67vIfOVMnUIVr0= +github.com/mileusna/useragent v1.2.1/go.mod h1:3d8TOmwL/5I8pJjyVDteHtgDGcefrFUX4ccGOMKNYYc= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.32 h1:p9zXF2g+C1rm9ZMZXVLp4sv3WzON+NSb0IF6WdIWV0g= -github.com/minio/minio-go/v7 v7.0.32/go.mod h1:/sjRKkKIA75CKh1iu8E3qBy7ktBmCCDGII0zbXGwbUk= +github.com/minio/minio-go/v7 v7.0.42 h1:fP56plNR/Tkw/+Xczw9NL5TGxe5gJDvgd8LidNR3BEI= +github.com/minio/minio-go/v7 v7.0.42/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -675,10 +732,10 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/nats-server/v2 v2.9.1 h1:JaP6NpCVmSu0AXgbnOkGtJovOxuf8mjNjlX3H+tSpyI= -github.com/nats-io/nats-server/v2 v2.9.1/go.mod h1:T5AEyzrnDGaseK/Y0G6e2IA5tLrHyjLOeGUALq+A8XE= -github.com/nats-io/nats.go v1.17.0 h1:1jp5BThsdGlN91hW0k3YEfJbfACjiOYtUiLXG0RL4IE= -github.com/nats-io/nats.go v1.17.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= +github.com/nats-io/nats-server/v2 v2.9.3 h1:HrfzA7G9LNetKkm1z+jU/e9kuAe+E6uaBuuq9EB5sQQ= +github.com/nats-io/nats-server/v2 v2.9.3/go.mod h1:4sq8wvrpbvSzL1n3ZfEYnH4qeUuIl5W990j3kw13rRk= +github.com/nats-io/nats.go v1.18.0 h1:o480Ao6kuSSFyJO75rGTXCEPj7LGkY84C1Ye+Uhm4c0= +github.com/nats-io/nats.go v1.18.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= @@ -697,14 +754,14 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.2.0 h1:3ZNA3L1c5FYDFTTxbFeVGGD8jYvjYauHD30YgLxVsNI= -github.com/onsi/ginkgo/v2 v2.2.0/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= +github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= +github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= -github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY= -github.com/onsi/gomega v1.20.2/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= +github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI= +github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/owncloud/ocis/v2 v2.0.0-beta2.0.20220929090834-3b95dcc545dc h1:tslo7CfP8epKT3iUj0YjTprXOFe6cp9AF863LFMZT3Q= @@ -721,10 +778,10 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= -github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= -github.com/pkg/xattr v0.4.7 h1:XoA3KzmFvyPlH4RwX5eMcgtzcaGBaSvgt3IoFQfbrmQ= -github.com/pkg/xattr v0.4.7/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= +github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw= +github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= +github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE= +github.com/pkg/xattr v0.4.9/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -746,16 +803,16 @@ github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= @@ -768,11 +825,12 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= -github.com/prometheus/statsd_exporter v0.22.4 h1:bGhC0iI9DM8m9KIUlbcr3uzXnopagrajEKoP790256k= -github.com/prometheus/statsd_exporter v0.22.4/go.mod h1:N4Z1+iSqc9rnxlT1N8Qn3l65Vzb5t4Uq0jpg8nxyhio= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= +github.com/prometheus/statsd_exporter v0.22.8 h1:Qo2D9ZzaQG+id9i5NYNGmbf1aa/KxKbB9aKfMS+Yib0= +github.com/prometheus/statsd_exporter v0.22.8/go.mod h1:/DzwbTEaFTE0Ojz5PqcSk6+PFHOPWGxdXVr6yC8eFOM= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= +github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -815,8 +873,9 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -825,22 +884,24 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62 h1:b2nJXyPCa9HY7giGM+kYcnQ71m14JnGdQabMPmyt++8= -github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/studio-b12/gowebdav v0.0.0-20221015232716-17255f2e7423 h1:Wd8WDEEusB5+En4PiRWJp1cP59QLNsQun+mOTW8+s6s= +github.com/studio-b12/gowebdav v0.0.0-20221015232716-17255f2e7423/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE= +github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/thanhpk/randstr v1.0.4 h1:IN78qu/bR+My+gHCvMEXhR/i5oriVHcTB/BJJIRTsNo= github.com/thanhpk/randstr v1.0.4/go.mod h1:M/H2P1eNLZzlDwAzpkkkUvoyNNMbzRGhESZuEQk3r0U= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= -github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= +github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tus/tusd v1.1.0/go.mod h1:3DWPOdeCnjBwKtv98y5dSws3itPqfce5TVa0s59LRiA= -github.com/tus/tusd v1.9.2 h1:DPD2M+4QECNPWCdHbkBCYViQbhLJVQQwYrqznZGy9Qk= -github.com/tus/tusd v1.9.2/go.mod h1:1OmZr8VqJ6+3q7zuCm2mu05IlCw7Qm8Ik7a/Q+Bm7jo= +github.com/tus/tusd v1.10.0 h1:oQIxjxrSD6mjvYkqIjDlB3KVoEA1DWSzqCgWcTPP/ok= +github.com/tus/tusd v1.10.0/go.mod h1:2k5gtwQX7v1FbeYcCk1O5Sp/sOL9D9iBBtQ7n6XPyBo= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/urfave/cli/v2 v2.16.3 h1:gHoFIwpPjoyIMbJp/VFd+/vuD0dAgFK4B6DpEMFJfQk= -github.com/urfave/cli/v2 v2.16.3/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI= +github.com/urfave/cli/v2 v2.20.3 h1:lOgGidH/N5loaigd9HjFsOIhXSTrzl7tBpHswZ428w4= +github.com/urfave/cli/v2 v2.20.3/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI= github.com/vimeo/go-util v1.2.0/go.mod h1:s13SMDTSO7AjH1nbgp707mfN5JFIWUFDU5MDDuRRtKs= github.com/vimeo/go-util v1.4.1/go.mod h1:r+yspV//C48HeMXV8nEvtUeNiIiGfVv3bbEHzOgudwE= github.com/wk8/go-ordered-map v1.0.0 h1:BV7z+2PaK8LTSd/mWgY12HyMAo5CEgkHqbkVq2thqr8= @@ -850,7 +911,9 @@ github.com/xanzy/ssh-agent v0.3.2 h1:eKj4SX2Fe7mui28ZgnFW5fmTz1EIr7ugo5s6wDxdHBM github.com/xanzy/ssh-agent v0.3.2/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= @@ -861,8 +924,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go-micro.dev/v4 v4.8.1 h1:6/3YtUQ+ofkMJh98lC8TkpuMGoFS8kVcj0cnkQhzwDY= -go-micro.dev/v4 v4.8.1/go.mod h1:Ju8HrZ5hQSF+QguZ2QUs9Kbe42MHP1tJa/fpP5g07Cs= +go-micro.dev/v4 v4.9.0 h1:pd1CpqMT9hA47jSmX8mfdGK865PkMh95Rwj5RdfqPqE= +go-micro.dev/v4 v4.9.0/go.mod h1:Ju8HrZ5hQSF+QguZ2QUs9Kbe42MHP1tJa/fpP5g07Cs= go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0= go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= go.etcd.io/etcd/client/pkg/v3 v3.5.5 h1:9S0JUVvmrVl7wCF39iTQthdaaNIiAaQbmK75ogO6GU8= @@ -871,8 +934,9 @@ go.etcd.io/etcd/client/v3 v3.5.5 h1:q++2WTJbUgpQu4B6hCuT7VkdwaTP7Qz6Daak3WzbrlI= go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= -go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4= go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mongodb.org/mongo-driver v1.10.3 h1:XDQEvmh6z1EUsXuIkXE9TaVeqHw6SwS1uf93jFs0HBA= +go.mongodb.org/mongo-driver v1.10.3/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -881,26 +945,22 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.1 h1:RQxI9u7XGv+E9x35YWa3jZhdpsphaV7VvBArNSiDtMw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.1/go.mod h1:ylJH0hLC6Bp40dYp8rctk9HIuEM/xQRbV05d9HGTktQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= -go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= -go.opentelemetry.io/otel/exporters/jaeger v1.10.0 h1:7W3aVVjEYayu/GOqOVF4mbTvnCuxF1wWu3eRxFGQXvw= -go.opentelemetry.io/otel/exporters/jaeger v1.10.0/go.mod h1:n9IGyx0fgyXXZ/i0foLHNxtET9CzXHzZeKCucvRBFgA= -go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= -go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= +go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= +go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= +go.opentelemetry.io/otel/exporters/jaeger v1.11.1 h1:F9Io8lqWdGyIbY3/SOGki34LX/l+7OL0gXNxjqwcbuQ= +go.opentelemetry.io/otel/exporters/jaeger v1.11.1/go.mod h1:lRa2w3bQ4R4QN6zYsDgy7tEezgoKEu7Ow2g35Y75+KI= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= -go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= +go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= +go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v1.10.0 h1:jZ6K7sVn04kk/3DNUdJ4mqRlGDiXAVuIG+MMENpTNdY= -go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4s65ECtn6kE= +go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= +go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= -go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= +go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= +go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -936,8 +996,8 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY= -golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -974,8 +1034,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1032,9 +1092,11 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220921155015-db77216a4ee9 h1:SdDGdqRuKrF2R4XGcnPzcvZ63c/55GvhoHUus0o+BNI= -golang.org/x/net v0.0.0-20220921155015-db77216a4ee9/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591/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/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1055,8 +1117,11 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= +golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1070,8 +1135,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A= -golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1115,7 +1180,6 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1172,17 +1236,21 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1191,13 +1259,14 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 h1:yuLAip3bfURHClMG9VBdzPrQvCWjWiWUTBGV+/fCbUs= -golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= +golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1262,8 +1331,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= 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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1308,11 +1377,17 @@ google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/S google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= +google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= +google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= +google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1397,6 +1472,7 @@ google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= @@ -1404,9 +1480,22 @@ google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljW google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220810155839-1856144b1d9c/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= -google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006 h1:mmbq5q8M1t7dhkLw320YK4PsOXm6jdnUAkErImaIqOg= +google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= +google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= +google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1440,8 +1529,10 @@ google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= 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= @@ -1471,8 +1562,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/h2non/gock.v1 v1.0.14/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/telebot.v3 v3.0.0/go.mod h1:7rExV8/0mDDNu9epSrDm/8j22KLaActH1Tbee6YjzWg= From eca8ce8cfa348efb3aa14cefe4e52508a8f0e19d Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 14:53:34 +0200 Subject: [PATCH 02/10] upgrade redis --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a83c14b929..e11605dff6 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/go-micro/plugins/v4/registry/nats v1.1.0 // indirect github.com/go-openapi/errors v0.20.2 // indirect github.com/go-openapi/strfmt v0.21.2 // indirect - github.com/go-redis/redis/v8 v8.10.0 // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect diff --git a/go.sum b/go.sum index 5d85d78c41..fc69b8f83c 100644 --- a/go.sum +++ b/go.sum @@ -376,6 +376,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-redis/redis/v8 v8.10.0 h1:OZwrQKuZqdJ4QIM8wn8rnuz868Li91xA3J2DEq+TPGA= github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1ZfnOtKOaiM= +github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= +github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= From 7721d3ff36d1a9e45c75c90c86126012b50fdef3 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 14:55:19 +0200 Subject: [PATCH 03/10] go mod tidy --- go.mod | 1 - go.sum | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/go.mod b/go.mod index e11605dff6..fa6c24339f 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,6 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect go.etcd.io/etcd/client/v3 v3.5.5 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect - go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect diff --git a/go.sum b/go.sum index fc69b8f83c..791a0670d2 100644 --- a/go.sum +++ b/go.sum @@ -374,8 +374,6 @@ github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvSc github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-redis/redis/v8 v8.10.0 h1:OZwrQKuZqdJ4QIM8wn8rnuz868Li91xA3J2DEq+TPGA= -github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1ZfnOtKOaiM= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= @@ -744,7 +742,6 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= @@ -753,15 +750,10 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI= github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -949,18 +941,12 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/jaeger v1.11.1 h1:F9Io8lqWdGyIbY3/SOGki34LX/l+7OL0gXNxjqwcbuQ= go.opentelemetry.io/otel/exporters/jaeger v1.11.1/go.mod h1:lRa2w3bQ4R4QN6zYsDgy7tEezgoKEu7Ow2g35Y75+KI= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= -go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1065,7 +1051,6 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1073,7 +1058,6 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -1159,7 +1143,6 @@ golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1196,7 +1179,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1321,7 +1303,6 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210112230658-8b4aab62c064/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= From da8dafb5e3fbfb39fe927d6001d67542628e38d2 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 15:01:55 +0200 Subject: [PATCH 04/10] remove replace directives --- go.mod | 5 ----- go.sum | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index fa6c24339f..72b2979903 100644 --- a/go.mod +++ b/go.mod @@ -207,8 +207,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -replace ( - github.com/eventials/go-tus => github.com/andrewmostello/go-tus v0.0.0-20200314041820-904a9904af9a - github.com/oleiade/reflections => github.com/oleiade/reflections v1.0.1 -) diff --git a/go.sum b/go.sum index 791a0670d2..be158fb4f9 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/andrewmostello/go-tus v0.0.0-20200314041820-904a9904af9a h1:6tD4saJb8wmYF6Llz96ZJwUQ5r2GyTBFA2VEB5z8gVY= -github.com/andrewmostello/go-tus v0.0.0-20200314041820-904a9904af9a/go.mod h1:XYuK1S5+kS6FGhlIUFuZFPvWiSrOIoLk6+ro33Xce3Y= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -279,6 +277,8 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch/v5 v5.5.0 h1:bAmFiUJ+o0o2B4OiTFeE3MqCOtyo+jjPP9iZ0VRxYUc= +github.com/eventials/go-tus v0.0.0-20220610120217-05d0564bb571 h1:0i+Y7klNNqXwzAQ2qlIWeZyiMtDB/rf5fSaFzIW7lsk= +github.com/eventials/go-tus v0.0.0-20220610120217-05d0564bb571/go.mod h1:XYuK1S5+kS6FGhlIUFuZFPvWiSrOIoLk6+ro33Xce3Y= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= From c4ab150fb73830d590cfa0a5639047b27b8ab3a8 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 15:42:52 +0200 Subject: [PATCH 05/10] use go 1.19 for docker images --- Dockerfile.reva | 4 ++-- Dockerfile.revad | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.reva b/Dockerfile.reva index 97ebb664a5..3e3aa0a56a 100644 --- a/Dockerfile.reva +++ b/Dockerfile.reva @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# In applying this license, CERN does not waive the privileges and immunities +# In applying this license, CEqRN does not waive the privileges and immunities # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -FROM golang:alpine3.13 as builder +FROM golang:1.19-alpine as builder RUN apk --no-cache add \ ca-certificates \ diff --git a/Dockerfile.revad b/Dockerfile.revad index 0455e04542..08d8f15ec9 100644 --- a/Dockerfile.revad +++ b/Dockerfile.revad @@ -16,7 +16,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -FROM golang:alpine3.13 as builder +FROM golang:1.19-alpine as builder RUN apk --no-cache add \ ca-certificates \ @@ -36,7 +36,7 @@ RUN make build-revad-docker && \ RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml -FROM golang:alpine3.13 +FROM golang:1.19-alpine RUN apk --no-cache add \ mailcap From 9b54dcd706357d378238b2a554be0461b84432bf Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 15:57:48 +0200 Subject: [PATCH 06/10] fix integration test --- tests/integration/grpc/storageprovider_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/integration/grpc/storageprovider_test.go b/tests/integration/grpc/storageprovider_test.go index 3887195d96..bbc8e30437 100644 --- a/tests/integration/grpc/storageprovider_test.go +++ b/tests/integration/grpc/storageprovider_test.go @@ -568,7 +568,12 @@ var _ = Describe("storage providers", func() { }) Expect(err).ToNot(HaveOccurred()) Expect(getRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) - Expect(getRes.Lock).To(Equal(lock)) + Expect(getRes.Lock.Type).To(Equal(lock.Type)) + Expect(getRes.Lock.User).To(Equal(lock.User)) + Expect(getRes.Lock.LockId).To(Equal(lock.LockId)) + Expect(getRes.Lock.AppName).To(Equal(lock.AppName)) + Expect(getRes.Lock.Expiration).To(Equal(lock.Expiration)) + Expect(getRes.Lock.Opaque).To(Equal(lock.Opaque)) refreshRes, err := serviceClient.RefreshLock(ctx, &storagep.RefreshLockRequest{ Ref: subdirRef, From e574c93822ed6b4fa5a73570d607e0e44b8a2623 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 16:04:13 +0200 Subject: [PATCH 07/10] use newer golangci-lint --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index b17f10d989..a8f9787988 100644 --- a/.drone.star +++ b/.drone.star @@ -27,7 +27,7 @@ def makeStep(target): def lintStep(): return { "name": "lint", - "image": "registry.cern.ch/docker.io/golangci/golangci-lint:v1.42.1", + "image": "registry.cern.ch/docker.io/golangci/golangci-lint:v1.50.1", "commands": [ "golangci-lint run --timeout 10m0s", ], From f8355f2555e359a7b1e92a41fd41b124a8cb53cf Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 16:16:50 +0200 Subject: [PATCH 08/10] fix typo --- Dockerfile.reva | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.reva b/Dockerfile.reva index 3e3aa0a56a..65da7cb273 100644 --- a/Dockerfile.reva +++ b/Dockerfile.reva @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# In applying this license, CEqRN does not waive the privileges and immunities +# In applying this license, CERN does not waive the privileges and immunities # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. From a9d42cfb0f6c0bc2c70b231226e7767df59c4554 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 16:19:40 +0200 Subject: [PATCH 09/10] compare user fields one by one --- tests/integration/grpc/storageprovider_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integration/grpc/storageprovider_test.go b/tests/integration/grpc/storageprovider_test.go index bbc8e30437..c971449cf7 100644 --- a/tests/integration/grpc/storageprovider_test.go +++ b/tests/integration/grpc/storageprovider_test.go @@ -569,7 +569,9 @@ var _ = Describe("storage providers", func() { Expect(err).ToNot(HaveOccurred()) Expect(getRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) Expect(getRes.Lock.Type).To(Equal(lock.Type)) - Expect(getRes.Lock.User).To(Equal(lock.User)) + Expect(getRes.Lock.User.Idp).To(Equal(lock.User.Idp)) + Expect(getRes.Lock.User.OpaqueId).To(Equal(lock.User.OpaqueId)) + Expect(getRes.Lock.User.Type).To(Equal(lock.User.Type)) Expect(getRes.Lock.LockId).To(Equal(lock.LockId)) Expect(getRes.Lock.AppName).To(Equal(lock.AppName)) Expect(getRes.Lock.Expiration).To(Equal(lock.Expiration)) From 82b44e11090c5d5120e6944dc061a23b3b04d879 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 25 Oct 2022 16:25:47 +0200 Subject: [PATCH 10/10] fix some linter issues --- cmd/reva/common.go | 10 +++---- cmd/revad/internal/config/config.go | 3 +-- cmd/revad/internal/grace/grace.go | 9 +++---- cmd/revad/main.go | 3 +-- cmd/revad/runtime/runtime.go | 2 +- .../storage/utils/decomposedfs/atomicity.md | 14 +++++----- examples/plugin/json/json.go | 4 +-- internal/grpc/services/datatx/datatx.go | 8 +++--- .../sharesstorageprovider_test.go | 3 +-- .../storageprovider/storageprovider.go | 3 +-- .../services/owncloud/ocdav/ocdav_test.go | 2 +- .../owncloud/ocdav/propfind/propfind_test.go | 3 +-- .../apps/sharing/shares/private_test.go | 2 +- .../services/reverseproxy/reverseproxy.go | 4 +-- pkg/app/provider/wopi/wopi.go | 3 +-- pkg/appauth/manager/json/json.go | 8 +++--- pkg/appauth/manager/json/json_test.go | 8 +++--- pkg/auth/manager/json/json.go | 4 +-- pkg/auth/manager/json/json_test.go | 9 +++---- pkg/auth/manager/oidc/oidc.go | 4 +-- .../owncloudsql/accounts/accounts_test.go | 5 ++-- pkg/cbox/utils/tokenmanagement.go | 6 ++--- pkg/datatx/manager/rclone/rclone.go | 8 +++--- pkg/eosclient/eosbinary/eosbinary.go | 3 +-- pkg/eosclient/eosgrpc/eosgrpc.go | 7 +++-- pkg/eosclient/eosgrpc/eoshttp.go | 4 +-- pkg/errtypes/errtypes.go | 2 +- pkg/group/manager/json/json.go | 4 +-- pkg/group/manager/json/json_test.go | 7 +++-- pkg/mentix/exchangers/exporters/promsd.go | 3 +-- .../exchangers/exporters/reqexporter.go | 4 +-- .../exchangers/importers/reqimporter.go | 4 +-- pkg/mentix/key/apikey.go | 2 +- pkg/mentix/utils/network/network.go | 4 +-- pkg/metrics/driver/json/json.go | 3 +-- pkg/metrics/driver/xcloud/xcloud.go | 4 +-- pkg/ocm/invite/manager/json/json.go | 10 +++---- pkg/ocm/provider/authorizer/json/json.go | 4 +-- pkg/ocm/provider/authorizer/open/open.go | 4 +-- pkg/ocm/share/manager/json/json.go | 10 +++---- pkg/ocm/share/sender/sender.go | 4 +-- pkg/publicshare/manager/cs3/cs3_test.go | 3 +-- pkg/publicshare/manager/json/json_test.go | 5 ++-- .../manager/json/persistence/file/file.go | 7 +++-- pkg/registry/config_test.go | 26 +++++++++---------- pkg/sdk/common/net/httpreq.go | 3 +-- pkg/sdk/common/net/webdav.go | 3 +-- pkg/share/manager/json/json.go | 8 +++--- pkg/share/manager/json/json_test.go | 3 +-- pkg/share/manager/jsoncs3/jsoncs3_test.go | 3 +-- .../providercache/providercache_test.go | 3 +-- .../receivedsharecache_test.go | 3 +-- .../jsoncs3/sharecache/sharecache_test.go | 3 +-- .../manager/owncloudsql/owncloudsql_test.go | 5 ++-- pkg/siteacc/account/panel.go | 6 +++-- pkg/siteacc/data/filestorage.go | 5 ++-- pkg/siteacc/endpoints.go | 4 +-- pkg/siteacc/manager/gocdb/account.go | 4 +-- .../fs/nextcloud/nextcloud_server_mock.go | 6 ++--- .../fs/ocis/blobstore/blobstore_test.go | 10 +++---- .../owncloudsql/filecache/filecache_test.go | 5 ++-- pkg/storage/fs/owncloudsql/owncloudsql.go | 6 ++--- pkg/storage/fs/owncloudsql/upload.go | 5 ++-- pkg/storage/registry/spaces/spaces.go | 2 +- pkg/storage/utils/chunking/chunking.go | 3 +-- .../decomposedfs_concurrency_test.go | 3 +-- pkg/storage/utils/decomposedfs/tree/tree.go | 2 +- pkg/storage/utils/decomposedfs/upload.go | 5 ++-- pkg/storage/utils/decomposedfs/upload_test.go | 11 ++++---- .../utils/indexer/index/autoincrement_test.go | 3 +-- pkg/storage/utils/indexer/index/non_unique.go | 2 +- pkg/storage/utils/indexer/test/data.go | 3 +-- pkg/storage/utils/indexer/test/helpers.go | 4 +-- pkg/storage/utils/localfs/localfs.go | 26 +++++++++++-------- pkg/storage/utils/localfs/upload.go | 5 ++-- pkg/storage/utils/metadata/cs3.go | 4 +-- pkg/storage/utils/metadata/disk.go | 14 ++++++---- pkg/test/vars.go | 3 +-- pkg/user/manager/json/json.go | 4 +-- pkg/user/manager/json/json_test.go | 7 +++-- .../owncloudsql/accounts/accounts_test.go | 5 ++-- pkg/utils/ldap.go | 6 ++--- tests/helpers/helpers.go | 6 ++--- tests/integration/grpc/grpc_suite_test.go | 13 +++++----- tools/check-license/check-license.go | 5 ++-- tools/create-artifacts/main.go | 3 +-- tools/prepare-release/main.go | 11 ++++---- 87 files changed, 225 insertions(+), 259 deletions(-) diff --git a/cmd/reva/common.go b/cmd/reva/common.go index 64f80ac566..69b6f3f9e0 100644 --- a/cmd/reva/common.go +++ b/cmd/reva/common.go @@ -21,7 +21,7 @@ package main import ( "bufio" "encoding/json" - "io/ioutil" + "os" gouser "os/user" "path" "strings" @@ -50,7 +50,7 @@ func getConfigFile() string { } func readConfig() (*config, error) { - data, err := ioutil.ReadFile(getConfigFile()) + data, err := os.ReadFile(getConfigFile()) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func writeConfig(c *config) error { if err != nil { return err } - return ioutil.WriteFile(getConfigFile(), data, 0600) + return os.WriteFile(getConfigFile(), data, 0600) } func getTokenFile() string { @@ -81,7 +81,7 @@ func getTokenFile() string { } func readToken() (string, error) { - data, err := ioutil.ReadFile(getTokenFile()) + data, err := os.ReadFile(getTokenFile()) if err != nil { return "", err } @@ -89,7 +89,7 @@ func readToken() (string, error) { } func writeToken(token string) { - err := ioutil.WriteFile(getTokenFile(), []byte(token), 0600) + err := os.WriteFile(getTokenFile(), []byte(token), 0600) if err != nil { panic(err) } diff --git a/cmd/revad/internal/config/config.go b/cmd/revad/internal/config/config.go index 99eda406d8..77ecc79033 100644 --- a/cmd/revad/internal/config/config.go +++ b/cmd/revad/internal/config/config.go @@ -20,7 +20,6 @@ package config import ( "io" - "io/ioutil" "github.com/BurntSushi/toml" "github.com/pkg/errors" @@ -28,7 +27,7 @@ import ( // Read reads the configuration from the reader. func Read(r io.Reader) (map[string]interface{}, error) { - data, err := ioutil.ReadAll(r) + data, err := io.ReadAll(r) if err != nil { err = errors.Wrap(err, "config: error reading from reader") return nil, err diff --git a/cmd/revad/internal/grace/grace.go b/cmd/revad/internal/grace/grace.go index bd90e6bdc7..339a8c5c1e 100644 --- a/cmd/revad/internal/grace/grace.go +++ b/cmd/revad/internal/grace/grace.go @@ -20,7 +20,6 @@ package grace import ( "fmt" - "io/ioutil" "net" "os" "os/signal" @@ -108,7 +107,7 @@ func (w *Watcher) clean() error { } func (w *Watcher) readPID() (int, error) { - piddata, err := ioutil.ReadFile(w.pidFile) + piddata, err := os.ReadFile(w.pidFile) if err != nil { return 0, err } @@ -123,7 +122,7 @@ func (w *Watcher) readPID() (int, error) { // GetProcessFromFile reads the pidfile and returns the running process or error if the process or file // are not available. func GetProcessFromFile(pfile string) (*os.Process, error) { - data, err := ioutil.ReadFile(pfile) + data, err := os.ReadFile(pfile) if err != nil { return nil, err } @@ -144,7 +143,7 @@ func GetProcessFromFile(pfile string) (*os.Process, error) { // WritePID writes the pid to the configured pid file. func (w *Watcher) WritePID() error { // Read in the pid file as a slice of bytes. - if piddata, err := ioutil.ReadFile(w.pidFile); err == nil { + if piddata, err := os.ReadFile(w.pidFile); err == nil { // Convert the file contents to an integer. if pid, err := strconv.Atoi(string(piddata)); err == nil { // Look for the pid in the process list. @@ -174,7 +173,7 @@ func (w *Watcher) WritePID() error { // If we get here, then the pidfile didn't exist or we are are in graceful reload and thus we overwrite // or the pid in it doesn't belong to the user running this app. - err := ioutil.WriteFile(w.pidFile, []byte(fmt.Sprintf("%d", os.Getpid())), 0664) + err := os.WriteFile(w.pidFile, []byte(fmt.Sprintf("%d", os.Getpid())), 0664) if err != nil { return err } diff --git a/cmd/revad/main.go b/cmd/revad/main.go index d1470f8c27..1fcd0bd35b 100644 --- a/cmd/revad/main.go +++ b/cmd/revad/main.go @@ -21,7 +21,6 @@ package main import ( "flag" "fmt" - "io/ioutil" "os" "path" "regexp" @@ -163,7 +162,7 @@ func getConfigs() ([]map[string]interface{}, error) { } func getConfigsFromDir(dir string) (confs []string, err error) { - files, err := ioutil.ReadDir(*dirFlag) + files, err := os.ReadDir(*dirFlag) if err != nil { return nil, err } diff --git a/cmd/revad/runtime/runtime.go b/cmd/revad/runtime/runtime.go index 578e187e78..9f467a84f6 100644 --- a/cmd/revad/runtime/runtime.go +++ b/cmd/revad/runtime/runtime.go @@ -266,7 +266,7 @@ func getHTTPServer(conf interface{}, l *zerolog.Logger, tp trace.TracerProvider) return s, nil } -// adjustCPU parses string cpu and sets GOMAXPROCS +// adjustCPU parses string cpu and sets GOMAXPROCS // according to its value. It accepts either // a number (e.g. 3) or a percent (e.g. 50%). // Default is to use all available cores. diff --git a/docs/content/en/docs/config/packages/storage/utils/decomposedfs/atomicity.md b/docs/content/en/docs/config/packages/storage/utils/decomposedfs/atomicity.md index 72118863f6..758045bec5 100644 --- a/docs/content/en/docs/config/packages/storage/utils/decomposedfs/atomicity.md +++ b/docs/content/en/docs/config/packages/storage/utils/decomposedfs/atomicity.md @@ -52,7 +52,7 @@ See `CreateDir`. ### Potential Problems -There is no exit critera step so all concurrent calls try to create a symlink in step 3 with only one of them +There is no exit critera step so all concurrent calls try to create a symlink in step 3 with only one of them succeeding (See `Considerations > Creating symlinks`). ### Negative Effects @@ -71,7 +71,7 @@ No risk of inconsistency. ### Potential Problems Several concurrent calls can get past the exit criteria steps 1 and 2. But the first writing operation is always the -actual move of the node on the filesystem which is an atomic filesystem operation. That means that with concurrent +actual move of the node on the filesystem which is an atomic filesystem operation. That means that with concurrent calls only one can ever succeed. ### Negative Effects @@ -167,16 +167,15 @@ package main import ( "fmt" - "io/ioutil" "os" ) func main() { - err := ioutil.WriteFile("file1", []byte(""), 0600) + err := os.WriteFile("file1", []byte(""), 0600) if err != nil { os.Exit(1) } - err = ioutil.WriteFile("file2", []byte(""), 0600) + err = os.WriteFile("file2", []byte(""), 0600) if err != nil { os.Exit(1) } @@ -208,16 +207,15 @@ package main import ( "fmt" - "io/ioutil" "os" ) func main() { - err := ioutil.WriteFile("file1", []byte(""), 0600) + err := os.WriteFile("file1", []byte(""), 0600) if err != nil { os.Exit(1) } - err = ioutil.WriteFile("file2", []byte(""), 0600) + err = os.WriteFile("file2", []byte(""), 0600) if err != nil { os.Exit(1) } diff --git a/examples/plugin/json/json.go b/examples/plugin/json/json.go index 569b9e2498..eaff5b3277 100644 --- a/examples/plugin/json/json.go +++ b/examples/plugin/json/json.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "errors" - "io/ioutil" + "os" "strings" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -63,7 +63,7 @@ func (m *Manager) Configure(ml map[string]interface{}) error { return err } - f, err := ioutil.ReadFile(c.Users) + f, err := os.ReadFile(c.Users) if err != nil { return err } diff --git a/internal/grpc/services/datatx/datatx.go b/internal/grpc/services/datatx/datatx.go index 1c0e2def69..b7c364da47 100644 --- a/internal/grpc/services/datatx/datatx.go +++ b/internal/grpc/services/datatx/datatx.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "net/url" "os" "sync" @@ -331,7 +331,7 @@ func (s *service) extractEndpointInfo(ctx context.Context, targetURL string) (*w func loadOrCreate(file string) (*txShareModel, error) { _, err := os.Stat(file) if os.IsNotExist(err) { - if err := ioutil.WriteFile(file, []byte("{}"), 0700); err != nil { + if err := os.WriteFile(file, []byte("{}"), 0700); err != nil { err = errors.Wrap(err, "datatx service: error creating the transfer shares storage file: "+file) return nil, err } @@ -344,7 +344,7 @@ func loadOrCreate(file string) (*txShareModel, error) { } defer fd.Close() - data, err := ioutil.ReadAll(fd) + data, err := io.ReadAll(fd) if err != nil { err = errors.Wrap(err, "datatx service: error reading the data") return nil, err @@ -371,7 +371,7 @@ func (m *txShareModel) saveTxShare() error { return err } - if err := ioutil.WriteFile(m.File, data, 0644); err != nil { + if err := os.WriteFile(m.File, data, 0644); err != nil { err = errors.Wrap(err, "datatx service: error writing transfer share data to file: "+m.File) return err } diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go index 154b003c0e..555cf7968f 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go @@ -20,7 +20,6 @@ package sharesstorageprovider_test import ( "context" - "io/ioutil" "os" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" @@ -303,7 +302,7 @@ var _ = Describe("Sharesstorageprovider", func() { Describe("NewDefault", func() { It("returns a new service instance", func() { - tmpfile, err := ioutil.TempFile("", "eos-unit-test-shares-*.json") + tmpfile, err := os.CreateTemp("", "eos-unit-test-shares-*.json") Expect(err).ToNot(HaveOccurred()) defer os.Remove(tmpfile.Name()) diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go index fb19b1373d..5446cc264f 100644 --- a/internal/grpc/services/storageprovider/storageprovider.go +++ b/internal/grpc/services/storageprovider/storageprovider.go @@ -22,7 +22,6 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" "net/url" "os" "path" @@ -133,7 +132,7 @@ func parseConfig(m map[string]interface{}) (*config, error) { func registerMimeTypes(mappingFile string) error { if mappingFile != "" { - f, err := ioutil.ReadFile(mappingFile) + f, err := os.ReadFile(mappingFile) if err != nil { return fmt.Errorf("storageprovider: error reading the custom mime types file: +%v", err) } diff --git a/internal/http/services/owncloud/ocdav/ocdav_test.go b/internal/http/services/owncloud/ocdav/ocdav_test.go index 67f9448d76..c118ade0bf 100644 --- a/internal/http/services/owncloud/ocdav/ocdav_test.go +++ b/internal/http/services/owncloud/ocdav/ocdav_test.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind_test.go b/internal/http/services/owncloud/ocdav/propfind/propfind_test.go index ad3d345437..56b9f340c1 100644 --- a/internal/http/services/owncloud/ocdav/propfind/propfind_test.go +++ b/internal/http/services/owncloud/ocdav/propfind/propfind_test.go @@ -22,7 +22,6 @@ import ( "context" "encoding/xml" "io" - "io/ioutil" "net/http" "net/http/httptest" "strings" @@ -51,7 +50,7 @@ var _ = Describe("Propfind", func() { ctx context.Context readResponse = func(r io.Reader) (*propfind.MultiStatusResponseUnmarshalXML, string, error) { - buf, err := ioutil.ReadAll(r) + buf, err := io.ReadAll(r) if err != nil { return nil, "", err } diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/private_test.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/private_test.go index d21b7e42dc..4264ecdbfa 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/private_test.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/private_test.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/internal/http/services/reverseproxy/reverseproxy.go b/internal/http/services/reverseproxy/reverseproxy.go index 964297c8a7..93009e53f9 100644 --- a/internal/http/services/reverseproxy/reverseproxy.go +++ b/internal/http/services/reverseproxy/reverseproxy.go @@ -20,10 +20,10 @@ package reverseproxy import ( "encoding/json" - "io/ioutil" "net/http" "net/http/httputil" "net/url" + "os" ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rhttp/global" @@ -63,7 +63,7 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error) } conf.init() - f, err := ioutil.ReadFile(conf.ProxyRulesJSON) + f, err := os.ReadFile(conf.ProxyRulesJSON) if err != nil { return nil, err } diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go index 583fec374a..bf12d208b7 100644 --- a/pkg/app/provider/wopi/wopi.go +++ b/pkg/app/provider/wopi/wopi.go @@ -24,7 +24,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "os" @@ -222,7 +221,7 @@ func (p *wopiProvider) GetAppURL(ctx context.Context, resource *provider.Resourc } defer openRes.Body.Close() - body, err := ioutil.ReadAll(openRes.Body) + body, err := io.ReadAll(openRes.Body) if err != nil { return nil, err } diff --git a/pkg/appauth/manager/json/json.go b/pkg/appauth/manager/json/json.go index 0397c27fad..fa6cc6fc49 100644 --- a/pkg/appauth/manager/json/json.go +++ b/pkg/appauth/manager/json/json.go @@ -21,7 +21,7 @@ package json import ( "context" "encoding/json" - "io/ioutil" + "io" "os" "sync" "time" @@ -100,7 +100,7 @@ func parseConfig(m map[string]interface{}) (*config, error) { func loadOrCreate(file string) (*jsonManager, error) { stat, err := os.Stat(file) if os.IsNotExist(err) || stat.Size() == 0 { - if err = ioutil.WriteFile(file, []byte("{}"), 0644); err != nil { + if err = os.WriteFile(file, []byte("{}"), 0644); err != nil { return nil, errors.Wrapf(err, "error creating the file %s", file) } } @@ -111,7 +111,7 @@ func loadOrCreate(file string) (*jsonManager, error) { } defer fd.Close() - data, err := ioutil.ReadAll(fd) + data, err := io.ReadAll(fd) if err != nil { return nil, errors.Wrapf(err, "error reading the file %s", file) } @@ -246,7 +246,7 @@ func (mgr *jsonManager) save() error { return errors.Wrap(err, "error encoding json file") } - if err = ioutil.WriteFile(mgr.config.File, data, 0644); err != nil { + if err = os.WriteFile(mgr.config.File, data, 0644); err != nil { return errors.Wrapf(err, "error writing to file %s", mgr.config.File) } diff --git a/pkg/appauth/manager/json/json_test.go b/pkg/appauth/manager/json/json_test.go index cf8368053e..74e6156a13 100644 --- a/pkg/appauth/manager/json/json_test.go +++ b/pkg/appauth/manager/json/json_test.go @@ -22,7 +22,7 @@ import ( "bytes" "context" "encoding/json" - "io/ioutil" + "io" "os" "reflect" "testing" @@ -270,7 +270,7 @@ func TestGenerateAppPassword(t *testing.T) { if err != nil { t.Fatal(err) } - data, err := ioutil.ReadAll(tmpFile) + data, err := io.ReadAll(tmpFile) if err != nil { t.Fatalf("error reading file %s: %v", tmpFile.Name(), err) } @@ -701,7 +701,7 @@ func TestGetAppPassword(t *testing.T) { } func createTempDir(t *testing.T, name string) string { - tempDir, err := ioutil.TempDir("", name) + tempDir, err := os.MkdirTemp("", name) if err != nil { t.Fatalf("error while creating temp dir: %v", err) } @@ -709,7 +709,7 @@ func createTempDir(t *testing.T, name string) string { } func createTempFile(t *testing.T, tempDir string, name string) *os.File { - tempFile, err := ioutil.TempFile(tempDir, name) + tempFile, err := os.CreateTemp(tempDir, name) if err != nil { t.Fatalf("error while creating temp file: %v", err) } diff --git a/pkg/auth/manager/json/json.go b/pkg/auth/manager/json/json.go index 150014ba8c..36b31a2436 100644 --- a/pkg/auth/manager/json/json.go +++ b/pkg/auth/manager/json/json.go @@ -21,7 +21,7 @@ package json import ( "context" "encoding/json" - "io/ioutil" + "os" authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -94,7 +94,7 @@ func (m *manager) Configure(ml map[string]interface{}) error { } m.credentials = map[string]*Credentials{} - f, err := ioutil.ReadFile(c.Users) + f, err := os.ReadFile(c.Users) if err != nil { return err } diff --git a/pkg/auth/manager/json/json_test.go b/pkg/auth/manager/json/json_test.go index 3abaf024a6..a75d21f81d 100644 --- a/pkg/auth/manager/json/json_test.go +++ b/pkg/auth/manager/json/json_test.go @@ -20,7 +20,6 @@ package json import ( "context" - "io/ioutil" "os" "testing" @@ -93,7 +92,7 @@ func TestGetManagerWithJSONObject(t *testing.T) { var tmpFile *os.File // add tempdir - tmpDir, err := ioutil.TempDir("", "json_test") + tmpDir, err := os.MkdirTemp("", "json_test") if err != nil { t.Fatalf("Error while creating temp dir: %v", err) } @@ -101,7 +100,7 @@ func TestGetManagerWithJSONObject(t *testing.T) { for _, tt := range tests { // get file handler for temporary file - tmpFile, err = ioutil.TempFile(tmpDir, "json_test") + tmpFile, err = os.CreateTemp(tmpDir, "json_test") if err != nil { t.Fatalf("Error while opening temp file: %v", err) } @@ -159,14 +158,14 @@ func TestGetAuthenticatedManager(t *testing.T) { } // add tempdir - tempdir, err := ioutil.TempDir("", "json_test") + tempdir, err := os.MkdirTemp("", "json_test") if err != nil { t.Fatalf("Error while creating temp dir: %v", err) } defer os.RemoveAll(tempdir) // get file handler for temporary file - tempFile, err := ioutil.TempFile(tempdir, "json_test") + tempFile, err := os.CreateTemp(tempdir, "json_test") if err != nil { t.Fatalf("Error while opening temp file: %v", err) } diff --git a/pkg/auth/manager/oidc/oidc.go b/pkg/auth/manager/oidc/oidc.go index 903afc3fdd..bd0767f2ef 100644 --- a/pkg/auth/manager/oidc/oidc.go +++ b/pkg/auth/manager/oidc/oidc.go @@ -24,7 +24,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "os" "strings" "time" @@ -125,7 +125,7 @@ func (am *mgr) Configure(m map[string]interface{}) error { return nil } - f, err := ioutil.ReadFile(c.UsersMapping) + f, err := os.ReadFile(c.UsersMapping) if err != nil { return fmt.Errorf("oidc: error reading the users mapping file: +%v", err) } diff --git a/pkg/auth/manager/owncloudsql/accounts/accounts_test.go b/pkg/auth/manager/owncloudsql/accounts/accounts_test.go index 8921077d1d..41f61e53cf 100644 --- a/pkg/auth/manager/owncloudsql/accounts/accounts_test.go +++ b/pkg/auth/manager/owncloudsql/accounts/accounts_test.go @@ -21,7 +21,6 @@ package accounts_test import ( "context" "database/sql" - "io/ioutil" "os" _ "github.com/mattn/go-sqlite3" @@ -41,10 +40,10 @@ var _ = Describe("Accounts", func() { BeforeEach(func() { var err error - testDbFile, err = ioutil.TempFile("", "example") + testDbFile, err = os.CreateTemp("", "example") Expect(err).ToNot(HaveOccurred()) - dbData, err := ioutil.ReadFile("test.sqlite") + dbData, err := os.ReadFile("test.sqlite") Expect(err).ToNot(HaveOccurred()) _, err = testDbFile.Write(dbData) diff --git a/pkg/cbox/utils/tokenmanagement.go b/pkg/cbox/utils/tokenmanagement.go index 985f9ad93e..aac6a8a00c 100644 --- a/pkg/cbox/utils/tokenmanagement.go +++ b/pkg/cbox/utils/tokenmanagement.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "errors" - "io/ioutil" + "io" "net/http" "net/url" "strings" @@ -107,7 +107,7 @@ func (a *APITokenManager) getAPIToken(ctx context.Context) (string, time.Time, e } defer httpRes.Body.Close() - body, err := ioutil.ReadAll(httpRes.Body) + body, err := io.ReadAll(httpRes.Body) if err != nil { return "", time.Time{}, err } @@ -157,7 +157,7 @@ func (a *APITokenManager) SendAPIGetRequest(ctx context.Context, url string, for return nil, errors.New("rest: API request returned " + httpRes.Status) } - body, err := ioutil.ReadAll(httpRes.Body) + body, err := io.ReadAll(httpRes.Body) if err != nil { return nil, err } diff --git a/pkg/datatx/manager/rclone/rclone.go b/pkg/datatx/manager/rclone/rclone.go index 5ebee8029b..5c39e38045 100644 --- a/pkg/datatx/manager/rclone/rclone.go +++ b/pkg/datatx/manager/rclone/rclone.go @@ -23,7 +23,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "os" @@ -158,7 +158,7 @@ func parseConfig(m map[string]interface{}) (*config, error) { func loadOrCreate(file string) (*transferModel, error) { _, err := os.Stat(file) if os.IsNotExist(err) { - if err := ioutil.WriteFile(file, []byte("{}"), 0700); err != nil { + if err := os.WriteFile(file, []byte("{}"), 0700); err != nil { err = errors.Wrap(err, "error creating the transfers storage file: "+file) return nil, err } @@ -171,7 +171,7 @@ func loadOrCreate(file string) (*transferModel, error) { } defer fd.Close() - data, err := ioutil.ReadAll(fd) + data, err := io.ReadAll(fd) if err != nil { err = errors.Wrap(err, "error reading the data") return nil, err @@ -199,7 +199,7 @@ func (m *transferModel) saveTransfer(e error) error { return e } - if err := ioutil.WriteFile(m.File, data, 0644); err != nil { + if err := os.WriteFile(m.File, data, 0644); err != nil { e = errors.Wrap(err, "error writing transfer data to file: "+m.File) return e } diff --git a/pkg/eosclient/eosbinary/eosbinary.go b/pkg/eosclient/eosbinary/eosbinary.go index d9a988d4d7..11868fc12b 100644 --- a/pkg/eosclient/eosbinary/eosbinary.go +++ b/pkg/eosclient/eosbinary/eosbinary.go @@ -23,7 +23,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "os" "os/exec" "path" @@ -767,7 +766,7 @@ func (c *Client) Read(ctx context.Context, auth eosclient.Authorization, path st // Write writes a stream to the mgm func (c *Client) Write(ctx context.Context, auth eosclient.Authorization, path string, stream io.ReadCloser) error { - fd, err := ioutil.TempFile(c.opt.CacheDirectory, "eoswrite-") + fd, err := os.CreateTemp(c.opt.CacheDirectory, "eoswrite-") if err != nil { return err } diff --git a/pkg/eosclient/eosgrpc/eosgrpc.go b/pkg/eosclient/eosgrpc/eosgrpc.go index 27e2cc1ff8..f505334ccf 100644 --- a/pkg/eosclient/eosgrpc/eosgrpc.go +++ b/pkg/eosclient/eosgrpc/eosgrpc.go @@ -24,7 +24,6 @@ import ( "encoding/hex" "fmt" "io" - "io/ioutil" "os" "os/exec" "path" @@ -1192,8 +1191,8 @@ func (c *Client) List(ctx context.Context, auth eosclient.Authorization, dpath s // Read reads a file from the mgm and returns a handle to read it // This handle could be directly the body of the response or a local tmp file -// returning a handle to the body is nice, yet it gives less control on the transaction -// itself, e.g. strange timeouts or TCP issues may be more difficult to trace +// returning a handle to the body is nice, yet it gives less control on the transaction +// itself, e.g. strange timeouts or TCP issues may be more difficult to trace // Let's consider this experimental for the moment, maybe I'll like to add a config // parameter to choose between the two behaviours func (c *Client) Read(ctx context.Context, auth eosclient.Authorization, path string) (io.ReadCloser, error) { @@ -1237,7 +1236,7 @@ func (c *Client) Write(ctx context.Context, auth eosclient.Authorization, path s length = -1 if c.opt.WriteUsesLocalTemp { - fd, err := ioutil.TempFile(c.opt.CacheDirectory, "eoswrite-") + fd, err := os.CreateTemp(c.opt.CacheDirectory, "eoswrite-") if err != nil { return err } diff --git a/pkg/eosclient/eosgrpc/eoshttp.go b/pkg/eosclient/eosgrpc/eoshttp.go index f9caf89b47..591f4ae002 100644 --- a/pkg/eosclient/eosgrpc/eoshttp.go +++ b/pkg/eosclient/eosgrpc/eoshttp.go @@ -289,7 +289,7 @@ func (c *EOSHTTPClient) GETFile(ctx context.Context, remoteuser string, auth eos // Let's support redirections... and if we retry we have to retry at the same FST, avoid going back to the MGM if resp != nil && (resp.StatusCode == http.StatusFound || resp.StatusCode == http.StatusTemporaryRedirect) { - // io.Copy(ioutil.Discard, resp.Body) + // io.Copy(io.Discard, resp.Body) // resp.Body.Close() loc, err := resp.Location() @@ -383,7 +383,7 @@ func (c *EOSHTTPClient) PUTFile(ctx context.Context, remoteuser string, auth eos // Let's support redirections... and if we retry we retry at the same FST if resp != nil && resp.StatusCode == 307 { - // io.Copy(ioutil.Discard, resp.Body) + // io.Copy(io.Discard, resp.Body) // resp.Body.Close() loc, err := resp.Location() diff --git a/pkg/errtypes/errtypes.go b/pkg/errtypes/errtypes.go index 4952d9c104..e1181fc3ce 100644 --- a/pkg/errtypes/errtypes.go +++ b/pkg/errtypes/errtypes.go @@ -85,7 +85,7 @@ func (e Aborted) IsAborted() {} // the files are deleted from the directory. ProconditionFailed should also be // returned when an intermediate directory for an MKCOL or PUT is missing. // -// FIXME rename to FailedProcondition to make it less confusable with the http status Precondition Failed +// # FIXME rename to FailedProcondition to make it less confusable with the http status Precondition Failed // // HTTP Mapping: 400 Bad Request, 405 Method Not Allowed, 409 Conflict type PreconditionFailed string diff --git a/pkg/group/manager/json/json.go b/pkg/group/manager/json/json.go index c09a19c1fa..fd83967e99 100644 --- a/pkg/group/manager/json/json.go +++ b/pkg/group/manager/json/json.go @@ -21,7 +21,7 @@ package json import ( "context" "encoding/json" - "io/ioutil" + "os" "strconv" "strings" @@ -70,7 +70,7 @@ func New(m map[string]interface{}) (group.Manager, error) { return nil, err } - f, err := ioutil.ReadFile(c.Groups) + f, err := os.ReadFile(c.Groups) if err != nil { return nil, err } diff --git a/pkg/group/manager/json/json_test.go b/pkg/group/manager/json/json_test.go index 1cea8a3ab7..fa4171a50c 100644 --- a/pkg/group/manager/json/json_test.go +++ b/pkg/group/manager/json/json_test.go @@ -20,7 +20,6 @@ package json import ( "context" - "io/ioutil" "os" "reflect" "testing" @@ -34,7 +33,7 @@ var ctx = context.Background() func TestUserManager(t *testing.T) { // add tempdir - tempdir, err := ioutil.TempDir("", "json_test") + tempdir, err := os.MkdirTemp("", "json_test") if err != nil { t.Fatalf("error while create temp dir: %v", err) } @@ -44,7 +43,7 @@ func TestUserManager(t *testing.T) { userJSON := `[{` // get file handler for temporary file - file, err := ioutil.TempFile(tempdir, "json_test") + file, err := os.CreateTemp(tempdir, "json_test") if err != nil { t.Fatalf("error while open temp file: %v", err) } @@ -71,7 +70,7 @@ func TestUserManager(t *testing.T) { userJSON = `[{"id":{"opaque_id":"sailing-lovers"},"group_name":"sailing-lovers","mail":"sailing-lovers@example.org","display_name":"Sailing Lovers","gid_number":1234,"members":[{"idp":"localhost","opaque_id":"einstein","type":1},{"idp":"localhost","opaque_id":"marie","type":1}]}]` // get file handler for temporary file - file, err = ioutil.TempFile(tempdir, "json_test") + file, err = os.CreateTemp(tempdir, "json_test") if err != nil { t.Fatalf("error while open temp file: %v", err) } diff --git a/pkg/mentix/exchangers/exporters/promsd.go b/pkg/mentix/exchangers/exporters/promsd.go index 5ae61a8236..079a41a493 100755 --- a/pkg/mentix/exchangers/exporters/promsd.go +++ b/pkg/mentix/exchangers/exporters/promsd.go @@ -21,7 +21,6 @@ package exporters import ( "encoding/json" "fmt" - "io/ioutil" "net/url" "os" "path" @@ -217,7 +216,7 @@ func (exporter *PrometheusSDExporter) exportScrapeConfig(outputFilename string, } // Write the data to disk - if err := ioutil.WriteFile(outputFilename, data, 0755); err != nil { + if err := os.WriteFile(outputFilename, data, 0755); err != nil { return fmt.Errorf("unable to write scrape config '%v': %v", outputFilename, err) } diff --git a/pkg/mentix/exchangers/exporters/reqexporter.go b/pkg/mentix/exchangers/exporters/reqexporter.go index 4ab920fdd4..343f1b9bdb 100644 --- a/pkg/mentix/exchangers/exporters/reqexporter.go +++ b/pkg/mentix/exchangers/exporters/reqexporter.go @@ -19,7 +19,7 @@ package exporters import ( - "io/ioutil" + "io" "net/http" "net/url" @@ -37,7 +37,7 @@ type BaseRequestExporter struct { // HandleRequest handles the actual HTTP request. func (exporter *BaseRequestExporter) HandleRequest(resp http.ResponseWriter, req *http.Request, conf *config.Configuration, log *zerolog.Logger) { - body, _ := ioutil.ReadAll(req.Body) + body, _ := io.ReadAll(req.Body) status, respData, err := exporter.handleQuery(body, req.URL.Query(), conf, log) if err != nil { respData = []byte(err.Error()) diff --git a/pkg/mentix/exchangers/importers/reqimporter.go b/pkg/mentix/exchangers/importers/reqimporter.go index 0496a1482f..3b0929ba4f 100644 --- a/pkg/mentix/exchangers/importers/reqimporter.go +++ b/pkg/mentix/exchangers/importers/reqimporter.go @@ -19,7 +19,7 @@ package importers import ( - "io/ioutil" + "io" "net/http" "net/url" @@ -38,7 +38,7 @@ type BaseRequestImporter struct { // HandleRequest handles the actual HTTP request. func (importer *BaseRequestImporter) HandleRequest(resp http.ResponseWriter, req *http.Request, conf *config.Configuration, log *zerolog.Logger) { - body, _ := ioutil.ReadAll(req.Body) + body, _ := io.ReadAll(req.Body) meshDataSet, status, respData, err := importer.handleQuery(body, req.URL.Query(), conf, log) if err == nil { if len(meshDataSet) > 0 { diff --git a/pkg/mentix/key/apikey.go b/pkg/mentix/key/apikey.go index 8da609a016..29b59f7dd2 100644 --- a/pkg/mentix/key/apikey.go +++ b/pkg/mentix/key/apikey.go @@ -48,7 +48,7 @@ const ( // GenerateAPIKey generates a new (random) API key which also contains flags and a (salted) hash. // An API key has the following format: -// +// func GenerateAPIKey(salt string, flags int) (APIKey, error) { if len(salt) == 0 { return "", errors.Errorf("no salt specified") diff --git a/pkg/mentix/utils/network/network.go b/pkg/mentix/utils/network/network.go index 23b8ca02ed..4a01bd9e4e 100644 --- a/pkg/mentix/utils/network/network.go +++ b/pkg/mentix/utils/network/network.go @@ -21,7 +21,7 @@ package network import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net" "net/http" "net/url" @@ -87,7 +87,7 @@ func queryEndpoint(method string, endpointURL *url.URL, auth *BasicAuth, checkSt return nil, fmt.Errorf("invalid response received: %v", resp.Status) } - body, _ := ioutil.ReadAll(resp.Body) + body, _ := io.ReadAll(resp.Body) return body, nil } diff --git a/pkg/metrics/driver/json/json.go b/pkg/metrics/driver/json/json.go index b89eaf77c7..8e895350c3 100644 --- a/pkg/metrics/driver/json/json.go +++ b/pkg/metrics/driver/json/json.go @@ -21,7 +21,6 @@ package json import ( "encoding/json" "errors" - "io/ioutil" "os" "github.com/cs3org/reva/v2/pkg/metrics/driver/registry" @@ -47,7 +46,7 @@ func driverName() string { func readJSON(driver *MetricsJSONDriver) *data { data := &data{} - file, err := ioutil.ReadFile(driver.metricsDataLocation) + file, err := os.ReadFile(driver.metricsDataLocation) if err != nil { log.Error().Err(err).Str("location", driver.metricsDataLocation).Msg("Unable to read json file from location.") } diff --git a/pkg/metrics/driver/xcloud/xcloud.go b/pkg/metrics/driver/xcloud/xcloud.go index 082a1708ba..7167547507 100644 --- a/pkg/metrics/driver/xcloud/xcloud.go +++ b/pkg/metrics/driver/xcloud/xcloud.go @@ -23,7 +23,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" "os" "sync" @@ -82,7 +82,7 @@ func (d *CloudDriver) refresh() error { defer resp.Body.Close() // read response body - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { log.Err(err).Msgf("xcloud: error reading resp body from internal metrics from %s", d.instance) return err diff --git a/pkg/ocm/invite/manager/json/json.go b/pkg/ocm/invite/manager/json/json.go index 037a85adf9..739143212e 100644 --- a/pkg/ocm/invite/manager/json/json.go +++ b/pkg/ocm/invite/manager/json/json.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "os" @@ -125,7 +125,7 @@ func loadOrCreate(file string) (*inviteModel, error) { _, err := os.Stat(file) if os.IsNotExist(err) { - if err := ioutil.WriteFile(file, []byte("{}"), 0700); err != nil { + if err := os.WriteFile(file, []byte("{}"), 0700); err != nil { err = errors.Wrap(err, "error creating the invite storage file: "+file) return nil, err } @@ -138,7 +138,7 @@ func loadOrCreate(file string) (*inviteModel, error) { } defer fd.Close() - data, err := ioutil.ReadAll(fd) + data, err := io.ReadAll(fd) if err != nil { err = errors.Wrap(err, "error reading the data") return nil, err @@ -168,7 +168,7 @@ func (model *inviteModel) Save() error { return err } - if err := ioutil.WriteFile(model.File, data, 0644); err != nil { + if err := os.WriteFile(model.File, data, 0644); err != nil { err = errors.Wrap(err, "error writing invite data to file: "+model.File) return err } @@ -235,7 +235,7 @@ func (m *manager) ForwardInvite(ctx context.Context, invite *invitepb.InviteToke defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - respBody, e := ioutil.ReadAll(resp.Body) + respBody, e := io.ReadAll(resp.Body) if e != nil { return errors.Wrap(e, "json: error reading request body") } diff --git a/pkg/ocm/provider/authorizer/json/json.go b/pkg/ocm/provider/authorizer/json/json.go index 75873e77be..671e14688c 100644 --- a/pkg/ocm/provider/authorizer/json/json.go +++ b/pkg/ocm/provider/authorizer/json/json.go @@ -21,9 +21,9 @@ package json import ( "context" "encoding/json" - "io/ioutil" "net" "net/url" + "os" "strings" "sync" @@ -48,7 +48,7 @@ func New(m map[string]interface{}) (provider.Authorizer, error) { } c.init() - f, err := ioutil.ReadFile(c.Providers) + f, err := os.ReadFile(c.Providers) if err != nil { return nil, err } diff --git a/pkg/ocm/provider/authorizer/open/open.go b/pkg/ocm/provider/authorizer/open/open.go index f1a0ea3b14..c751ff0acd 100644 --- a/pkg/ocm/provider/authorizer/open/open.go +++ b/pkg/ocm/provider/authorizer/open/open.go @@ -21,8 +21,8 @@ package open import ( "context" "encoding/json" - "io/ioutil" "net/url" + "os" "strings" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" @@ -46,7 +46,7 @@ func New(m map[string]interface{}) (provider.Authorizer, error) { } c.init() - f, err := ioutil.ReadFile(c.Providers) + f, err := os.ReadFile(c.Providers) if err != nil { return nil, err } diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go index e14056d8e9..fc9d21501a 100644 --- a/pkg/ocm/share/manager/json/json.go +++ b/pkg/ocm/share/manager/json/json.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "os" "sync" "time" @@ -76,7 +76,7 @@ func New(m map[string]interface{}) (share.Manager, error) { func loadOrCreate(file string) (*shareModel, error) { _, err := os.Stat(file) if os.IsNotExist(err) { - if err := ioutil.WriteFile(file, []byte("{}"), 0700); err != nil { + if err := os.WriteFile(file, []byte("{}"), 0700); err != nil { err = errors.Wrap(err, "error creating the file: "+file) return nil, err } @@ -89,7 +89,7 @@ func loadOrCreate(file string) (*shareModel, error) { } defer fd.Close() - data, err := ioutil.ReadAll(fd) + data, err := io.ReadAll(fd) if err != nil { err = errors.Wrap(err, "error reading the data") return nil, err @@ -142,7 +142,7 @@ func (m *shareModel) Save() error { return err } - if err := ioutil.WriteFile(m.file, data, 0644); err != nil { + if err := os.WriteFile(m.file, data, 0644); err != nil { err = errors.Wrap(err, "error writing to file: "+m.file) return err } @@ -151,7 +151,7 @@ func (m *shareModel) Save() error { } func (m *shareModel) ReadFile() error { - data, err := ioutil.ReadFile(m.file) + data, err := os.ReadFile(m.file) if err != nil { err = errors.Wrap(err, "error reading the data") return err diff --git a/pkg/ocm/share/sender/sender.go b/pkg/ocm/share/sender/sender.go index a978ab8e76..8dc9b5a69b 100644 --- a/pkg/ocm/share/sender/sender.go +++ b/pkg/ocm/share/sender/sender.go @@ -21,7 +21,7 @@ package sender import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "path" @@ -81,7 +81,7 @@ func Send(requestBodyMap map[string]interface{}, pi *ocmprovider.ProviderInfo) e defer resp.Body.Close() if (resp.StatusCode != http.StatusCreated) && (resp.StatusCode != http.StatusOK) { - respBody, e := ioutil.ReadAll(resp.Body) + respBody, e := io.ReadAll(resp.Body) if e != nil { e = errors.Wrap(e, "sender: error reading request body") return e diff --git a/pkg/publicshare/manager/cs3/cs3_test.go b/pkg/publicshare/manager/cs3/cs3_test.go index 9a2d80c984..7a5dcc95f3 100644 --- a/pkg/publicshare/manager/cs3/cs3_test.go +++ b/pkg/publicshare/manager/cs3/cs3_test.go @@ -21,7 +21,6 @@ package cs3_test import ( "context" "encoding/json" - "io/ioutil" "os" "path" "strings" @@ -66,7 +65,7 @@ var _ = Describe("Cs3", func() { BeforeEach(func() { var err error - tmpdir, err = ioutil.TempDir("", "cs3-publicshare-test") + tmpdir, err = os.MkdirTemp("", "cs3-publicshare-test") Expect(err).ToNot(HaveOccurred()) ds, err := metadata.NewDiskStorage(tmpdir) diff --git a/pkg/publicshare/manager/json/json_test.go b/pkg/publicshare/manager/json/json_test.go index 747c8453b4..f9385896ae 100644 --- a/pkg/publicshare/manager/json/json_test.go +++ b/pkg/publicshare/manager/json/json_test.go @@ -20,7 +20,6 @@ package json_test import ( "context" - "io/ioutil" "os" "path/filepath" "sync" @@ -77,7 +76,7 @@ var _ = Describe("Json", func() { BeforeEach(func() { var err error - tmpFile, err = ioutil.TempFile("", "reva-unit-test-*.json") + tmpFile, err = os.CreateTemp("", "reva-unit-test-*.json") Expect(err).ToNot(HaveOccurred()) config := map[string]interface{}{ @@ -179,7 +178,7 @@ var _ = Describe("Json", func() { BeforeEach(func() { var err error - tmpdir, err = ioutil.TempDir("", "json-publicshare-manager-test") + tmpdir, err = os.MkdirTemp("", "json-publicshare-manager-test") Expect(err).ToNot(HaveOccurred()) err = os.MkdirAll(tmpdir, 0755) diff --git a/pkg/publicshare/manager/json/persistence/file/file.go b/pkg/publicshare/manager/json/persistence/file/file.go index 552a687f1f..d9a84d6742 100644 --- a/pkg/publicshare/manager/json/persistence/file/file.go +++ b/pkg/publicshare/manager/json/persistence/file/file.go @@ -22,7 +22,6 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" "os" "path/filepath" @@ -56,7 +55,7 @@ func (p *file) Init(_ context.Context) error { } if fi == nil || fi.Size() == 0 { - err := ioutil.WriteFile(p.path, []byte("{}"), 0644) + err := os.WriteFile(p.path, []byte("{}"), 0644) if err != nil { return err } @@ -70,7 +69,7 @@ func (p *file) Read(_ context.Context) (persistence.PublicShares, error) { return nil, fmt.Errorf("not initialized") } db := map[string]interface{}{} - readBytes, err := ioutil.ReadFile(p.path) + readBytes, err := os.ReadFile(p.path) if err != nil { return nil, err } @@ -89,5 +88,5 @@ func (p *file) Write(_ context.Context, db persistence.PublicShares) error { return err } - return ioutil.WriteFile(p.path, dbAsJSON, 0644) + return os.WriteFile(p.path, dbAsJSON, 0644) } diff --git a/pkg/registry/config_test.go b/pkg/registry/config_test.go index d981677da9..a065974d5c 100644 --- a/pkg/registry/config_test.go +++ b/pkg/registry/config_test.go @@ -28,20 +28,20 @@ config example: --- services: - authprovider: - basic: - name: auth-basic - nodes: - - address: 0.0.0.0:1234 - metadata: - version: v0.1.0 - bearer: - name: auth-bearer - nodes: - - address: 0.0.0.0:5678 - metadata: - version: v0.1.0 + authprovider: + basic: + name: auth-basic + nodes: + - address: 0.0.0.0:1234 + metadata: + version: v0.1.0 + bearer: + name: auth-bearer + nodes: + - address: 0.0.0.0:5678 + metadata: + version: v0.1.0 */ func TestParseConfig(t *testing.T) { type args struct { diff --git a/pkg/sdk/common/net/httpreq.go b/pkg/sdk/common/net/httpreq.go index d6167abdbc..17b9fbf823 100644 --- a/pkg/sdk/common/net/httpreq.go +++ b/pkg/sdk/common/net/httpreq.go @@ -22,7 +22,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "net/http" "time" ) @@ -93,7 +92,7 @@ func (request *HTTPRequest) Do(checkStatus bool) ([]byte, error) { return nil, fmt.Errorf("received invalid response from '%v': %s", request.endpoint, httpRes.Status) } - data, err := ioutil.ReadAll(httpRes.Body) + data, err := io.ReadAll(httpRes.Body) if err != nil { return nil, fmt.Errorf("reading response data from '%v' failed: %v", request.endpoint, err) } diff --git a/pkg/sdk/common/net/webdav.go b/pkg/sdk/common/net/webdav.go index 7dc3be244a..17776d3438 100644 --- a/pkg/sdk/common/net/webdav.go +++ b/pkg/sdk/common/net/webdav.go @@ -21,7 +21,6 @@ package net import ( "fmt" "io" - "io/ioutil" "strconv" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" @@ -61,7 +60,7 @@ func (webdav *WebDAVClient) Read(file string) ([]byte, error) { } defer reader.Close() - data, err := ioutil.ReadAll(reader) + data, err := io.ReadAll(reader) if err != nil { return nil, fmt.Errorf("unable to read the data: %v", err) } diff --git a/pkg/share/manager/json/json.go b/pkg/share/manager/json/json.go index 60a31a7f9c..8b57b3c500 100644 --- a/pkg/share/manager/json/json.go +++ b/pkg/share/manager/json/json.go @@ -21,8 +21,8 @@ package json import ( "context" "encoding/json" + "io" "io/fs" - "io/ioutil" "os" "strings" "sync" @@ -82,7 +82,7 @@ func New(m map[string]interface{}) (share.Manager, error) { func loadOrCreate(file string) (*shareModel, error) { if info, err := os.Stat(file); errors.Is(err, fs.ErrNotExist) || info.Size() == 0 { - if err := ioutil.WriteFile(file, []byte("{}"), 0700); err != nil { + if err := os.WriteFile(file, []byte("{}"), 0700); err != nil { err = errors.Wrap(err, "error opening/creating the file: "+file) return nil, err } @@ -95,7 +95,7 @@ func loadOrCreate(file string) (*shareModel, error) { } defer fd.Close() - data, err := ioutil.ReadAll(fd) + data, err := io.ReadAll(fd) if err != nil { err = errors.Wrap(err, "error reading the data") return nil, err @@ -156,7 +156,7 @@ func (m *shareModel) Save() error { return err } - if err := ioutil.WriteFile(m.file, data, 0644); err != nil { + if err := os.WriteFile(m.file, data, 0644); err != nil { err = errors.Wrap(err, "error writing to file: "+m.file) return err } diff --git a/pkg/share/manager/json/json_test.go b/pkg/share/manager/json/json_test.go index 1a57d429d1..f80d870c1c 100644 --- a/pkg/share/manager/json/json_test.go +++ b/pkg/share/manager/json/json_test.go @@ -20,7 +20,6 @@ package json_test import ( "context" - "io/ioutil" "os" "sync" @@ -66,7 +65,7 @@ var _ = Describe("Json", func() { BeforeEach(func() { var err error - tmpFile, err = ioutil.TempFile("", "reva-unit-test-*.json") + tmpFile, err = os.CreateTemp("", "reva-unit-test-*.json") Expect(err).ToNot(HaveOccurred()) config := map[string]interface{}{ diff --git a/pkg/share/manager/jsoncs3/jsoncs3_test.go b/pkg/share/manager/jsoncs3/jsoncs3_test.go index 8d073f3c6c..a4ba227477 100644 --- a/pkg/share/manager/jsoncs3/jsoncs3_test.go +++ b/pkg/share/manager/jsoncs3/jsoncs3_test.go @@ -21,7 +21,6 @@ package jsoncs3_test import ( "context" "encoding/json" - "io/ioutil" "os" "path/filepath" "sync" @@ -146,7 +145,7 @@ var _ = Describe("Jsoncs3", func() { } var err error - tmpdir, err = ioutil.TempDir("", "jsoncs3-test") + tmpdir, err = os.MkdirTemp("", "jsoncs3-test") Expect(err).ToNot(HaveOccurred()) err = os.MkdirAll(tmpdir, 0755) diff --git a/pkg/share/manager/jsoncs3/providercache/providercache_test.go b/pkg/share/manager/jsoncs3/providercache/providercache_test.go index 0ec3b40fc0..a95eaaf338 100644 --- a/pkg/share/manager/jsoncs3/providercache/providercache_test.go +++ b/pkg/share/manager/jsoncs3/providercache/providercache_test.go @@ -20,7 +20,6 @@ package providercache_test import ( "context" - "io/ioutil" "os" "time" @@ -53,7 +52,7 @@ var _ = Describe("Cache", func() { ctx = context.Background() var err error - tmpdir, err = ioutil.TempDir("", "providercache-test") + tmpdir, err = os.MkdirTemp("", "providercache-test") Expect(err).ToNot(HaveOccurred()) err = os.MkdirAll(tmpdir, 0755) diff --git a/pkg/share/manager/jsoncs3/receivedsharecache/receivedsharecache_test.go b/pkg/share/manager/jsoncs3/receivedsharecache/receivedsharecache_test.go index 542b8d7ec2..3532516a71 100644 --- a/pkg/share/manager/jsoncs3/receivedsharecache/receivedsharecache_test.go +++ b/pkg/share/manager/jsoncs3/receivedsharecache/receivedsharecache_test.go @@ -20,7 +20,6 @@ package receivedsharecache_test import ( "context" - "io/ioutil" "os" "time" @@ -54,7 +53,7 @@ var _ = Describe("Cache", func() { ctx = context.Background() var err error - tmpdir, err = ioutil.TempDir("", "providercache-test") + tmpdir, err = os.MkdirTemp("", "providercache-test") Expect(err).ToNot(HaveOccurred()) err = os.MkdirAll(tmpdir, 0755) diff --git a/pkg/share/manager/jsoncs3/sharecache/sharecache_test.go b/pkg/share/manager/jsoncs3/sharecache/sharecache_test.go index f34d1909c8..50275c1af3 100644 --- a/pkg/share/manager/jsoncs3/sharecache/sharecache_test.go +++ b/pkg/share/manager/jsoncs3/sharecache/sharecache_test.go @@ -20,7 +20,6 @@ package sharecache_test import ( "context" - "io/ioutil" "os" "time" @@ -46,7 +45,7 @@ var _ = Describe("Sharecache", func() { ctx = context.Background() var err error - tmpdir, err = ioutil.TempDir("", "providercache-test") + tmpdir, err = os.MkdirTemp("", "providercache-test") Expect(err).ToNot(HaveOccurred()) err = os.MkdirAll(tmpdir, 0755) diff --git a/pkg/share/manager/owncloudsql/owncloudsql_test.go b/pkg/share/manager/owncloudsql/owncloudsql_test.go index ddf5826467..e51c746294 100644 --- a/pkg/share/manager/owncloudsql/owncloudsql_test.go +++ b/pkg/share/manager/owncloudsql/owncloudsql_test.go @@ -21,7 +21,6 @@ package owncloudsql_test import ( "context" "database/sql" - "io/ioutil" "os" "strconv" @@ -112,10 +111,10 @@ var _ = Describe("SQL manager", func() { BeforeEach(func() { var err error - testDbFile, err = ioutil.TempFile("", "example") + testDbFile, err = os.CreateTemp("", "example") Expect(err).ToNot(HaveOccurred()) - dbData, err := ioutil.ReadFile("test.db") + dbData, err := os.ReadFile("test.db") Expect(err).ToNot(HaveOccurred()) _, err = testDbFile.Write(dbData) diff --git a/pkg/siteacc/account/panel.go b/pkg/siteacc/account/panel.go index 766e6c48b6..44f279ef3d 100644 --- a/pkg/siteacc/account/panel.go +++ b/pkg/siteacc/account/panel.go @@ -21,7 +21,6 @@ package account import ( "net/http" "net/url" - "strings" "github.com/cs3org/reva/v2/pkg/siteacc/account/contact" "github.com/cs3org/reva/v2/pkg/siteacc/account/edit" @@ -35,6 +34,8 @@ import ( "github.com/cs3org/reva/v2/pkg/siteacc/html" "github.com/pkg/errors" "github.com/rs/zerolog" + "golang.org/x/text/cases" + "golang.org/x/text/language" ) // Panel represents the account panel. @@ -150,8 +151,9 @@ func (panel *Panel) PreExecute(session *html.Session, path string, w http.Respon func (panel *Panel) Execute(w http.ResponseWriter, r *http.Request, session *html.Session) error { dataProvider := func(*html.Session) interface{} { flatValues := make(map[string]string, len(r.URL.Query())) + c := cases.Title(language.Und) for k, v := range r.URL.Query() { - flatValues[strings.Title(k)] = v[0] + flatValues[c.String(k)] = v[0] } availSites, err := data.QueryAvailableSites(panel.conf.Mentix.URL, panel.conf.Mentix.DataEndpoint) diff --git a/pkg/siteacc/data/filestorage.go b/pkg/siteacc/data/filestorage.go index 3e360e8223..afd02614be 100644 --- a/pkg/siteacc/data/filestorage.go +++ b/pkg/siteacc/data/filestorage.go @@ -20,7 +20,6 @@ package data import ( "encoding/json" - "io/ioutil" "os" "path/filepath" @@ -70,7 +69,7 @@ func (storage *FileStorage) initialize(conf *config.Configuration, log *zerolog. func (storage *FileStorage) readData(file string, obj interface{}) error { // Read the data from the specified file - jsonData, err := ioutil.ReadFile(file) + jsonData, err := os.ReadFile(file) if err != nil { return errors.Wrapf(err, "unable to read file %v", file) } @@ -103,7 +102,7 @@ func (storage *FileStorage) ReadAccounts() (*Accounts, error) { func (storage *FileStorage) writeData(file string, obj interface{}) error { // Write the data to the specified file jsonData, _ := json.MarshalIndent(obj, "", "\t") - if err := ioutil.WriteFile(file, jsonData, 0755); err != nil { + if err := os.WriteFile(file, jsonData, 0755); err != nil { return errors.Wrapf(err, "unable to write file %v", file) } return nil diff --git a/pkg/siteacc/endpoints.go b/pkg/siteacc/endpoints.go index 506c3d55a1..9ace7e7f51 100644 --- a/pkg/siteacc/endpoints.go +++ b/pkg/siteacc/endpoints.go @@ -21,7 +21,7 @@ package siteacc import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "strings" @@ -127,7 +127,7 @@ func callMethodEndpoint(siteacc *SiteAccounts, ep endpoint, w http.ResponseWrite // Search for a matching method in the list of callbacks for method, cb := range ep.MethodCallbacks { if method == r.Method { - body, _ := ioutil.ReadAll(r.Body) + body, _ := io.ReadAll(r.Body) if respData, err := cb(siteacc, r.URL.Query(), body, session); err == nil { resp.Success = true diff --git a/pkg/siteacc/manager/gocdb/account.go b/pkg/siteacc/manager/gocdb/account.go index e90fa2b530..5dbfe5320d 100644 --- a/pkg/siteacc/manager/gocdb/account.go +++ b/pkg/siteacc/manager/gocdb/account.go @@ -21,7 +21,7 @@ package gocdb import ( "bytes" "encoding/json" - "io/ioutil" + "io" "net/http" "github.com/cs3org/reva/v2/pkg/mentix/utils/network" @@ -78,7 +78,7 @@ func writeAccount(account *data.Account, operation string, address string, apiKe defer resp.Body.Close() if resp.StatusCode >= 400 { - msg, _ := ioutil.ReadAll(resp.Body) + msg, _ := io.ReadAll(resp.Body) return errors.Errorf("unable to perform request: %v", string(msg)) } diff --git a/pkg/storage/fs/nextcloud/nextcloud_server_mock.go b/pkg/storage/fs/nextcloud/nextcloud_server_mock.go index a7a4d2b1cc..3bb95e02a9 100644 --- a/pkg/storage/fs/nextcloud/nextcloud_server_mock.go +++ b/pkg/storage/fs/nextcloud/nextcloud_server_mock.go @@ -178,9 +178,9 @@ var responses = map[string]Response{ `POST /apps/sciencemesh/~tester/api/storage/GetQuota `: {200, `{"totalBytes":456,"usedBytes":123}`, serverStateEmpty}, `POST /apps/sciencemesh/~tester/api/storage/CreateReference {"path":"some/file/path.txt","url":"http://bing.com/search?q=dotnet"}`: {200, ``, serverStateEmpty}, `POST /apps/sciencemesh/~tester/api/storage/Shutdown `: {200, ``, serverStateEmpty}, - `POST /apps/sciencemesh/~tester/api/storage/SetArbitraryMetadata {"ref":{"resource_id":{"storage_id":"storage-id","opaque_id":"opaque-id"},"path":"some/file/path.txt"},"md":{"metadata":{"arbi":"trary","meta":"data"}}}`: {200, ``, serverStateEmpty}, - `POST /apps/sciencemesh/~tester/api/storage/UnsetArbitraryMetadata {"ref":{"resource_id":{"storage_id":"storage-id","opaque_id":"opaque-id"},"path":"some/file/path.txt"},"keys":["arbi"]}`: {200, ``, serverStateEmpty}, - `POST /apps/sciencemesh/~tester/api/storage/ListStorageSpaces [{"type":3,"Term":{"Owner":{"idp":"0.0.0.0:19000","opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c","type":1}}},{"type":2,"Term":{"Id":{"opaque_id":"opaque-id"}}},{"type":4,"Term":{"SpaceType":"home"}}]`: {200, ` [{"opaque":{"map":{"bar":{"value":"c2FtYQ=="},"foo":{"value":"c2FtYQ=="}}},"id":{"opaque_id":"some-opaque-storage-space-id"},"owner":{"id":{"idp":"some-idp","opaque_id":"some-opaque-user-id","type":1}},"root":{"storage_id":"some-storage-ud","opaque_id":"some-opaque-root-id"},"name":"My Storage Space","quota":{"quota_max_bytes":456,"quota_max_files":123},"space_type":"home","mtime":{"seconds":1234567890}}]`, serverStateEmpty}, + `POST /apps/sciencemesh/~tester/api/storage/SetArbitraryMetadata {"ref":{"resource_id":{"storage_id":"storage-id","opaque_id":"opaque-id"},"path":"some/file/path.txt"},"md":{"metadata":{"arbi":"trary","meta":"data"}}}`: {200, ``, serverStateEmpty}, + `POST /apps/sciencemesh/~tester/api/storage/UnsetArbitraryMetadata {"ref":{"resource_id":{"storage_id":"storage-id","opaque_id":"opaque-id"},"path":"some/file/path.txt"},"keys":["arbi"]}`: {200, ``, serverStateEmpty}, + `POST /apps/sciencemesh/~tester/api/storage/ListStorageSpaces [{"type":3,"Term":{"Owner":{"idp":"0.0.0.0:19000","opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c","type":1}}},{"type":2,"Term":{"Id":{"opaque_id":"opaque-id"}}},{"type":4,"Term":{"SpaceType":"home"}}]`: {200, ` [{"opaque":{"map":{"bar":{"value":"c2FtYQ=="},"foo":{"value":"c2FtYQ=="}}},"id":{"opaque_id":"some-opaque-storage-space-id"},"owner":{"id":{"idp":"some-idp","opaque_id":"some-opaque-user-id","type":1}},"root":{"storage_id":"some-storage-ud","opaque_id":"some-opaque-root-id"},"name":"My Storage Space","quota":{"quota_max_bytes":456,"quota_max_files":123},"space_type":"home","mtime":{"seconds":1234567890}}]`, serverStateEmpty}, `POST /apps/sciencemesh/~tester/api/storage/CreateStorageSpace {"opaque":{"map":{"bar":{"value":"c2FtYQ=="},"foo":{"value":"c2FtYQ=="}}},"owner":{"id":{"idp":"some-idp","opaque_id":"some-opaque-user-id","type":1}},"type":"home","name":"My Storage Space","quota":{"quota_max_bytes":456,"quota_max_files":123}}`: {200, `{"storage_space":{"opaque":{"map":{"bar":{"value":"c2FtYQ=="},"foo":{"value":"c2FtYQ=="}}},"id":{"opaque_id":"some-opaque-storage-space-id"},"owner":{"id":{"idp":"some-idp","opaque_id":"some-opaque-user-id","type":1}},"root":{"storage_id":"some-storage-ud","opaque_id":"some-opaque-root-id"},"name":"My Storage Space","quota":{"quota_max_bytes":456,"quota_max_files":123},"space_type":"home","mtime":{"seconds":1234567890}}}`, serverStateEmpty}, } diff --git a/pkg/storage/fs/ocis/blobstore/blobstore_test.go b/pkg/storage/fs/ocis/blobstore/blobstore_test.go index 610a13b290..283125dcc9 100644 --- a/pkg/storage/fs/ocis/blobstore/blobstore_test.go +++ b/pkg/storage/fs/ocis/blobstore/blobstore_test.go @@ -20,7 +20,7 @@ package blobstore_test import ( "bytes" - "io/ioutil" + "io" "os" "path" @@ -74,7 +74,7 @@ var _ = Describe("Blobstore", func() { err := bs.Upload(blobNode, bytes.NewReader(data)) Expect(err).ToNot(HaveOccurred()) - writtenBytes, err := ioutil.ReadFile(blobPath) + writtenBytes, err := os.ReadFile(blobPath) Expect(err).ToNot(HaveOccurred()) Expect(writtenBytes).To(Equal(data)) }) @@ -83,7 +83,7 @@ var _ = Describe("Blobstore", func() { Context("with an existing blob", func() { BeforeEach(func() { Expect(os.MkdirAll(path.Dir(blobPath), 0700)).To(Succeed()) - Expect(ioutil.WriteFile(blobPath, data, 0700)).To(Succeed()) + Expect(os.WriteFile(blobPath, data, 0700)).To(Succeed()) }) Describe("Download", func() { @@ -91,7 +91,7 @@ var _ = Describe("Blobstore", func() { reader, err := bs.Download(blobNode) Expect(err).ToNot(HaveOccurred()) - readData, err := ioutil.ReadAll(reader) + readData, err := io.ReadAll(reader) Expect(err).ToNot(HaveOccurred()) Expect(readData).To(Equal(data)) }) @@ -100,7 +100,7 @@ var _ = Describe("Blobstore", func() { reader, err := bs.Download(blobNode) Expect(err).ToNot(HaveOccurred()) - readData, err := ioutil.ReadAll(reader) + readData, err := io.ReadAll(reader) Expect(err).ToNot(HaveOccurred()) Expect(readData).To(Equal(data)) }) diff --git a/pkg/storage/fs/owncloudsql/filecache/filecache_test.go b/pkg/storage/fs/owncloudsql/filecache/filecache_test.go index e4cb05743f..6896ffdca2 100644 --- a/pkg/storage/fs/owncloudsql/filecache/filecache_test.go +++ b/pkg/storage/fs/owncloudsql/filecache/filecache_test.go @@ -21,7 +21,6 @@ package filecache_test import ( "context" "database/sql" - "io/ioutil" "os" "strconv" @@ -45,10 +44,10 @@ var _ = Describe("Filecache", func() { ctx = context.Background() var err error - testDbFile, err = ioutil.TempFile("", "example") + testDbFile, err = os.CreateTemp("", "example") Expect(err).ToNot(HaveOccurred()) - dbData, err := ioutil.ReadFile("test.db") + dbData, err := os.ReadFile("test.db") Expect(err).ToNot(HaveOccurred()) _, err = testDbFile.Write(dbData) diff --git a/pkg/storage/fs/owncloudsql/owncloudsql.go b/pkg/storage/fs/owncloudsql/owncloudsql.go index 08bb1610ce..671988c0d8 100644 --- a/pkg/storage/fs/owncloudsql/owncloudsql.go +++ b/pkg/storage/fs/owncloudsql/owncloudsql.go @@ -26,7 +26,6 @@ import ( "fmt" "hash/adler32" "io" - "io/ioutil" "net/url" "os" "path/filepath" @@ -1825,7 +1824,7 @@ func (fs *owncloudsqlfs) ListRecycle(ctx context.Context, ref *provider.Referenc } // list files folder - mds, err := ioutil.ReadDir(rp) + mds, err := os.ReadDir(rp) if err != nil { log := appctx.GetLogger(ctx) log.Debug().Err(err).Str("path", rp).Msg("trash not readable") @@ -1835,7 +1834,8 @@ func (fs *owncloudsqlfs) ListRecycle(ctx context.Context, ref *provider.Referenc // TODO (jfd) limit and offset items := []*provider.RecycleItem{} for i := range mds { - ri := fs.convertToRecycleItem(ctx, mds[i]) + mdsInfo, _ := mds[i].Info() + ri := fs.convertToRecycleItem(ctx, mdsInfo) if ri != nil { items = append(items, ri) } diff --git a/pkg/storage/fs/owncloudsql/upload.go b/pkg/storage/fs/owncloudsql/upload.go index 9177292f27..3ff24a4e2b 100644 --- a/pkg/storage/fs/owncloudsql/upload.go +++ b/pkg/storage/fs/owncloudsql/upload.go @@ -24,7 +24,6 @@ import ( "fmt" "io" iofs "io/fs" - "io/ioutil" "os" "path/filepath" "strconv" @@ -295,7 +294,7 @@ func (fs *owncloudsqlfs) GetUpload(ctx context.Context, id string) (tusd.Upload, infoPath := filepath.Join(fs.c.UploadInfoDir, id+".info") info := tusd.FileInfo{} - data, err := ioutil.ReadFile(infoPath) + data, err := os.ReadFile(infoPath) if err != nil { if os.IsNotExist(err) { // Interpret os.ErrNotExist as 404 Not Found @@ -400,7 +399,7 @@ func (upload *fileUpload) writeInfo() error { if err != nil { return err } - return ioutil.WriteFile(upload.infoPath, data, defaultFilePerm) + return os.WriteFile(upload.infoPath, data, defaultFilePerm) } // FinishUpload finishes an upload and moves the file to the internal destination diff --git a/pkg/storage/registry/spaces/spaces.go b/pkg/storage/registry/spaces/spaces.go index 6aaaf30e1f..4ce986cf0c 100644 --- a/pkg/storage/registry/spaces/spaces.go +++ b/pkg/storage/registry/spaces/spaces.go @@ -259,7 +259,7 @@ func (r *registry) GetProvider(ctx context.Context, space *providerpb.StorageSpa // Then the gateway needs all providers below /foo/sub // -> only the /foo/sub provider // -// requested path provider path +// requested path provider path // above = /foo <=> /foo/bar -> stat(spaceid, .) -> add metadata for /foo/bar // above = /foo <=> /foo/bar/bif -> stat(spaceid, .) -> add metadata for /foo/bar // matches = /foo/bar <=> /foo/bar -> list(spaceid, .) diff --git a/pkg/storage/utils/chunking/chunking.go b/pkg/storage/utils/chunking/chunking.go index f7df79fdf6..97c21e030e 100644 --- a/pkg/storage/utils/chunking/chunking.go +++ b/pkg/storage/utils/chunking/chunking.go @@ -21,7 +21,6 @@ package chunking import ( "fmt" "io" - "io/ioutil" "os" "path/filepath" "regexp" @@ -91,7 +90,7 @@ func NewChunkHandler(chunkFolder string) *ChunkHandler { } func (c *ChunkHandler) createChunkTempFile() (string, *os.File, error) { - file, err := ioutil.TempFile(fmt.Sprintf("/%s", c.ChunkFolder), "") + file, err := os.CreateTemp(fmt.Sprintf("/%s", c.ChunkFolder), "") if err != nil { return "", nil, err } diff --git a/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go b/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go index b63ab55301..1bf04c3918 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go @@ -19,7 +19,6 @@ package decomposedfs_test import ( - "io/ioutil" "os" "path" "sync" @@ -85,7 +84,7 @@ var _ = Describe("Decomposed", func() { Expect(err).ToNot(HaveOccurred()) Expect(len(revisions)).To(Equal(1)) - _, err = ioutil.ReadFile(path.Join(env.Root, "nodes", "root", "uploaded.txt")) + _, err = os.ReadFile(path.Join(env.Root, "nodes", "root", "uploaded.txt")) Expect(err).ToNot(HaveOccurred()) }) }) diff --git a/pkg/storage/utils/decomposedfs/tree/tree.go b/pkg/storage/utils/decomposedfs/tree/tree.go index 8cafa199ae..fa9ffaf801 100644 --- a/pkg/storage/utils/decomposedfs/tree/tree.go +++ b/pkg/storage/utils/decomposedfs/tree/tree.go @@ -936,7 +936,7 @@ func (t *Tree) readRecycleItem(ctx context.Context, spaceID, key, path string) ( appctx.GetLogger(ctx).Error().Err(err).Str("trashItem", trashItem).Msg("error reading trash link") return } - deletedNodePath = filepath.Join(t.lookup.InternalPath(spaceID, nodeID) + node.TrashIDDelimiter + timeSuffix) + deletedNodePath = t.lookup.InternalPath(spaceID, nodeID) + node.TrashIDDelimiter + timeSuffix } else { // children of a trashed node are in the nodes folder nodeID, err = readTrashChildLink(trashItem) diff --git a/pkg/storage/utils/decomposedfs/upload.go b/pkg/storage/utils/decomposedfs/upload.go index 07a6d97352..d45c573586 100644 --- a/pkg/storage/utils/decomposedfs/upload.go +++ b/pkg/storage/utils/decomposedfs/upload.go @@ -29,7 +29,6 @@ import ( "hash/adler32" "io" iofs "io/fs" - "io/ioutil" "os" "path/filepath" "regexp" @@ -374,7 +373,7 @@ func (fs *Decomposedfs) readInfo(id string) (tusd.FileInfo, error) { infoPath := filepath.Join(fs.o.Root, "uploads", id+".info") info := tusd.FileInfo{} - data, err := ioutil.ReadFile(infoPath) + data, err := os.ReadFile(infoPath) if err != nil { if errors.Is(err, iofs.ErrNotExist) { // Interpret os.ErrNotExist as 404 Not Found @@ -563,7 +562,7 @@ func (upload *fileUpload) writeInfo() error { if err != nil { return err } - return ioutil.WriteFile(upload.infoPath, data, defaultFilePerm) + return os.WriteFile(upload.infoPath, data, defaultFilePerm) } // FinishUpload finishes an upload and moves the file to the internal destination diff --git a/pkg/storage/utils/decomposedfs/upload_test.go b/pkg/storage/utils/decomposedfs/upload_test.go index 96e6080a84..7f301fbe83 100644 --- a/pkg/storage/utils/decomposedfs/upload_test.go +++ b/pkg/storage/utils/decomposedfs/upload_test.go @@ -22,7 +22,6 @@ import ( "bytes" "context" "io" - "io/ioutil" "os" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -252,13 +251,13 @@ var _ = Describe("File uploads", func() { Return(nil). Run(func(args mock.Arguments) { reader := args.Get(1).(io.Reader) - data, err := ioutil.ReadAll(reader) + data, err := io.ReadAll(reader) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal([]byte("0123456789"))) }) - _, err = fs.Upload(ctx, uploadRef, ioutil.NopCloser(bytes.NewReader(fileContent)), nil) + _, err = fs.Upload(ctx, uploadRef, io.NopCloser(bytes.NewReader(fileContent)), nil) Expect(err).ToNot(HaveOccurred()) bs.AssertCalled(GinkgoT(), "Upload", mock.Anything, mock.Anything, mock.Anything) @@ -290,13 +289,13 @@ var _ = Describe("File uploads", func() { Return(nil). Run(func(args mock.Arguments) { reader := args.Get(1).(io.Reader) - data, err := ioutil.ReadAll(reader) + data, err := io.ReadAll(reader) Expect(err).ToNot(HaveOccurred()) Expect(data).To(Equal([]byte(""))) }) - _, err = fs.Upload(ctx, uploadRef, ioutil.NopCloser(bytes.NewReader(fileContent)), nil) + _, err = fs.Upload(ctx, uploadRef, io.NopCloser(bytes.NewReader(fileContent)), nil) Expect(err).ToNot(HaveOccurred()) bs.AssertCalled(GinkgoT(), "Upload", mock.Anything, mock.Anything, mock.Anything) @@ -316,7 +315,7 @@ var _ = Describe("File uploads", func() { ) uploadRef := &provider.Reference{Path: "/some-non-existent-upload-reference"} - _, err := fs.Upload(ctx, uploadRef, ioutil.NopCloser(bytes.NewReader(fileContent)), nil) + _, err := fs.Upload(ctx, uploadRef, io.NopCloser(bytes.NewReader(fileContent)), nil) Expect(err).To(HaveOccurred()) diff --git a/pkg/storage/utils/indexer/index/autoincrement_test.go b/pkg/storage/utils/indexer/index/autoincrement_test.go index bfd55009ed..3af04af6a4 100644 --- a/pkg/storage/utils/indexer/index/autoincrement_test.go +++ b/pkg/storage/utils/indexer/index/autoincrement_test.go @@ -19,7 +19,6 @@ package index_test import ( - "io/ioutil" "os" "path/filepath" "testing" @@ -226,7 +225,7 @@ func BenchmarkAdd(b *testing.B) { } func createTmpDirStr() (string, error) { - name, err := ioutil.TempDir("/tmp", "testfiles-*") + name, err := os.MkdirTemp("/tmp", "testfiles-*") if err != nil { return "", err } diff --git a/pkg/storage/utils/indexer/index/non_unique.go b/pkg/storage/utils/indexer/index/non_unique.go index 71c5019e3c..e39730a282 100644 --- a/pkg/storage/utils/indexer/index/non_unique.go +++ b/pkg/storage/utils/indexer/index/non_unique.go @@ -50,7 +50,7 @@ type NonUnique struct { // │ ├── goefe-789 -> /tmp/testfiles-395764020/pets/goefe-789 // │ └── xadaf-189 -> /tmp/testfiles-395764020/pets/xadaf-189 // └── White/ -// └── wefwe-456 -> /tmp/testfiles-395764020/pets/wefwe-456 +// | └── wefwe-456 -> /tmp/testfiles-395764020/pets/wefwe-456 func NewNonUniqueIndexWithOptions(storage metadata.Storage, o ...option.Option) Index { opts := &option.Options{} for _, opt := range o { diff --git a/pkg/storage/utils/indexer/test/data.go b/pkg/storage/utils/indexer/test/data.go index 94e51fc5d2..901175b345 100644 --- a/pkg/storage/utils/indexer/test/data.go +++ b/pkg/storage/utils/indexer/test/data.go @@ -20,7 +20,6 @@ package test import ( "encoding/json" - "io/ioutil" "os" "path" ) @@ -111,7 +110,7 @@ func writeData(m map[string][]interface{}, privateKey string, rootDir string) er } pkVal := ValueOf(u, privateKey) - if err := ioutil.WriteFile(path.Join(fileTypePath, pkVal), data, 0600); err != nil { + if err := os.WriteFile(path.Join(fileTypePath, pkVal), data, 0600); err != nil { return err } } diff --git a/pkg/storage/utils/indexer/test/helpers.go b/pkg/storage/utils/indexer/test/helpers.go index b7d9f97f90..9ba5d45aaa 100644 --- a/pkg/storage/utils/indexer/test/helpers.go +++ b/pkg/storage/utils/indexer/test/helpers.go @@ -20,7 +20,7 @@ package test import ( "errors" - "io/ioutil" + "os" "path" "reflect" "strings" @@ -28,7 +28,7 @@ import ( // CreateTmpDir creates a temporary dir for tests data. func CreateTmpDir() (string, error) { - name, err := ioutil.TempDir("/tmp", "testfiles-") + name, err := os.MkdirTemp("/tmp", "testfiles-") if err != nil { return "", err } diff --git a/pkg/storage/utils/localfs/localfs.go b/pkg/storage/utils/localfs/localfs.go index 0e6230e60b..07bfcebb36 100644 --- a/pkg/storage/utils/localfs/localfs.go +++ b/pkg/storage/utils/localfs/localfs.go @@ -23,7 +23,6 @@ import ( "database/sql" "fmt" "io" - "io/ioutil" "net/url" "os" "path" @@ -997,7 +996,7 @@ func (fs *localfs) listFolder(ctx context.Context, fn string, mdKeys []string) ( fn = fs.wrap(ctx, fn) - mds, err := ioutil.ReadDir(fn) + mds, err := os.ReadDir(fn) if err != nil { if os.IsNotExist(err) { return nil, errtypes.NotFound(fn) @@ -1007,7 +1006,8 @@ func (fs *localfs) listFolder(ctx context.Context, fn string, mdKeys []string) ( finfos := []*provider.ResourceInfo{} for _, md := range mds { - info, err := fs.normalize(ctx, md, path.Join(fn, md.Name()), mdKeys) + mdInfo, _ := md.Info() + info, err := fs.normalize(ctx, mdInfo, path.Join(fn, md.Name()), mdKeys) if err == nil { finfos = append(finfos, info) } @@ -1019,7 +1019,7 @@ func (fs *localfs) listShareFolderRoot(ctx context.Context, home string, mdKeys fn := fs.wrapReferences(ctx, home) - mds, err := ioutil.ReadDir(fn) + mds, err := os.ReadDir(fn) if err != nil { if os.IsNotExist(err) { return nil, errtypes.NotFound(fn) @@ -1032,9 +1032,11 @@ func (fs *localfs) listShareFolderRoot(ctx context.Context, home string, mdKeys var info *provider.ResourceInfo var err error if fs.isShareFolderRoot(ctx, path.Join("/", md.Name())) { - info, err = fs.normalize(ctx, md, path.Join(fn, md.Name()), mdKeys) + mdInfo, _ := md.Info() + info, err = fs.normalize(ctx, mdInfo, path.Join(fn, md.Name()), mdKeys) } else { - info, err = fs.convertToFileReference(ctx, md, path.Join(fn, md.Name()), mdKeys) + mdInfo, _ := md.Info() + info, err = fs.convertToFileReference(ctx, mdInfo, path.Join(fn, md.Name()), mdKeys) } if err == nil { finfos = append(finfos, info) @@ -1091,7 +1093,7 @@ func (fs *localfs) ListRevisions(ctx context.Context, ref *provider.Reference) ( versionsDir := fs.wrapVersions(ctx, np) revisions := []*provider.FileVersion{} - mds, err := ioutil.ReadDir(versionsDir) + mds, err := os.ReadDir(versionsDir) if err != nil { return nil, errors.Wrap(err, "localfs: error reading"+versionsDir) } @@ -1104,11 +1106,12 @@ func (fs *localfs) ListRevisions(ctx context.Context, ref *provider.Reference) ( if err != nil { continue } + mdsInfo, _ := mds[i].Info() revisions = append(revisions, &provider.FileVersion{ Key: version, - Size: uint64(mds[i].Size()), + Size: uint64(mdsInfo.Size()), Mtime: uint64(mtime), - Etag: calcEtag(ctx, mds[i]), + Etag: calcEtag(ctx, mdsInfo), }) } return revisions, nil @@ -1230,13 +1233,14 @@ func (fs *localfs) ListRecycle(ctx context.Context, ref *provider.Reference, key rp := fs.wrapRecycleBin(ctx, "/") - mds, err := ioutil.ReadDir(rp) + mds, err := os.ReadDir(rp) if err != nil { return nil, errors.Wrap(err, "localfs: error listing deleted files") } items := []*provider.RecycleItem{} for i := range mds { - ri := fs.convertToRecycleItem(ctx, rp, mds[i]) + mdsInfo, _ := mds[i].Info() + ri := fs.convertToRecycleItem(ctx, rp, mdsInfo) if ri != nil { items = append(items, ri) } diff --git a/pkg/storage/utils/localfs/upload.go b/pkg/storage/utils/localfs/upload.go index f0b627d8af..a12615294c 100644 --- a/pkg/storage/utils/localfs/upload.go +++ b/pkg/storage/utils/localfs/upload.go @@ -22,7 +22,6 @@ import ( "context" "encoding/json" "io" - "io/ioutil" "os" "path/filepath" @@ -239,7 +238,7 @@ func (fs *localfs) GetUpload(ctx context.Context, id string) (tusd.Upload, error } infoPath := binPath + ".info" info := tusd.FileInfo{} - data, err := ioutil.ReadFile(infoPath) + data, err := os.ReadFile(infoPath) if err != nil { if os.IsNotExist(err) { // Interpret os.ErrNotExist as 404 Not Found @@ -333,7 +332,7 @@ func (upload *fileUpload) writeInfo() error { if err != nil { return err } - return ioutil.WriteFile(upload.infoPath, data, defaultFilePerm) + return os.WriteFile(upload.infoPath, data, defaultFilePerm) } // FinishUpload finishes an upload and moves the file to the internal destination diff --git a/pkg/storage/utils/metadata/cs3.go b/pkg/storage/utils/metadata/cs3.go index 45f1401bb2..76cff96d12 100644 --- a/pkg/storage/utils/metadata/cs3.go +++ b/pkg/storage/utils/metadata/cs3.go @@ -22,7 +22,7 @@ import ( "bytes" "context" "errors" - "io/ioutil" + "io" "net/http" "os" "time" @@ -263,7 +263,7 @@ func (cs3 *CS3) SimpleDownload(ctx context.Context, downloadpath string) (conten return []byte{}, errtypes.NotFound(dreq.Ref.Path) } - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) if err != nil { return []byte{}, err } diff --git a/pkg/storage/utils/metadata/disk.go b/pkg/storage/utils/metadata/disk.go index 00774bb796..2e78d7240f 100644 --- a/pkg/storage/utils/metadata/disk.go +++ b/pkg/storage/utils/metadata/disk.go @@ -23,7 +23,6 @@ import ( "errors" "fmt" "io/fs" - "io/ioutil" "os" "path/filepath" "time" @@ -131,7 +130,7 @@ func (disk *Disk) Delete(_ context.Context, path string) error { // ReadDir returns the resource infos in a given directory func (disk *Disk) ReadDir(_ context.Context, p string) ([]string, error) { - infos, err := ioutil.ReadDir(disk.targetPath(p)) + infos, err := os.ReadDir(disk.targetPath(p)) if err != nil { if _, ok := err.(*fs.PathError); ok { return []string{}, nil @@ -148,7 +147,7 @@ func (disk *Disk) ReadDir(_ context.Context, p string) ([]string, error) { // ListDir returns a list of ResourceInfos for the entries in a given directory func (disk *Disk) ListDir(ctx context.Context, path string) ([]*provider.ResourceInfo, error) { - infos, err := ioutil.ReadDir(disk.targetPath(path)) + diskEntries, err := os.ReadDir(disk.targetPath(path)) if err != nil { if _, ok := err.(*fs.PathError); ok { return []*provider.ResourceInfo{}, nil @@ -156,8 +155,13 @@ func (disk *Disk) ListDir(ctx context.Context, path string) ([]*provider.Resourc return nil, err } - entries := make([]*provider.ResourceInfo, 0, len(infos)) - for _, info := range infos { + entries := make([]*provider.ResourceInfo, 0, len(diskEntries)) + for _, diskEntry := range diskEntries { + info, err := diskEntry.Info() + if err != nil { + continue + } + entry := &provider.ResourceInfo{ Type: provider.ResourceType_RESOURCE_TYPE_FILE, Path: "./" + info.Name(), diff --git a/pkg/test/vars.go b/pkg/test/vars.go index ec56b7948b..ba3799d0ac 100644 --- a/pkg/test/vars.go +++ b/pkg/test/vars.go @@ -21,7 +21,6 @@ package test import ( "bytes" "errors" - "io/ioutil" "os" "path" ) @@ -47,7 +46,7 @@ type CleanerFunc func() // TmpDir creates a dir in the system temp folder that has // TmpDirPattern as prefix func TmpDir() (string, CleanerFunc, error) { - name, err := ioutil.TempDir("", TmpDirPattern) + name, err := os.MkdirTemp("", TmpDirPattern) if err != nil { return "", nil, err } diff --git a/pkg/user/manager/json/json.go b/pkg/user/manager/json/json.go index cd4d49ec89..d4c9f8d2d3 100644 --- a/pkg/user/manager/json/json.go +++ b/pkg/user/manager/json/json.go @@ -21,7 +21,7 @@ package json import ( "context" "encoding/json" - "io/ioutil" + "os" "strconv" "strings" @@ -79,7 +79,7 @@ func (m *manager) Configure(ml map[string]interface{}) error { return err } - f, err := ioutil.ReadFile(c.Users) + f, err := os.ReadFile(c.Users) if err != nil { return err } diff --git a/pkg/user/manager/json/json_test.go b/pkg/user/manager/json/json_test.go index a422bb051b..66174630e5 100644 --- a/pkg/user/manager/json/json_test.go +++ b/pkg/user/manager/json/json_test.go @@ -20,7 +20,6 @@ package json import ( "context" - "io/ioutil" "os" "reflect" "testing" @@ -33,7 +32,7 @@ var ctx = context.Background() func TestUserManager(t *testing.T) { // add tempdir - tempdir, err := ioutil.TempDir("", "json_test") + tempdir, err := os.MkdirTemp("", "json_test") if err != nil { t.Fatalf("error while create temp dir: %v", err) } @@ -43,7 +42,7 @@ func TestUserManager(t *testing.T) { userJSON := `[{` // get file handler for temporary file - file, err := ioutil.TempFile(tempdir, "json_test") + file, err := os.CreateTemp(tempdir, "json_test") if err != nil { t.Fatalf("error while open temp file: %v", err) } @@ -70,7 +69,7 @@ func TestUserManager(t *testing.T) { userJSON = `[{"id":{"idp":"localhost","opaque_id":"einstein","type":1},"username":"einstein","mail":"einstein@example.org","display_name":"Albert Einstein","groups":["sailing-lovers","violin-haters","physics-lovers"]}]` // get file handler for temporary file - file, err = ioutil.TempFile(tempdir, "json_test") + file, err = os.CreateTemp(tempdir, "json_test") if err != nil { t.Fatalf("error while open temp file: %v", err) } diff --git a/pkg/user/manager/owncloudsql/accounts/accounts_test.go b/pkg/user/manager/owncloudsql/accounts/accounts_test.go index 4175e1fc8b..ff420d9ed6 100644 --- a/pkg/user/manager/owncloudsql/accounts/accounts_test.go +++ b/pkg/user/manager/owncloudsql/accounts/accounts_test.go @@ -21,7 +21,6 @@ package accounts_test import ( "context" "database/sql" - "io/ioutil" "os" _ "github.com/mattn/go-sqlite3" @@ -41,10 +40,10 @@ var _ = Describe("Accounts", func() { BeforeEach(func() { var err error - testDbFile, err = ioutil.TempFile("", "example") + testDbFile, err = os.CreateTemp("", "example") Expect(err).ToNot(HaveOccurred()) - dbData, err := ioutil.ReadFile("test.sqlite") + dbData, err := os.ReadFile("test.sqlite") Expect(err).ToNot(HaveOccurred()) _, err = testDbFile.Write(dbData) diff --git a/pkg/utils/ldap.go b/pkg/utils/ldap.go index 1bf6e239d3..0f769e2e88 100644 --- a/pkg/utils/ldap.go +++ b/pkg/utils/ldap.go @@ -21,7 +21,7 @@ package utils import ( "crypto/tls" "crypto/x509" - "io/ioutil" + "os" "github.com/cs3org/reva/v2/pkg/logger" ldapReconnect "github.com/cs3org/reva/v2/pkg/utils/ldap" @@ -52,7 +52,7 @@ func GetLDAPClientWithReconnect(c *LDAPConn) (ldap.Client, error) { } } if !c.Insecure && c.CACert != "" { - if pemBytes, err := ioutil.ReadFile(c.CACert); err == nil { + if pemBytes, err := os.ReadFile(c.CACert); err == nil { rpool, _ := x509.SystemCertPool() rpool.AppendCertsFromPEM(pemBytes) tlsConf = &tls.Config{ @@ -87,7 +87,7 @@ func GetLDAPClientForAuth(c *LDAPConn) (ldap.Client, error) { } } if !c.Insecure && c.CACert != "" { - if pemBytes, err := ioutil.ReadFile(c.CACert); err == nil { + if pemBytes, err := os.ReadFile(c.CACert); err == nil { rpool, _ := x509.SystemCertPool() rpool.AppendCertsFromPEM(pemBytes) tlsConf = &tls.Config{ diff --git a/tests/helpers/helpers.go b/tests/helpers/helpers.go index 2b657da6e2..7b13cbe0a6 100644 --- a/tests/helpers/helpers.go +++ b/tests/helpers/helpers.go @@ -22,7 +22,7 @@ import ( "bytes" "context" "errors" - "io/ioutil" + "io" "os" "path/filepath" "runtime" @@ -43,7 +43,7 @@ func TempDir(name string) (string, error) { if err != nil { return "nil", err } - tmpRoot, err := ioutil.TempDir(tmpDir, "reva-unit-tests-*-root") + tmpRoot, err := os.MkdirTemp(tmpDir, "reva-unit-tests-*-root") if err != nil { return "nil", err } @@ -62,6 +62,6 @@ func Upload(ctx context.Context, fs storage.FS, ref *provider.Reference, content return errors.New("simple upload method not available") } uploadRef := &provider.Reference{Path: "/" + uploadID} - _, err = fs.Upload(ctx, uploadRef, ioutil.NopCloser(bytes.NewReader(content)), nil) + _, err = fs.Upload(ctx, uploadRef, io.NopCloser(bytes.NewReader(content)), nil) return err } diff --git a/tests/integration/grpc/grpc_suite_test.go b/tests/integration/grpc/grpc_suite_test.go index b9bbc7fe9a..5363a4fede 100644 --- a/tests/integration/grpc/grpc_suite_test.go +++ b/tests/integration/grpc/grpc_suite_test.go @@ -20,7 +20,6 @@ package grpc_test import ( "fmt" - "io/ioutil" "net" "os" "os/exec" @@ -65,15 +64,15 @@ type Revad struct { // Placeholders in the config files can be replaced the variables from the // `variables` map, e.g. the config // -// redis = "{{redis_address}}" +// redis = "{{redis_address}}" // // and the variables map // -// variables = map[string]string{"redis_address": "localhost:6379"} +// variables = map[string]string{"redis_address": "localhost:6379"} // // will result in the config // -// redis = "localhost:6379" +// redis = "localhost:6379" // // Special variables are created for the revad addresses, e.g. having a // `storage` and a `users` revad will make `storage_address` and @@ -101,12 +100,12 @@ func startRevads(configs map[string]string, variables map[string]string) (map[st ownID := ids[name] // Create a temporary root for this revad - tmpRoot, err := ioutil.TempDir("", "reva-grpc-integration-tests-"+name+"-*-root") + tmpRoot, err := os.MkdirTemp("", "reva-grpc-integration-tests-"+name+"-*-root") if err != nil { return nil, errors.Wrapf(err, "Could not create tmpdir") } newCfgPath := path.Join(tmpRoot, "config.toml") - rawCfg, err := ioutil.ReadFile(path.Join("fixtures", config)) + rawCfg, err := os.ReadFile(path.Join("fixtures", config)) if err != nil { return nil, errors.Wrapf(err, "Could not read config file") } @@ -125,7 +124,7 @@ func startRevads(configs map[string]string, variables map[string]string) (map[st for name, id := range ids { cfg = strings.ReplaceAll(cfg, "{{"+name+"_id}}", id) } - err = ioutil.WriteFile(newCfgPath, []byte(cfg), 0600) + err = os.WriteFile(newCfgPath, []byte(cfg), 0600) if err != nil { return nil, errors.Wrapf(err, "Could not write config file") } diff --git a/tools/check-license/check-license.go b/tools/check-license/check-license.go index 9520bbc7f3..cfd0fb3c8a 100644 --- a/tools/check-license/check-license.go +++ b/tools/check-license/check-license.go @@ -22,7 +22,6 @@ import ( "bytes" "flag" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -78,7 +77,7 @@ func main() { return nil } - src, err := ioutil.ReadFile(path) + src, err := os.ReadFile(path) if err != nil { return nil } @@ -88,7 +87,7 @@ func main() { err := fmt.Errorf("%v: license header not present or not at the top, to fix run: go run tools/check-license/check-license.go -fix", path) if *fix { newSrc := licenseText + string(src) - if err := ioutil.WriteFile(path, []byte(newSrc), 0644); err != nil { + if err := os.WriteFile(path, []byte(newSrc), 0644); err != nil { fmt.Println(err) os.Exit(1) } diff --git a/tools/create-artifacts/main.go b/tools/create-artifacts/main.go index 420207b80e..3abc1c980d 100644 --- a/tools/create-artifacts/main.go +++ b/tools/create-artifacts/main.go @@ -25,7 +25,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -122,7 +121,7 @@ func hashFile(file string) { } f.Close() val := hex.EncodeToString(hasher.Sum(nil)) - if err := ioutil.WriteFile(file+".sha256", []byte(val), 0644); err != nil { + if err := os.WriteFile(file+".sha256", []byte(val), 0644); err != nil { log.Fatal(err) } } diff --git a/tools/prepare-release/main.go b/tools/prepare-release/main.go index 051909b04b..fa902a4b0c 100644 --- a/tools/prepare-release/main.go +++ b/tools/prepare-release/main.go @@ -23,7 +23,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "os" "os/exec" "path" @@ -81,18 +80,18 @@ func main() { run(cmd) // add new VERSION and BUILD_DATE - if err := ioutil.WriteFile("VERSION", []byte(*version), 0644); err != nil { + if err := os.WriteFile("VERSION", []byte(*version), 0644); err != nil { fmt.Fprintf(os.Stderr, "error writing to VERSION file: %s", err) os.Exit(1) } // add new VERSION and RELEASE_DATE - if err := ioutil.WriteFile("RELEASE_DATE", []byte(date), 0644); err != nil { + if err := os.WriteFile("RELEASE_DATE", []byte(date), 0644); err != nil { fmt.Fprintf(os.Stderr, "error writing to RELEASE_DATE file: %s", err) os.Exit(1) } - tmp, err := ioutil.TempDir("", "reva-changelog") + tmp, err := os.MkdirTemp("", "reva-changelog") if err != nil { fmt.Fprintf(os.Stderr, "error creating tmp directory to store changelog: %s", err) os.Exit(1) @@ -120,7 +119,7 @@ func main() { } os.RemoveAll(tmp) - data, err := ioutil.ReadFile("changelog/NOTE.md") + data, err := os.ReadFile("changelog/NOTE.md") if err != nil { fmt.Fprintf(os.Stderr, "error reading NOTE.md: %s", err) os.Exit(1) @@ -138,7 +137,7 @@ description: > `, *version, *version, *version, date) releaseDocs += string(data) - if err := ioutil.WriteFile(fmt.Sprintf("docs/content/en/docs/changelog/%s/_index.md", *version), []byte(releaseDocs), 0644); err != nil { + if err := os.WriteFile(fmt.Sprintf("docs/content/en/docs/changelog/%s/_index.md", *version), []byte(releaseDocs), 0644); err != nil { fmt.Fprintf(os.Stderr, "error writing docs release file _index.md: %s", err) os.Exit(1) }