From e0e4e1cdff754143bef90aa123363631c75403b7 Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Fri, 20 Dec 2024 11:40:26 +0000 Subject: [PATCH] LBAC for datasources: Refactor to only use jsondata and not the datasource struct (#98294) refactor to only use jsondata and not the datasource struct --- pkg/services/datasources/models.go | 4 ---- pkg/services/datasources/models_test.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go index 24fc748935d..3ff27ef9128 100644 --- a/pkg/services/datasources/models.go +++ b/pkg/services/datasources/models.go @@ -88,10 +88,6 @@ type TeamHTTPHeader struct { Value string `json:"value"` } -func (ds DataSource) TeamHTTPHeaders() (*TeamHTTPHeaders, error) { - return GetTeamHTTPHeaders(ds.JsonData) -} - func GetTeamHTTPHeaders(jsonData *simplejson.Json) (*TeamHTTPHeaders, error) { teamHTTPHeaders := &TeamHTTPHeaders{} if jsonData == nil { diff --git a/pkg/services/datasources/models_test.go b/pkg/services/datasources/models_test.go index 782bf43f475..bc3957c62bc 100644 --- a/pkg/services/datasources/models_test.go +++ b/pkg/services/datasources/models_test.go @@ -95,7 +95,7 @@ func TestTeamHTTPHeaders(t *testing.T) { UID: "test", } - actual, err := ds.TeamHTTPHeaders() + actual, err := GetTeamHTTPHeaders(ds.JsonData) assert.NoError(t, err) assert.Equal(t, test.want, actual) assert.EqualValues(t, test.want, actual)