From 4697556cac819c47d068819b9fc9c3b4ea84e279 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 14 Aug 2025 18:07:12 +0100 Subject: Merge confplanner-web and replace fiber with native net/http --- internal/config.go | 34 ---------------------------------- internal/config/config.go | 34 ++++++++++++++++++++++++++++++++++ internal/version/version.go | 7 +++++++ 3 files changed, 41 insertions(+), 34 deletions(-) delete mode 100644 internal/config.go create mode 100644 internal/config/config.go create mode 100644 internal/version/version.go (limited to 'internal') diff --git a/internal/config.go b/internal/config.go deleted file mode 100644 index 564adbe..0000000 --- a/internal/config.go +++ /dev/null @@ -1,34 +0,0 @@ -package config - -import ( - "os" - - "gopkg.in/yaml.v3" -) - -type Config struct { - Server struct { - Host string `yaml:"host"` - Port string `yaml:"port"` - } `yaml:"server"` - Database struct { - ConnString string `yaml:"connString"` - } `yaml:"database"` - Conference struct { - ScheduleURL string `yaml:"scheduleURL"` - } `yaml:"conference"` - AcceptRegistrations bool `yaml:"acceptRegistrations"` - BaseURL string `yaml:"baseURL"` -} - -func ReadConfig(configPath string, dst *Config) error { - config, err := os.ReadFile(configPath) - if err != nil { - return err - } - - if err := yaml.Unmarshal(config, dst); err != nil { - return err - } - return nil -} diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..564adbe --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,34 @@ +package config + +import ( + "os" + + "gopkg.in/yaml.v3" +) + +type Config struct { + Server struct { + Host string `yaml:"host"` + Port string `yaml:"port"` + } `yaml:"server"` + Database struct { + ConnString string `yaml:"connString"` + } `yaml:"database"` + Conference struct { + ScheduleURL string `yaml:"scheduleURL"` + } `yaml:"conference"` + AcceptRegistrations bool `yaml:"acceptRegistrations"` + BaseURL string `yaml:"baseURL"` +} + +func ReadConfig(configPath string, dst *Config) error { + config, err := os.ReadFile(configPath) + if err != nil { + return err + } + + if err := yaml.Unmarshal(config, dst); err != nil { + return err + } + return nil +} diff --git a/internal/version/version.go b/internal/version/version.go new file mode 100644 index 0000000..248e18e --- /dev/null +++ b/internal/version/version.go @@ -0,0 +1,7 @@ +package version + +var ( + Version string + Revision string + GitSHA string +) -- cgit v1.2.3-70-g09d2