From f568ea8bbc7cb72d0fe4e5bb34fa48e39b6dca4b Mon Sep 17 00:00:00 2001 From: Igor Beliakov <46579601+weisdd@users.noreply.github.com> Date: Wed, 5 Oct 2022 22:25:00 +0200 Subject: [PATCH] fix: ignore case for folder names in grafana responses (#830) --- controllers/grafanadashboard/grafana_client.go | 3 ++- controllers/grafanadashboardfolder/grafana_client.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/grafanadashboard/grafana_client.go b/controllers/grafanadashboard/grafana_client.go index e515a50d3..d5709e9c3 100644 --- a/controllers/grafanadashboard/grafana_client.go +++ b/controllers/grafanadashboard/grafana_client.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "net/http" "net/url" + "strings" "time" "sigs.k8s.io/controller-runtime/pkg/log" @@ -206,7 +207,7 @@ func (r *GrafanaClientImpl) CreateOrUpdateFolder(folderInputName string) (Grafan } for _, folder := range allfolders { - if folder.Title == folderInputName { + if strings.EqualFold(folder.Title, folderInputName) { return folder, nil } } diff --git a/controllers/grafanadashboardfolder/grafana_client.go b/controllers/grafanadashboardfolder/grafana_client.go index bf78da0a9..2cfb4236d 100644 --- a/controllers/grafanadashboardfolder/grafana_client.go +++ b/controllers/grafanadashboardfolder/grafana_client.go @@ -132,7 +132,7 @@ func (r *GrafanaClientImpl) FindOrCreateFolder(folderName string) (GrafanaFolder } for _, folder := range existingFolders { - if folder.Title == folderName { + if strings.EqualFold(folder.Title, folderName) { return folder, nil } }