Réorganisation des packages + renommage du projet en gitea-kan

internal/config/config.go

@@ -0,0 +1,72 @@
+package config
+
+import (
+	"io"
+	"os"
+
+	ini "gopkg.in/ini.v1"
+)
+
+type Config struct {
+	Debug bool
+	HTTP  HTTPConfig
+	Gitea GiteaConfig
+}
+
+type HTTPConfig struct {
+	Address   string
+	PublicDir string
+}
+
+type GiteaConfig struct {
+	ClientID     string
+	ClientSecret string
+	RedirectURL  string
+	LogoutURL    string
+	AuthURL      string
+	TokenURL     string
+	Scopes       []string
+	APIBaseURL   string
+}
+
+// NewFromFile retrieves the configuration from the given file
+func NewFromFile(filepath string) (*Config, error) {
+	config := NewDefault()
+
+	cfg, err := ini.Load(filepath)
+	if err != nil {
+		return nil, err
+	}
+
+	cfg.ValueMapper = os.ExpandEnv
+
+	if err := cfg.MapTo(config); err != nil {
+		return nil, err
+	}
+
+	return config, nil
+}
+
+func NewDefault() *Config {
+	return &Config{
+		Debug: false,
+		HTTP: HTTPConfig{
+			Address:   ":3000",
+			PublicDir: "${GITEA_APP_PUBDIR}",
+		},
+		Gitea: GiteaConfig{},
+	}
+}
+
+func Dump(config *Config, w io.Writer) error {
+	cfg := ini.Empty()
+	if err := cfg.ReflectFrom(config); err != nil {
+		return err
+	}
+
+	if _, err := cfg.WriteTo(w); err != nil {
+		return err
+	}
+
+	return nil
+}

internal/config/provider.go

@@ -0,0 +1,9 @@
+package config
+
+import "gitlab.com/wpetit/goweb/service"
+
+func ServiceProvider(config *Config) service.Provider {
+	return func(ctn *service.Container) (interface{}, error) {
+		return config, nil
+	}
+}

internal/config/service.go

@@ -0,0 +1,33 @@
+package config
+
+import (
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/service"
+)
+
+const ServiceName service.Name = "config"
+
+// From retrieves the config service in the given container
+func From(container *service.Container) (*Config, error) {
+	service, err := container.Service(ServiceName)
+	if err != nil {
+		return nil, errors.Wrapf(err, "error while retrieving '%s' service", ServiceName)
+	}
+
+	srv, ok := service.(*Config)
+	if !ok {
+		return nil, errors.Errorf("retrieved service is not a valid '%s' service", ServiceName)
+	}
+
+	return srv, nil
+}
+
+// Must retrieves the config service in the given container or panic otherwise
+func Must(container *service.Container) *Config {
+	srv, err := From(container)
+	if err != nil {
+		panic(err)
+	}
+
+	return srv
+}