Merge branch 'master' into StoreSettingsViaMetadata

ocis-pkg/config/config.go

@@ -7,6 +7,7 @@ import (
 	glauth "github.com/owncloud/ocis/glauth/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config"
 	graph "github.com/owncloud/ocis/graph/pkg/config"
+	idm "github.com/owncloud/ocis/idm/pkg/config"
 	idp "github.com/owncloud/ocis/idp/pkg/config"
 	nats "github.com/owncloud/ocis/nats/pkg/config"
 	notifications "github.com/owncloud/ocis/notifications/pkg/config"
@@ -62,6 +63,7 @@ type Config struct {
 	Graph         *graph.Config         `ocisConfig:"graph"`
 	GraphExplorer *graphExplorer.Config `ocisConfig:"graph_explorer"`
 	IDP           *idp.Config           `ocisConfig:"idp"`
+	IDM           *idm.Config           `ocisConfig:"idm"`
 	Nats          *nats.Config          `ocisConfig:"nats"`
 	Notifications *notifications.Config `ocisConfig:"notifications"`
 	OCS           *ocs.Config           `ocisConfig:"ocs"`

ocis-pkg/config/defaultconfig.go

@@ -5,6 +5,7 @@ import (
 	glauth "github.com/owncloud/ocis/glauth/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config"
 	graph "github.com/owncloud/ocis/graph/pkg/config"
+	idm "github.com/owncloud/ocis/idm/pkg/config"
 	idp "github.com/owncloud/ocis/idp/pkg/config"
 	nats "github.com/owncloud/ocis/nats/pkg/config"
 	notifications "github.com/owncloud/ocis/notifications/pkg/config"
@@ -31,6 +32,7 @@ func DefaultConfig() *Config {
 		GLAuth:        glauth.DefaultConfig(),
 		Graph:         graph.DefaultConfig(),
 		IDP:           idp.DefaultConfig(),
+		IDM:           idm.DefaultConfig(),
 		Nats:          nats.DefaultConfig(),
 		Notifications: notifications.DefaultConfig(),
 		Proxy:         proxy.DefaultConfig(),

ocis-pkg/log/logrus_wrapper.go

@@ -0,0 +1,74 @@
+package log
+
+import (
+	"io/ioutil"
+
+	"github.com/rs/zerolog"
+	"github.com/sirupsen/logrus"
+)
+
+type levelMap map[logrus.Level]zerolog.Level
+
+var levelMapping = levelMap{
+	logrus.PanicLevel: zerolog.PanicLevel,
+	logrus.ErrorLevel: zerolog.ErrorLevel,
+	logrus.TraceLevel: zerolog.TraceLevel,
+	logrus.DebugLevel: zerolog.DebugLevel,
+	logrus.WarnLevel:  zerolog.WarnLevel,
+	logrus.InfoLevel:  zerolog.InfoLevel,
+}
+
+// LogrusWrapper around zerolog. Required because idp uses logrus internally.
+type LogrusWrapper struct {
+	zeroLog  *zerolog.Logger
+	levelMap levelMap
+}
+
+// Wrap return a logrus logger which internally logs to /dev/null. Messages are passed to the
+// underlying zerolog via hooks.
+func LogrusWrap(zr zerolog.Logger) *logrus.Logger {
+	lr := logrus.New()
+	lr.SetOutput(ioutil.Discard)
+	lr.SetLevel(logrusLevel(zr.GetLevel()))
+	lr.AddHook(&LogrusWrapper{
+		zeroLog:  &zr,
+		levelMap: levelMapping,
+	})
+
+	return lr
+}
+
+// Levels on which logrus hooks should be triggered
+func (h *LogrusWrapper) Levels() []logrus.Level {
+	return logrus.AllLevels
+}
+
+// Fire called by logrus on new message
+func (h *LogrusWrapper) Fire(entry *logrus.Entry) error {
+	h.zeroLog.WithLevel(h.levelMap[entry.Level]).
+		Fields(zeroLogFields(entry.Data)).
+		Msg(entry.Message)
+
+	return nil
+}
+
+//Convert logrus fields to zerolog
+func zeroLogFields(fields logrus.Fields) map[string]interface{} {
+	fm := make(map[string]interface{})
+	for k, v := range fields {
+		fm[k] = v
+	}
+
+	return fm
+}
+
+// Convert logrus level to zerolog
+func logrusLevel(level zerolog.Level) logrus.Level {
+	for lrLvl, zrLvl := range levelMapping {
+		if zrLvl == level {
+			return lrLvl
+		}
+	}
+
+	panic("Unexpected loglevel")
+}

ocis-pkg/metadata_storage/metadata_storage.go

@@ -89,6 +89,9 @@ func (ms MetadataStorage) SimpleUpload(ctx context.Context, uploadpath string, c
 	if err != nil {
 		return err
 	}
+	if res.Status.Code != v1beta11.Code_CODE_OK {
+		return errtypes.NewErrtypeFromStatus(res.Status)
+	}
 
 	var endpoint string