use FullDefaultConfig in example config generator and remove leftover

This commit is contained in:
Willy Kloucek
2022-04-28 17:38:07 +02:00
parent e582b609b5
commit afa8ca8246
3 changed files with 8 additions and 29 deletions

View File

@@ -22,7 +22,7 @@ func main() {
{{- range $key, $value := .}}
replacer.Replace("{{$value}}"): func() string {
fmt.Println("Generating example YAML config for {{ $value -}}")
c := pkg{{$key}}.DefaultConfig()
c := pkg{{$key}}.FullDefaultConfig()
pkg{{$key}}.EnsureDefaults(c)
pkg{{$key}}.Sanitize(c)
yml, err := yaml.Marshal(c)
@@ -50,4 +50,3 @@ func main() {
}
}
}

View File

@@ -1,27 +0,0 @@
package main
import (
"fmt"
accountsdefaults "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
idpdefaults "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
"gopkg.in/yaml.v2"
)
func main() {
fn1 := accountsdefaults.FullDefaultConfig
fn2 := idpdefaults.FullDefaultConfig
b, err := yaml.Marshal(fn1())
if err != nil {
return
}
fmt.Println(string(b))
b, err = yaml.Marshal(fn2())
if err != nil {
return
}
fmt.Println(string(b))
}

View File

@@ -8,6 +8,13 @@ import (
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
)
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
func DefaultConfig() *config.Config {
return &config.Config{
Debug: config.Debug{