losing my mind

storage/pkg/command/appprovider.go

@@ -132,7 +132,7 @@ type AppProviderSutureService struct {
 
 // NewAppProvider creates a new store.AppProviderSutureService
 func NewAppProvider(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return AppProviderSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/authbasic.go

@@ -151,7 +151,7 @@ type AuthBasicSutureService struct {
 
 // NewAuthBasicSutureService creates a new store.AuthBasicSutureService
 func NewAuthBasic(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return AuthBasicSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/authbearer.go

@@ -127,7 +127,7 @@ type AuthBearerSutureService struct {
 
 // NewAuthBearerSutureService creates a new gateway.AuthBearerSutureService
 func NewAuthBearer(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return AuthBearerSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/authmachine.go

@@ -123,7 +123,7 @@ type AuthMachineSutureService struct {
 
 // NewAuthMachineSutureService creates a new gateway.AuthMachineSutureService
 func NewAuthMachine(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return AuthMachineSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/frontend.go

@@ -337,7 +337,7 @@ type FrontendSutureService struct {
 
 // NewFrontend creates a new frontend.FrontendSutureService
 func NewFrontend(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return FrontendSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/gateway.go

@@ -351,7 +351,7 @@ type GatewaySutureService struct {
 
 // NewGatewaySutureService creates a new gateway.GatewaySutureService
 func NewGateway(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return GatewaySutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/groups.go

@@ -165,7 +165,7 @@ type GroupSutureService struct {
 
 // NewGroupProviderSutureService creates a new storage.GroupProvider
 func NewGroupProvider(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return GroupSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/sharing.go

@@ -191,7 +191,7 @@ type SharingSutureService struct {
 
 // NewSharingSutureService creates a new store.SharingSutureService
 func NewSharing(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return SharingSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/storagehome.go

@@ -150,7 +150,7 @@ type StorageHomeSutureService struct {
 
 // NewStorageHomeSutureService creates a new storage.StorageHomeSutureService
 func NewStorageHome(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return StorageHomeSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/storagemetadata.go

@@ -166,7 +166,7 @@ type MetadataSutureService struct {
 
 // NewSutureService creates a new storagemetadata.SutureService
 func NewStorageMetadata(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return MetadataSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/storagepubliclink.go

@@ -124,7 +124,7 @@ type StoragePublicLinkSutureService struct {
 
 // NewStoragePublicLinkSutureService creates a new storage.StoragePublicLinkSutureService
 func NewStoragePublicLink(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return StoragePublicLinkSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/storageusers.go

@@ -150,7 +150,7 @@ type StorageUsersSutureService struct {
 
 // NewStorageUsersSutureService creates a new storage.StorageUsersSutureService
 func NewStorageUsers(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return StorageUsersSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/command/users.go

@@ -186,7 +186,7 @@ type UserProviderSutureService struct {
 
 // NewUserProviderSutureService creates a new storage.UserProvider
 func NewUserProvider(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Log = cfg.Commons.Log
+	cfg.Storage.Commons = cfg.Commons
 	return UserProviderSutureService{
 		cfg: cfg.Storage,
 	}

storage/pkg/config/config.go

@@ -500,6 +500,8 @@ type Asset struct {
 
 // Config combines all available configuration parts.
 type Config struct {
+	*shared.Commons
+
 	File    string
 	Log     *shared.Log
 	Debug   Debug