From 42cdb5f4ed2c9e73be7aba921e840e10a494ada9 Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:47:50 -0500 Subject: [PATCH] [chore][cmd/builder] Improve main.go template formatting (#12503) #### Description Puts the keys in `ConfigProviderSettings` to all be on their own lines like the other keys in the struct. --- cmd/builder/internal/builder/templates/main.go.tmpl | 9 +++++---- cmd/otelcorecol/main.go | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/builder/internal/builder/templates/main.go.tmpl b/cmd/builder/internal/builder/templates/main.go.tmpl index a69b2929967..e3b1e8499f6 100644 --- a/cmd/builder/internal/builder/templates/main.go.tmpl +++ b/cmd/builder/internal/builder/templates/main.go.tmpl @@ -45,16 +45,17 @@ func main() { DefaultScheme: "{{ .ConfResolver.DefaultURIScheme }}", {{- end }} }, - }, ProviderModules: map[string]string{ + }, + ProviderModules: map[string]string{ {{- range .ConfmapProviders}} {{.Name}}.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "{{.GoMod}}", {{- end}} - }, ConverterModules: []string{ - {{- range .ConfmapConverters}} + }, + ConverterModules: []string{ + {{- range .ConfmapConverters}} "{{.GoMod}}", {{- end}} }, - } if err := run(set); err != nil { diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 13bfbe8297b..e0257b0a2b2 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -36,13 +36,15 @@ func main() { yamlprovider.NewFactory(), }, }, - }, ProviderModules: map[string]string{ + }, + ProviderModules: map[string]string{ envprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.0", fileprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.0", httpprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.0", httpsprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.0", yamlprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.0", - }, ConverterModules: []string{}, + }, + ConverterModules: []string{}, } if err := run(set); err != nil {