Merge branch 'master' into StoreSettingsViaMetadata

Signed-off-by: jkoberg <jkoberg@owncloud.com>

settings/pkg/store/metadata/assignments_test.go

@@ -7,7 +7,7 @@ import (
 
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
 	settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
-	"github.com/owncloud/ocis/settings/pkg/config"
+	"github.com/owncloud/ocis/settings/pkg/config/defaults"
 	"github.com/stretchr/testify/require"
 )
 
@@ -18,7 +18,7 @@ var (
 	s = &Store{
 		Logger: logger,
 		l:      &sync.Mutex{},
-		cfg:    config.DefaultConfig(),
+		cfg:    defaults.DefaultConfig(),
 	}
 
 	logger = olog.NewLogger(

settings/pkg/store/metadata/store_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/owncloud/ocis/settings/pkg/config"
+	"github.com/owncloud/ocis/settings/pkg/config/defaults"
 )
 
 const (
@@ -48,7 +48,7 @@ func NewMDC(s *Store) error {
 	case "unit":
 		mdc = &MockedMetadataClient{data: make(map[string][]byte)}
 	case "integration":
-		mdc = NewMetadataClient(config.DefaultConfig().Metadata)
+		mdc = NewMetadataClient(defaults.DefaultConfig().Metadata)
 	}
 	return s.initMetadataClient(mdc)
 }