remove UUIDs

This commit is contained in:
schulze
2023-04-11 12:55:38 +02:00
parent d0cd4340a5
commit c6c26bd914
2 changed files with 4 additions and 24 deletions

View File

@ -6,7 +6,6 @@ import (
"net/netip"
"os"
"github.com/google/uuid"
"gopkg.in/yaml.v3"
)
@ -22,7 +21,6 @@ type mtdconf struct {
// Service contains all necessary information about a service to identify it in the cloud as well as configuring a proxy for it
type Service struct {
ID CustomUUID `yaml:"id"`
CloudID string `yaml:"cloud_id"`
EntryIP netip.Addr `yaml:"entry_ip"`
EntryPort uint16 `yaml:"entry_port"`
@ -30,29 +28,11 @@ type Service struct {
ServicePort uint16 `yaml:"service_port"`
}
// CustomUUID is an alias for uuid.UUID to enable custom unmarshal function
type CustomUUID uuid.UUID
type aws struct {
Regions []string `yaml:"regions"`
CredentialsPath string `yaml:"credentials_path"`
}
// UnmarshalYAML parses uuid in yaml to CustomUUID type
func (u *CustomUUID) UnmarshalYAML(value *yaml.Node) error {
id, err := uuid.Parse(value.Value)
if err != nil {
return err
}
*u = CustomUUID(id)
return nil
}
// MarshalYAML parses CustomUUID type to uuid string for yaml
func (u CustomUUID) MarshalYAML() (interface{}, error) {
return uuid.UUID(u).String(), nil
}
// LoadConf loads config from a yaml file
func LoadConf(filename string) (Config) {
var config Config