From a1bffdf1011f2e0a5e4a09e1a474dd66a6f28780 Mon Sep 17 00:00:00 2001 From: mls-361 Date: Tue, 25 May 2021 16:39:33 +0200 Subject: [PATCH] =?UTF-8?q?En=20cours=20de=20d=C3=A9veloppement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/config/config.go | 6 +++--- internal/config/data/data.go | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index 1ebccb5..c9c5341 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -57,17 +57,17 @@ func (cc *config) Data() *data.Data { // Logger AFAIRE. func (cc *config) Logger() *data.Logger { - return &cc.data.Logger + return cc.data.Logger } // Server AFAIRE. func (cc *config) Server() *data.Server { - return &cc.data.Server + return cc.data.Server } // Storage AFAIRE. func (cc *config) Storage() *data.Storage { - return &cc.data.Storage + return cc.data.Storage } /* diff --git a/internal/config/data/data.go b/internal/config/data/data.go index 791f6ee..c00334a 100644 --- a/internal/config/data/data.go +++ b/internal/config/data/data.go @@ -15,21 +15,33 @@ import ( // Data AFAIRE. type Data struct { - Logger Logger - Server Server - Storage Storage + Logger *Logger + Server *Server + Storage *Storage } // Validate AFAIRE. func (d *Data) Validate() error { + if d.Logger == nil { + d.Logger = new(Logger) + } + if err := d.Logger.validate(); err != nil { return errors.WithMessage(err, "logger") /////////////////////////////////////////////////////////////////////// } + if d.Server == nil { + d.Server = new(Server) + } + if err := d.Server.validate(); err != nil { return errors.WithMessage(err, "server") /////////////////////////////////////////////////////////////////////// } + if d.Storage == nil { + d.Storage = new(Storage) + } + if err := d.Storage.validate(); err != nil { return errors.WithMessage(err, "storage") ////////////////////////////////////////////////////////////////////// }