Merge branch 'scalyr:master' into customer_request_9579

lutzwillek-tomtom · web-flow · commit 17d57ae8b143 · 2024-12-19T16:39:47.000+01:00
diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
@@ -118,7 +118,7 @@ func (d *DataSetDatasource) query(ctx context.Context, query backend.DataQuery)
 		}
 	}
 
-	if qm.TeamEmails != nil && len(qm.TeamEmails) > 0 {
+	if len(qm.TeamEmails) > 0 {
 		request.TeamEmails = qm.TeamEmails
 	}
 
diff --git a/pkg/plugin/plugin_test.go b/pkg/plugin/plugin_test.go
@@ -69,7 +69,7 @@ func TestLiveQueryDataPQ(t *testing.T) {
 		t.Error(err)
 	}
 	if skip != "" {
-		t.Skipf(skip)
+		t.Skip(skip)
 	}
 
 	refId := "A"
@@ -114,7 +114,7 @@ func TestLiveQueryDataPlot(t *testing.T) {
 		t.Error(err)
 	}
 	if skip != "" {
-		t.Skipf(skip)
+		t.Skip(skip)
 	}
 
 	refId := "A"

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (d *DataSetDatasource) query(ctx context.Context, query backend.DataQuery)`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`- if qm.TeamEmails != nil && len(qm.TeamEmails) > 0 {`
	`121`	`+ if len(qm.TeamEmails) > 0 {`
`122`	`122`	`request.TeamEmails = qm.TeamEmails`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func TestLiveQueryDataPQ(t *testing.T) {`
`69`	`69`	`t.Error(err)`
`70`	`70`	`}`
`71`	`71`	`if skip != "" {`
`72`		`- t.Skipf(skip)`
	`72`	`+ t.Skip(skip)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`refId := "A"`
`@@ -114,7 +114,7 @@ func TestLiveQueryDataPlot(t *testing.T) {`
`114`	`114`	`t.Error(err)`
`115`	`115`	`}`
`116`	`116`	`if skip != "" {`
`117`		`- t.Skipf(skip)`
	`117`	`+ t.Skip(skip)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`refId := "A"`