Skip to content

Commit db260b8

Browse files
theSuesstheSuess
authored
Merge pull request #1479 from grafana/refactor/remove-old-client
refactor: remove old client
2 parents b09cc68 + eaf709d commit db260b8

File tree

3 files changed

+0
-53
lines changed

3 files changed

+0
-53
lines changed

‎controllers/client/grafana_client.go

-45
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/grafana/grafana-operator/v5/controllers/metrics"
1111
v1 "k8s.io/api/core/v1"
1212

13-
grapi "github.com/grafana/grafana-api-golang-client"
1413
genapi "github.com/grafana/grafana-openapi-client-go/client"
1514
"github.com/grafana/grafana-operator/v5/api/v1beta1"
1615
"github.com/grafana/grafana-operator/v5/controllers/config"
@@ -125,50 +124,6 @@ func getAdminCredentials(ctx context.Context, c client.Client, grafana *v1beta1.
125124
return credentials, nil
126125
}
127126

128-
func NewGrafanaClient(ctx context.Context, c client.Client, grafana *v1beta1.Grafana) (*grapi.Client, error) {
129-
var timeout time.Duration
130-
if grafana.Spec.Client != nil && grafana.Spec.Client.TimeoutSeconds != nil {
131-
timeout = time.Duration(*grafana.Spec.Client.TimeoutSeconds)
132-
if timeout < 0 {
133-
timeout = 0
134-
}
135-
} else {
136-
timeout = 10
137-
}
138-
139-
credentials, err := getAdminCredentials(ctx, c, grafana)
140-
if err != nil {
141-
return nil, err
142-
}
143-
144-
clientConfig := grapi.Config{
145-
HTTPHeaders: nil,
146-
Client: &http.Client{
147-
Transport: NewInstrumentedRoundTripper(grafana.Name, metrics.GrafanaApiRequests, grafana.IsExternal()),
148-
Timeout: time.Second * timeout,
149-
},
150-
// TODO populate me
151-
OrgID: 0,
152-
// TODO populate me
153-
NumRetries: 0,
154-
}
155-
156-
if credentials.apikey != "" {
157-
clientConfig.APIKey = credentials.apikey
158-
}
159-
160-
if credentials.username != "" && credentials.password != "" {
161-
clientConfig.BasicAuth = url.UserPassword(credentials.username, credentials.password)
162-
}
163-
164-
grafanaClient, err := grapi.New(grafana.Status.AdminUrl, clientConfig)
165-
if err != nil {
166-
return nil, err
167-
}
168-
169-
return grafanaClient, nil
170-
}
171-
172127
func NewGeneratedGrafanaClient(ctx context.Context, c client.Client, grafana *v1beta1.Grafana) (*genapi.GrafanaHTTPAPI, error) {
173128
var timeout time.Duration
174129
if grafana.Spec.Client != nil && grafana.Spec.Client.TimeoutSeconds != nil {

‎go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/go-logr/logr v1.4.1
1111
github.com/go-openapi/strfmt v0.23.0
1212
github.com/google/go-jsonnet v0.20.0
13-
github.com/grafana/grafana-api-golang-client v0.27.0
1413
github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7
1514
github.com/onsi/ginkgo v1.16.5
1615
github.com/onsi/gomega v1.32.0
@@ -62,7 +61,6 @@ require (
6261
github.com/google/go-cmp v0.6.0 // indirect
6362
github.com/google/gofuzz v1.2.0 // indirect
6463
github.com/google/uuid v1.6.0 // indirect
65-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6664
github.com/imdario/mergo v0.3.13 // indirect
6765
github.com/josharian/intern v1.0.0 // indirect
6866
github.com/json-iterator/go v1.1.12 // indirect

‎go.sum

-6
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ github.com/go-openapi/validate v0.23.0/go.mod h1:EeiAZ5bmpSIOJV1WLfyYF9qp/B1ZgSa
5252
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
5353
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
5454
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
55-
github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b h1:/vQ+oYKu+JoyaMPDsv5FzwuL2wwWBgBbtj/YLCi4LuA=
56-
github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b/go.mod h1:Xo4aNUOrJnVruqWQJBtW6+bTBDTniY8yZum5rF3b5jw=
5755
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
5856
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
5957
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -85,12 +83,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY
8583
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
8684
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
8785
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
88-
github.com/grafana/grafana-api-golang-client v0.27.0 h1:zIwMXcbCB4n588i3O2N6HfNcQogCNTd/vPkEXTr7zX8=
89-
github.com/grafana/grafana-api-golang-client v0.27.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y=
9086
github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7 h1:3ckIV9HQ+g7ZF0EuFktYNxQP7h0p8ATwxOus0CfINGA=
9187
github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7/go.mod h1:J+/va7PHxPwcbwvoXlK6ZpocYuolEb0kht3IfALng9s=
92-
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
93-
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
9488
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
9589
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
9690
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=

0 commit comments

Comments
 (0)