From afa8ca8246229f9b58450bb564b2a9356dcfb78a Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Thu, 28 Apr 2022 17:38:07 +0200
Subject: [PATCH] use FullDefaultConfig in example config generator and remove
 leftover

---
 docs/helpers/example-config-generator.go.tmpl |  3 +--
 .../accounts/cmd/helper/defaultconfig/main.go | 27 -------------------
 .../pkg/config/defaults/defaultconfig.go      |  7 +++++
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 extensions/accounts/cmd/helper/defaultconfig/main.go

diff --git a/docs/helpers/example-config-generator.go.tmpl b/docs/helpers/example-config-generator.go.tmpl
index 6e40721c1c..1c63e1fd32 100644
--- a/docs/helpers/example-config-generator.go.tmpl
+++ b/docs/helpers/example-config-generator.go.tmpl
@@ -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() {
 		}
 	}
 }
-
diff --git a/extensions/accounts/cmd/helper/defaultconfig/main.go b/extensions/accounts/cmd/helper/defaultconfig/main.go
deleted file mode 100644
index f60d1525d1..0000000000
--- a/extensions/accounts/cmd/helper/defaultconfig/main.go
+++ /dev/null
@@ -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))
-}
diff --git a/extensions/proxy/pkg/config/defaults/defaultconfig.go b/extensions/proxy/pkg/config/defaults/defaultconfig.go
index 61c91de93d..e5dadbd579 100644
--- a/extensions/proxy/pkg/config/defaults/defaultconfig.go
+++ b/extensions/proxy/pkg/config/defaults/defaultconfig.go
@@ -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{