Skip to content

Commit

Permalink
refactor: use cmp.Or() instead of stringOrDefault()
Browse files Browse the repository at this point in the history
  • Loading branch information
clambin committed Jan 14, 2025
1 parent 24e2877 commit 35d6113
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions internal/exporter.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package internal

import (
"cmp"
"fmt"
"github.com/go-openapi/strfmt"
goapi "github.com/grafana/grafana-openapi-client-go/client"
Expand Down Expand Up @@ -31,9 +32,9 @@ func makeExporter(v *viper.Viper, l *slog.Logger) (*exporter, error) {
logger: l,
client: client,
formatter: formatter{
namespace: stringOrDefault(v.GetString("namespace"), "default"),
grafanaLabelName: stringOrDefault(v.GetString("grafana.operator.label.name"), "dashboards"),
grafanaLabelValue: stringOrDefault(v.GetString("grafana.operator.label.value"), "grafana"),
namespace: cmp.Or(v.GetString("namespace"), "default"),
grafanaLabelName: cmp.Or(v.GetString("grafana.operator.label.name"), "dashboards"),
grafanaLabelValue: cmp.Or(v.GetString("grafana.operator.label.value"), "grafana"),
},
folders: v.GetBool("folders"),
}, nil
Expand Down Expand Up @@ -65,13 +66,6 @@ func newGrafanaClient(grafanaURL, apiKey string) (*grafanaClient, error) {
}, nil
}

func stringOrDefault(s, defaultString string) string {
if s != "" {
return s
}
return defaultString
}

func (e exporter) exportDashboards(w io.Writer, args ...string) error {
for dashboard, err := range yieldDashboards(e.client.dashboardClient, e.folders, args...) {
if err != nil {
Expand Down

0 comments on commit 35d6113

Please sign in to comment.