Skip to content

Commit 5675496

Browse files
kostrsekostrse
authored
Migrate to Grafana Azure SDK (grafana#47232)
1 parent a55274a commit 5675496

31 files changed

+51
-1222
lines changed

‎go.mod

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ require (
1717
cloud.google.com/go/storage v1.18.2
1818
cuelang.org/go v0.4.0
1919
github.com/Azure/azure-sdk-for-go v59.3.0+incompatible
20-
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0
21-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.10.0
2220
github.com/Azure/go-autorest/autorest v0.11.22
2321
github.com/BurntSushi/toml v0.3.1
2422
github.com/Masterminds/semver v1.5.0
@@ -54,6 +52,7 @@ require (
5452
github.com/gosimple/slug v1.9.0
5553
github.com/grafana/cuetsy v0.0.0-20211119211437-8c25464cc9bf
5654
github.com/grafana/grafana-aws-sdk v0.10.1
55+
github.com/grafana/grafana-azure-sdk-go v1.0.0
5756
github.com/grafana/grafana-plugin-sdk-go v0.129.0
5857
github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa
5958
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@@ -183,7 +182,7 @@ require (
183182
github.com/gomodule/redigo v2.0.0+incompatible // indirect
184183
github.com/google/btree v1.0.1 // indirect
185184
github.com/google/flatbuffers v2.0.0+incompatible // indirect
186-
github.com/googleapis/gax-go/v2 v2.1.1
185+
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
187186
github.com/gorilla/mux v1.8.0 // indirect
188187
github.com/grafana/grafana-google-sdk-go v0.0.0-20211104130251-b190293eaf58
189188
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
@@ -247,19 +246,20 @@ require (
247246
golang.org/x/text v0.3.7 // indirect
248247
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
249248
google.golang.org/appengine v1.6.7 // indirect
250-
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1
249+
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
251250
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
252251
)
253252

254253
require (
255254
cloud.google.com/go/kms v1.1.0
256-
github.com/Azure/go-autorest/autorest/adal v0.9.17
257255
github.com/golang-migrate/migrate/v4 v4.7.0
258-
github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f
259256
gocloud.dev v0.24.0
260257
)
261258

262259
require (
260+
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0 // indirect
261+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.10.0 // indirect
262+
github.com/Azure/go-autorest/autorest/adal v0.9.17 // indirect
263263
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
264264
github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
265265
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
@@ -270,6 +270,7 @@ require (
270270
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
271271
github.com/getkin/kin-openapi v0.91.0 // indirect
272272
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
273+
github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f // indirect
273274
github.com/imdario/mergo v0.3.12 // indirect
274275
github.com/klauspost/compress v1.13.6 // indirect
275276
github.com/opencontainers/image-spec v1.0.2 // indirect

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,8 @@ github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 h1:GplhUk6Xes5J
13351335
github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
13361336
github.com/grafana/grafana-aws-sdk v0.10.1 h1:Ksguhjx6EuGLN/5Oc7oZoxuDReJ5RxIH99yqSMpLGUs=
13371337
github.com/grafana/grafana-aws-sdk v0.10.1/go.mod h1:vFIOHEnY1u5nY0/tge1IHQjPuG6DRKr2ISf/HikUdjE=
1338+
github.com/grafana/grafana-azure-sdk-go v1.0.0 h1:RIVQyVb89/y/BnOVsVDcxiMtmWF8NmAX8ql0OJvzwNc=
1339+
github.com/grafana/grafana-azure-sdk-go v1.0.0/go.mod h1:xbzMaG74BN4rOP1NYEsCMNWkPbK7GfSU09PGYfQYm+g=
13381340
github.com/grafana/grafana-google-sdk-go v0.0.0-20211104130251-b190293eaf58 h1:2ud7NNM7LrGPO4x0NFR8qLq68CqI4SmB7I2yRN2w9oE=
13391341
github.com/grafana/grafana-google-sdk-go v0.0.0-20211104130251-b190293eaf58/go.mod h1:Vo2TKWfDVmNTELBUM+3lkrZvFtBws0qSZdXhQxRdJrE=
13401342
github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M=
@@ -2462,8 +2464,6 @@ github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBn
24622464
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
24632465
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
24642466
github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
2465-
github.com/vectordotdev/go-datemath v0.1.1-0.20220110192739-f9ce83ec349f h1:2upw/ZfjkCKpc4k6DXg7lMfCSLkfw/8epV5/y2ZUQ8U=
2466-
github.com/vectordotdev/go-datemath v0.1.1-0.20220110192739-f9ce83ec349f/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
24672467
github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae h1:oyiy3uBj1F4O3AaFh7hUGBrJjAssJhKyAbwxtkslxqo=
24682468
github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
24692469
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=

‎pkg/api/pluginproxy/token_provider_azure.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"context"
55
"strings"
66

7+
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
8+
"github.com/grafana/grafana-azure-sdk-go/azsettings"
9+
"github.com/grafana/grafana-azure-sdk-go/aztokenprovider"
10+
711
"github.com/grafana/grafana/pkg/plugins"
812
"github.com/grafana/grafana/pkg/setting"
9-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azcredentials"
10-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
11-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/aztokenprovider"
1213
)
1314

1415
type azureAccessTokenProvider struct {

‎pkg/plugins/config.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package plugins
22

33
import (
4+
"github.com/grafana/grafana-azure-sdk-go/azsettings"
5+
46
"github.com/grafana/grafana/pkg/setting"
5-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
67
)
78

89
type Cfg struct {

‎pkg/plugins/manager/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88
"time"
99

10+
"github.com/grafana/grafana-azure-sdk-go/azsettings"
1011
"github.com/grafana/grafana-plugin-sdk-go/backend"
11-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
1212

1313
"github.com/grafana/grafana/pkg/infra/log"
1414
"github.com/grafana/grafana/pkg/plugins"

‎pkg/services/datasources/service/datasource_service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import (
1212
"sync"
1313
"time"
1414

15+
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
16+
"github.com/grafana/grafana-azure-sdk-go/azhttpclient"
1517
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
1618

1719
"github.com/grafana/grafana/pkg/bus"
@@ -24,8 +26,6 @@ import (
2426
"github.com/grafana/grafana/pkg/services/secrets"
2527
"github.com/grafana/grafana/pkg/services/sqlstore"
2628
"github.com/grafana/grafana/pkg/setting"
27-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azcredentials"
28-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azhttpclient"
2929
)
3030

3131
type Service struct {

‎pkg/services/datasources/service/datasource_service_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import (
88
"testing"
99
"time"
1010

11+
"github.com/grafana/grafana-azure-sdk-go/azsettings"
1112
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
13+
1214
"github.com/grafana/grafana/pkg/bus"
1315
"github.com/grafana/grafana/pkg/components/simplejson"
1416
"github.com/grafana/grafana/pkg/infra/httpclient"
@@ -22,7 +24,6 @@ import (
2224
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
2325
"github.com/grafana/grafana/pkg/services/sqlstore"
2426
"github.com/grafana/grafana/pkg/setting"
25-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
2627
"github.com/stretchr/testify/assert"
2728
"github.com/stretchr/testify/require"
2829
)

‎pkg/setting/setting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"time"
2121

2222
"github.com/grafana/grafana-aws-sdk/pkg/awsds"
23+
"github.com/grafana/grafana-azure-sdk-go/azsettings"
2324
"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
24-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
2525

2626
"github.com/grafana/grafana/pkg/infra/log"
2727
"github.com/grafana/grafana/pkg/util"

‎pkg/setting/setting_azure.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package setting
22

3-
import "github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
3+
import "github.com/grafana/grafana-azure-sdk-go/azsettings"
44

55
func (cfg *Cfg) readAzureSettings() {
66
azureSettings := &azsettings.AzureSettings{}

‎pkg/setting/setting_azure_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package setting
33
import (
44
"testing"
55

6-
"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azsettings"
6+
"github.com/grafana/grafana-azure-sdk-go/azsettings"
7+
78
"github.com/stretchr/testify/assert"
89
"github.com/stretchr/testify/require"
910
)

‎pkg/tsdb/azuremonitor/azcredentials/builder.go

-83
This file was deleted.

‎pkg/tsdb/azuremonitor/azcredentials/credentials.go

-30
This file was deleted.

‎pkg/tsdb/azuremonitor/azhttpclient/middleware.go

-41
This file was deleted.

‎pkg/tsdb/azuremonitor/azhttpclient/options.go

-11
This file was deleted.

0 commit comments

Comments
 (0)