IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix build error (#53615)

Browse Source
This commit is contained in:
Giordano Ricci 2022-08-11 20:21:37 +01:00 committed by GitHub
parent e9980a9bb8
commit 6b84dddee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/correlations/api.go
View File

@ -212,7 +212,7 @@ func (s *CorrelationsService) getCorrelationHandler(c *models.ReqContext) respon
query := GetCorrelationQuery{
UID: web.Params(c.Req)[":correlationUID"],
SourceUID: web.Params(c.Req)[":uid"],
OrgId: c.OrgId,
OrgId: c.OrgID,
}
correlation, err := s.getCorrelation(c.Req.Context(), query)
@ -258,7 +258,7 @@ type GetCorrelationResponse struct {
func (s *CorrelationsService) getCorrelationsBySourceUIDHandler(c *models.ReqContext) response.Response {
query := GetCorrelationsBySourceUIDQuery{
SourceUID: web.Params(c.Req)[":uid"],
OrgId: c.OrgId,
OrgId: c.OrgID,
}
correlations, err := s.getCorrelationsBySourceUID(c.Req.Context(), query)
@ -300,7 +300,7 @@ type GetCorrelationsBySourceUIDResponse struct {
// 500: internalServerError
func (s *CorrelationsService) getCorrelationsHandler(c *models.ReqContext) response.Response {
query := GetCorrelationsQuery{
OrgId: c.OrgId,
OrgId: c.OrgID,
}
correlations, err := s.getCorrelations(c.Req.Context(), query)

32
pkg/tests/api/correlations/correlations_read_test.go
View File

@ -3,13 +3,13 @@ package correlations
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"testing"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/correlations"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/user"
"github.com/stretchr/testify/require"
)
@ -30,12 +30,12 @@ func TestIntegrationReadCorrelation(t *testing.T) {
}
ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(models.ROLE_VIEWER),
DefaultOrgRole: string(org.RoleViewer),
Password: viewerUser.password,
Login: viewerUser.username,
})
ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(models.ROLE_ADMIN),
DefaultOrgRole: string(org.RoleAdmin),
Password: adminUser.password,
Login: adminUser.username,
})
@ -49,7 +49,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -90,7 +90,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusUnauthorized, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -120,7 +120,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response []correlations.Correlation
@ -141,7 +141,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusUnauthorized, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -171,7 +171,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -190,7 +190,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -209,7 +209,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response []correlations.Correlation
@ -230,7 +230,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusUnauthorized, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -243,8 +243,6 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
t.Run("Authenticated users shouldn't get unauthorized or forbidden errors", func(t *testing.T) {
// FIXME: don't skip this test
t.Skip("this test should pass but somehow testing with accesscontrol works different than live grafana")
res := ctx.Get(GetParams{
url: fmt.Sprintf("/api/datasources/uid/%s/correlations/%s", "some-ds-uid", "some-correlation-uid"),
user: viewerUser,
@ -262,7 +260,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -281,7 +279,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@ -300,7 +298,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.Correlation