chore(cmd/config): drop support for json and toml

cmd/dendrite/config_generate.go

@@ -39,19 +39,7 @@ var generateConfigCmd = &cobra.Command{
 
 		k.Load(structs.Provider(cfg, "config"), nil)
 
-		var parser koanf.Parser
+		b, err := k.Marshal(yaml.Parser())
-		if configPath != "" {
-			var fileExt string
-			parser, fileExt = getParser(configPath)
-			if parser == nil {
-				fmt.Println("unsupported file extention:", fileExt)
-				os.Exit(1)
-			}
-		} else {
-			parser = yaml.Parser()
-		}
-
-		b, err := k.Marshal(parser)
 		if err != nil {
 			fmt.Println("unable to generate yaml", err)
 			os.Exit(1)

cmd/dendrite/helper_config.go

@@ -7,31 +7,8 @@ import (
 
 	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/gomatrixserverlib"
-
-	"github.com/knadh/koanf"
-	"github.com/knadh/koanf/parsers/json"
-	"github.com/knadh/koanf/parsers/toml"
-	"github.com/knadh/koanf/parsers/yaml"
 )
 
-var (
-	configExtParser = map[string]koanf.Parser{
-		".json": json.Parser(),
-		".toml": toml.Parser(),
-		".yaml": yaml.Parser(),
-		".yml":  yaml.Parser(),
-	}
-)
-
-func getParser(configPath string) (koanf.Parser, string) {
-	fileExt := filepath.Ext(configPath)
-	parser, ok := configExtParser[fileExt]
-	if !ok {
-		return nil, fileExt
-	}
-	return parser, fileExt
-}
-
 var (
 	serverName    string
 	dbURI         string

cmd/dendrite/helper_readconfig.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/knadh/koanf"
+	"github.com/knadh/koanf/parsers/yaml"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/file"
 	"github.com/spf13/cobra"
@@ -31,12 +32,7 @@ func readConfig(generate bool, monolithic bool, configPath, dirPath string) {
 	k := koanf.New("/")
 
 	if configPath != "" {
-		parser, fileExt := getParser(configPath)
+		if err := k.Load(file.Provider(configPath), yaml.Parser()); err != nil {
-		if parser == nil {
-			fmt.Println("unsupported file extention:", fileExt)
-			os.Exit(1)
-		}
-		if err := k.Load(file.Provider(configPath), parser); err != nil {
 			fmt.Println("read file config:", err)
 			os.Exit(1)
 		}