Skip to content

Commit

Permalink
[v9.3.x] Azure Monitor Logs: Avoid warning when the response is empty (
Browse files Browse the repository at this point in the history
…#59231)

Azure Monitor Logs: Avoid warning when the response is empty (#59211)

(cherry picked from commit 9d88e14)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
  • Loading branch information
grafanabot and andresmgot committed Nov 23, 2022
1 parent f5d7e0e commit c4756c3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
Expand Up @@ -315,6 +315,10 @@ type LogAnalyticsMeta struct {
}

func setAdditionalFrameMeta(frame *data.Frame, query, subscriptionID, workspace string) error {
if frame.Meta == nil || frame.Meta.Custom == nil {
// empty response
return nil
}
frame.Meta.ExecutedQueryString = query
la, ok := frame.Meta.Custom.(*LogAnalyticsMeta)
if !ok {
Expand Down
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/stretchr/testify/require"

"github.com/grafana/grafana/pkg/infra/log"
Expand Down Expand Up @@ -242,3 +243,11 @@ func Test_executeQueryErrorWithDifferentLogAnalyticsCreds(t *testing.T) {
t.Error("expecting the error to inform of bad credentials")
}
}

func Test_setAdditionalFrameMeta(t *testing.T) {
t.Run("it should not error with an empty response", func(t *testing.T) {
frame := data.NewFrame("test")
err := setAdditionalFrameMeta(frame, "", "", "")
require.NoError(t, err)
})
}

0 comments on commit c4756c3

Please sign in to comment.