[full-ci] Store settings via metadata

.drone.env

@@ -1,7 +1,7 @@
 # The test runner source for API tests
-CORE_COMMITID=4512f46e7196a8c1f1cfc56ec397628cbf540407
+CORE_COMMITID=a293d131eb9475542c72e048ddd44b8b6cbe2c01
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=b240ba9117e998edc0cd7d1d5586ba19591e1511
+WEB_COMMITID=bb612cfc1c63316a159c7e29b81438595cef8fdb
 WEB_BRANCH=master

accounts/pkg/config/defaultconfig.go

@@ -59,10 +59,10 @@ func DefaultConfig() *Config {
  },
  },
  ServiceUser: ServiceUser{
- UUID:  "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
- Username: "",
- UID:  0,
- GID:  0,
+ UUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
+ // Username: "service user",
+ UID: 0,
+ GID: 0,
  },
  }
 }

changelog/unreleased/store-settings-in-metadata-service.md

@@ -0,0 +1,5 @@
+Change: settings service now stores its data via metadata service
+
+Instead of writing files to disk it will use metadata service to do so
+
+https://github.com/owncloud/ocis/pull/3232

go.mod

@@ -22,7 +22,7 @@ require (
  github.com/blevesearch/bleve/v2 v2.3.1
  github.com/coreos/go-oidc/v3 v3.1.0
  github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19
- github.com/cs3org/reva/v2 v2.0.0-20220304131900-b8be80d1ba81
+ github.com/cs3org/reva/v2 v2.0.0-20220308091509-e4509f177c98
  github.com/disintegration/imaging v1.6.2
  github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
  github.com/go-chi/chi/v5 v5.0.7
@@ -41,24 +41,25 @@ require (
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.8.0
  github.com/iancoleman/strcase v0.2.0
  github.com/justinas/alice v1.2.0
- github.com/libregraph/idm v0.3.1-0.20220222123017-f9d520ac1f11
+ github.com/libregraph/idm v0.3.1-0.20220309072604-7a05922a056f
  github.com/libregraph/lico v0.53.1
  github.com/mennanov/fieldmask-utils v0.5.0
  github.com/mitchellh/mapstructure v1.4.3
  github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
- github.com/nats-io/nats-streaming-server v0.24.2
+ github.com/nats-io/nats-server/v2 v2.7.4
+ github.com/nats-io/nats-streaming-server v0.24.3
  github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484
  github.com/nmcclain/ldap v0.0.0-20210720162743-7f8d1e44eeba
  github.com/oklog/run v1.1.0
  github.com/olekukonko/tablewriter v0.0.5
  github.com/onsi/ginkgo v1.16.5
  github.com/onsi/gomega v1.18.1
- github.com/owncloud/libre-graph-api-go v0.11.0
+ github.com/owncloud/libre-graph-api-go v0.12.0
  github.com/pkg/errors v0.9.1
  github.com/prometheus/client_golang v1.12.1
  github.com/rs/zerolog v1.26.1
  github.com/sirupsen/logrus v1.8.1
- github.com/spf13/cobra v1.3.0
+ github.com/spf13/cobra v1.4.0
  github.com/stretchr/testify v1.7.0
  github.com/thejerf/suture/v4 v4.0.2
  github.com/urfave/cli/v2 v2.3.0
@@ -69,12 +70,12 @@ require (
  go.opentelemetry.io/otel/exporters/jaeger v1.4.1
  go.opentelemetry.io/otel/sdk v1.4.1
  go.opentelemetry.io/otel/trace v1.4.1
- golang.org/x/crypto v0.0.0-20220214200702-86341886e292
+ golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70
  golang.org/x/image v0.0.0-20211028202545-6944b10bf410
  golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
  golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
  google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a
- google.golang.org/grpc v1.44.0
+ google.golang.org/grpc v1.45.0
  google.golang.org/protobuf v1.27.1
  gopkg.in/yaml.v2 v2.4.0
  gotest.tools/v3 v3.1.0
@@ -170,7 +171,7 @@ require (
  github.com/hashicorp/go-plugin v1.4.3 // indirect
  github.com/hashicorp/go-rootcerts v1.0.2 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
- github.com/hashicorp/raft v1.3.5 // indirect
+ github.com/hashicorp/raft v1.3.6 // indirect
  github.com/hashicorp/serf v0.9.6 // indirect
  github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
  github.com/huandu/xstrings v1.3.2 // indirect
@@ -208,8 +209,7 @@ require (
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/mschoch/smat v0.2.0 // indirect
  github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296 // indirect
- github.com/nats-io/nats-server/v2 v2.7.3 // indirect
- github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d // indirect
+ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d // indirect
  github.com/nats-io/nkeys v0.3.0 // indirect
  github.com/nats-io/nuid v1.0.1 // indirect
  github.com/nats-io/stan.go v0.10.2 // indirect
@@ -258,7 +258,7 @@ require (
  go.uber.org/zap v1.19.1 // indirect
  golang.org/x/mod v0.5.1 // indirect
  golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
- golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 // indirect
+ golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 // indirect
  golang.org/x/text v0.3.7 // indirect
  golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
  golang.org/x/tools v0.1.8 // indirect

go.sum

@@ -342,8 +342,8 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S
 github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4=
 github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 h1:1jqPH58jCxvbaJ9WLIJ7W2/m622bWS6ChptzljSG6IQ=
 github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.0.0-20220304131900-b8be80d1ba81 h1:g6c1HYGTSpDnf6uNPXYIOySVk0P545zWUPmdPWEcMps=
-github.com/cs3org/reva/v2 v2.0.0-20220304131900-b8be80d1ba81/go.mod h1:XNtK1HEClNzmz5vyQa2DUw4KH3oqBjQoEsV1LhAGlV0=
+github.com/cs3org/reva/v2 v2.0.0-20220308091509-e4509f177c98 h1:yttz8BjGwdmI/sd81Xretzpss/wXnnmCsdJWDOiZfWs=
+github.com/cs3org/reva/v2 v2.0.0-20220308091509-e4509f177c98/go.mod h1:XNtK1HEClNzmz5vyQa2DUw4KH3oqBjQoEsV1LhAGlV0=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
@@ -826,8 +826,8 @@ github.com/hashicorp/memberlist v0.3.0 h1:8+567mCcFDnS5ADl7lrpxPMWiFCElyUEeW0gtj
 github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/raft v1.3.1/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
 github.com/hashicorp/raft v1.3.3/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
-github.com/hashicorp/raft v1.3.5 h1:93YBXmHWW2MuyMZfMxN1PsAnPXAt+hBfG0S0ZrZxRrY=
-github.com/hashicorp/raft v1.3.5/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
+github.com/hashicorp/raft v1.3.6 h1:v5xW5KzByoerQlN/o31VJrFNiozgzGyDoMgDJgXpsto=
+github.com/hashicorp/raft v1.3.6/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/serf v0.9.6 h1:uuEX1kLR6aoda1TBttmJQKDLZE1Ob7KN0NPdE7EtCDc=
@@ -939,8 +939,8 @@ github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libregraph/idm v0.3.1-0.20220222123017-f9d520ac1f11 h1:ReFrghRLQhQdt5BW7HXtEzySmsgUCXL1U36gnmka73U=
-github.com/libregraph/idm v0.3.1-0.20220222123017-f9d520ac1f11/go.mod h1:wB8ApGAQsXDXXGWEeFimK/3q8Z/jRa+m3nqnvoYjBsQ=
+github.com/libregraph/idm v0.3.1-0.20220309072604-7a05922a056f h1:FKa0JYnkhto9Z4UsQHdEM/bxRklqiICaOHhGN+s9cnI=
+github.com/libregraph/idm v0.3.1-0.20220309072604-7a05922a056f/go.mod h1:wB8ApGAQsXDXXGWEeFimK/3q8Z/jRa+m3nqnvoYjBsQ=
 github.com/libregraph/lico v0.53.1 h1:c5JYFg0mrIgk6Ktj77rNJ2K8X01hs28JJ9Vw1N1iMAk=
 github.com/libregraph/lico v0.53.1/go.mod h1:EXf6Y9s9TygW6unSXosBpVXWUURoN2sPX0053o4zVfQ=
 github.com/linode/linodego v0.25.3/go.mod h1:GSBKPpjoQfxEfryoCRcgkuUOCuVtGHWhzI8OMdycNTE=
@@ -1090,18 +1090,19 @@ github.com/nats-io/nats-server/v2 v2.1.9/go.mod h1:9qVyoewoYXzG1ME9ox0HwkkzyYvnl
 github.com/nats-io/nats-server/v2 v2.6.2/go.mod h1:CNi6dJQ5H+vWqaoWKjCGtqBt7ai/xOTLiocUqhK6ews=
 github.com/nats-io/nats-server/v2 v2.6.4/go.mod h1:LlMieumxNUnCloOTVFv7Wog0YnasScxARUMXVXv9/+M=
 github.com/nats-io/nats-server/v2 v2.7.2/go.mod h1:tckmrt0M6bVaDT3kmh9UrIq/CBOBBse+TpXQi5ldaa8=
-github.com/nats-io/nats-server/v2 v2.7.3 h1:P0NgsnbTxrPMMPZ1/rLXWjS5bbPpRMCcPwlMd4nBDK4=
-github.com/nats-io/nats-server/v2 v2.7.3/go.mod h1:eJUrA5gm0ch6sJTEv85xmXIgQWsB0OyjkTsKXvlHbYc=
+github.com/nats-io/nats-server/v2 v2.7.4 h1:c+BZJ3rGzUKCBIM4IXO8uNT2u1vajGbD1kPA6wqCEaM=
+github.com/nats-io/nats-server/v2 v2.7.4/go.mod h1:1vZ2Nijh8tcyNe8BDVyTviCd9NYzRbubQYiEHsvOQWc=
 github.com/nats-io/nats-streaming-server v0.23.0/go.mod h1:1asNNRpUKbgwoPqRLEWbJE65uqmWjG1YN/Xlo3WgkTY=
 github.com/nats-io/nats-streaming-server v0.24.1/go.mod h1:N2Q05hKD+aW2Ur1VYP85yUR2zUWHbqJG88CxAFLRrd4=
-github.com/nats-io/nats-streaming-server v0.24.2 h1:beQTSDcAm2Pe1uUZm2P3gVo/xbcgeZmnb5x3x/bMXRk=
-github.com/nats-io/nats-streaming-server v0.24.2/go.mod h1:pFJ379pPvxtpnO5dtfypdbJUrjHp08LYqy+qNCFFAbw=
+github.com/nats-io/nats-streaming-server v0.24.3 h1:uZez8jBkXscua++jaDsK7DhpSAkizdetar6yWbPMRco=
+github.com/nats-io/nats-streaming-server v0.24.3/go.mod h1:rqWfyCbxlhKj//fAp8POdQzeADwqkVhZcoWlbhkuU5w=
 github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE=
 github.com/nats-io/nats.go v1.11.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nats.go v1.13.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nats.go v1.13.1-0.20211018182449-f2416a8b1483/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
-github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d h1:GRSmEJutHkdoxKsRypP575IIdoXe7Bm6yHQF6GcDBnA=
 github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
+github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d h1:zJf4l8Kp67RIZhoVeniSLZs69SHNgjLHz0aNsqPPlx8=
+github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
@@ -1162,8 +1163,8 @@ github.com/orcaman/concurrent-map v0.0.0-20210501183033-44dafcb38ecc/go.mod h1:L
 github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
 github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
-github.com/owncloud/libre-graph-api-go v0.11.0 h1:E260P0EJQvtdkUHYk/l2GeKoDxcbsazAqY9MnAQxUt8=
-github.com/owncloud/libre-graph-api-go v0.11.0/go.mod h1:579sFrPP7aP24LZXGPopLfvE+hAka/2DYHk0+Ij+w+U=
+github.com/owncloud/libre-graph-api-go v0.12.0 h1:2EzBEzs2r5wP3PYss2woNhTl/0/NZfMOzFe/bvtdsEU=
+github.com/owncloud/libre-graph-api-go v0.12.0/go.mod h1:579sFrPP7aP24LZXGPopLfvE+hAka/2DYHk0+Ij+w+U=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -1345,8 +1346,9 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
-github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
 github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
+github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
+github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -1570,8 +1572,8 @@ golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 h1:syTAU9FwmvzEoIYMqcPHOcVm4H3U5u90WsvuYgwpETU=
+golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1842,8 +1844,8 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 h1:BXxu8t6QN0G1uff4bzZzSkpsax8+ALqTGUtz08QrV00=
-golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 h1:8IVLkfbr2cLhv0a/vKq4UFUcJym8RmDoDboxCFWEjYE=
+golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 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=
@@ -2112,8 +2114,9 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
 google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
 google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg=
 google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/examples v0.0.0-20210902184326-c93e472777b9/go.mod h1:gID3PKrg7pWKntu9Ss6zTLJ0ttC0X9IHgREOCZwbCVU=
 google.golang.org/grpc/examples v0.0.0-20211102180624-670c133e568e h1:m7aQHHqd0q89mRwhwS9Bx2rjyl/hsFAeta+uGrHsQaU=

ocis-pkg/roles/manager.go

@@ -46,6 +46,7 @@ func (m *Manager) List(ctx context.Context, roleIDs []string) []*settingsmsg.Bun
  res, err := m.roleService.ListRoles(ctx, request)
  if err != nil {
  m.logger.Debug().Err(err).Msg("failed to fetch roles by roleIDs")
+ return nil
  }
  for _, role := range res.Bundles {
  m.cache.set(role.Id, role)

settings/pkg/config/config.go

@@ -19,7 +19,10 @@ type Config struct {
  HTTP HTTP `ocisConfig:"http"`
  GRPC GRPC `ocisConfig:"grpc"`
 
- DataPath string `ocisConfig:"data_path" env:"SETTINGS_DATA_PATH"`
+ StoreType string `ocisConfig:"store_type" env:"SETTINGS_STORE_TYPE"`
+ DataPath string `ocisConfig:"data_path" env:"SETTINGS_DATA_PATH"`
+ Metadata Metadata `ocisConfig:"metadata_config"`
+
  Asset Asset `ocisConfig:"asset"`
  TokenManager TokenManager `ocisConfig:"token_manager"`
 
@@ -30,3 +33,13 @@ type Config struct {
 type Asset struct {
  Path string `ocisConfig:"path" env:"SETTINGS_ASSET_PATH"`
 }
+
+// Metadata configures the metadata store to use
+type Metadata struct {
+ GatewayAddress string `ocisConfig:"gateway_addr" env:"STORAGE_GATEWAY_GRPC_ADDR"`
+ StorageAddress string `ocisConfig:"storage_addr" env:"STORAGE_GRPC_ADDR"`
+
+ ServiceUserID string `ocisConfig:"service_user_id" env:"METADATA_SERVICE_USER_UUID"`
+ ServiceUserIDP string `ocisConfig:"service_user_idp" env:"METADATA_SERVICE_USER_IDP"`
+ MachineAuthAPIKey string `ocisConfig:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY"`
+}

settings/pkg/config/defaultconfig.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+ "os"
  "path"
 
  "github.com/owncloud/ocis/ocis-pkg/config/defaults"
@@ -33,12 +34,21 @@ func DefaultConfig() *Config {
  Addr: "127.0.0.1:9191",
  Namespace: "com.owncloud.api",
  },
- DataPath: path.Join(defaults.BaseDataPath(), "settings"),
+ StoreType: "metadata", // use metadata or filesystem
+ DataPath: path.Join(defaults.BaseDataPath(), "settings"),
  Asset: Asset{
  Path: "",
  },
  TokenManager: TokenManager{
  JWTSecret: "Pive-Fumkiu4",
  },
+
+ Metadata: Metadata{
+ GatewayAddress: "127.0.0.1:9142",
+ StorageAddress: "127.0.0.1:9215",
+ ServiceUserID: "ddc2004c-0977-11eb-9d3f-a793888cd0f8",
+ ServiceUserIDP: os.Getenv("OCIS_URL"),
+ MachineAuthAPIKey: "change-me-please",
+ },
  }
 }

settings/pkg/service/v0/service.go

@@ -15,7 +15,8 @@ import (
  settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
  "github.com/owncloud/ocis/settings/pkg/config"
  "github.com/owncloud/ocis/settings/pkg/settings"
- store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
+ filestore "github.com/owncloud/ocis/settings/pkg/store/filesystem"
+ metastore "github.com/owncloud/ocis/settings/pkg/store/metadata"
  merrors "go-micro.dev/v4/errors"
  "go-micro.dev/v4/metadata"
  "google.golang.org/protobuf/types/known/emptypb"
@@ -32,12 +33,21 @@ type Service struct {
 // NewService returns a service implementation for Service.
 func NewService(cfg *config.Config, logger log.Logger) Service {
  service := Service{
- id: "ocis-settings",
- config: cfg,
- logger: logger,
- manager: store.New(cfg),
+ id: "ocis-settings",
+ config: cfg,
+ logger: logger,
+ }
+
+ switch cfg.StoreType {
+ default:
+ fallthrough
+ case "metadata":
+ service.manager = metastore.New(cfg)
+ case "filesystem":
+ service.manager = filestore.New(cfg)
+ // TODO: if we want to further support filesystem store it should use default permissions from store/defaults/defaults.go instead using this duplicate
+ service.RegisterDefaultRoles()
  }
- service.RegisterDefaultRoles()
  return service
 }