Skip to content

Commit

Permalink
update mattn/go-sqlite and remove oidcprovider service (cs3org#1860)
Browse files Browse the repository at this point in the history
  • Loading branch information
wkloucek authored and tmourati committed Jul 12, 2021
1 parent 72ca06c commit 65d3bdd
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 2,079 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/update_go-sqlite3_remove_oidcprovider.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Change: remove the oidc provider in order to upgrad mattn/go-sqlite3 to v1.14.7

in order to upgrade mattn/go-sqlite3 to v1.14.7, the odic provider service is removed, which is possible because it is not used anymore

https://github.com/cs3org/reva/pull/1828
https://github.com/owncloud/ocis/pull/2209
14 changes: 12 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/ReneKroon/ttlcache/v2 v2.7.0
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/aws/aws-sdk-go v1.38.68
github.com/bluele/gcache v0.0.2
github.com/c-bata/go-prompt v0.2.5
Expand All @@ -22,7 +23,10 @@ require (
github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59
github.com/gdexlab/go-render v1.0.1
github.com/go-ldap/ldap/v3 v3.3.0
github.com/go-openapi/errors v0.20.0 // indirect
github.com/go-openapi/strfmt v0.19.5 // indirect
github.com/go-sql-driver/mysql v1.6.0
github.com/golang/mock v1.4.4 // indirect
github.com/golang/protobuf v1.5.2
github.com/gomodule/redigo v1.8.5
github.com/google/go-github v17.0.0+incompatible
Expand All @@ -32,13 +36,13 @@ require (
github.com/huandu/xstrings v1.3.0 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/jedib0t/go-pretty v4.3.0+incompatible
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/mattn/go-sqlite3 v1.14.7
github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b
github.com/minio/minio-go/v7 v7.0.12
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/ory/fosite v0.40.2
github.com/pkg/errors v0.9.1
github.com/pkg/xattr v0.4.3
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
Expand All @@ -48,14 +52,20 @@ require (
github.com/sethvargo/go-password v0.2.0
github.com/stretchr/testify v1.7.0
github.com/studio-b12/gowebdav v0.0.0-20200303150724-9380631c29a1
github.com/tidwall/pretty v1.1.0 // indirect
github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2
go.mongodb.org/mongo-driver v1.3.4 // indirect
go.opencensus.io v0.23.0
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210423082822-04245dca01da
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98 // indirect
google.golang.org/grpc v1.39.0
google.golang.org/protobuf v1.27.1
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
gotest.tools v2.2.0+incompatible
)

Expand Down
819 changes: 3 additions & 816 deletions go.sum

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion internal/http/services/loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
_ "github.com/cs3org/reva/internal/http/services/meshdirectory"
_ "github.com/cs3org/reva/internal/http/services/metrics"
_ "github.com/cs3org/reva/internal/http/services/ocmd"
_ "github.com/cs3org/reva/internal/http/services/oidcprovider"
_ "github.com/cs3org/reva/internal/http/services/owncloud/ocdav"
_ "github.com/cs3org/reva/internal/http/services/owncloud/ocs"
_ "github.com/cs3org/reva/internal/http/services/prometheus"
Expand Down
184 changes: 0 additions & 184 deletions internal/http/services/oidcprovider/auth.go

This file was deleted.

Loading

0 comments on commit 65d3bdd

Please sign in to comment.