From eaf709ddc0a0512d1acf3a2990a614bf0f9c2d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20S=C3=BC=C3=9F?= Date: Tue, 2 Apr 2024 10:27:39 +0200 Subject: [PATCH] refactor: remove old client now that all resources use the new client, we can safely remove the dependency Closes: #1357 --- controllers/client/grafana_client.go | 45 ---------------------------- go.mod | 2 -- go.sum | 6 ---- 3 files changed, 53 deletions(-) diff --git a/controllers/client/grafana_client.go b/controllers/client/grafana_client.go index a69343a48..c1c86afb9 100644 --- a/controllers/client/grafana_client.go +++ b/controllers/client/grafana_client.go @@ -10,7 +10,6 @@ import ( "github.com/grafana/grafana-operator/v5/controllers/metrics" v1 "k8s.io/api/core/v1" - grapi "github.com/grafana/grafana-api-golang-client" genapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-operator/v5/api/v1beta1" "github.com/grafana/grafana-operator/v5/controllers/config" @@ -125,50 +124,6 @@ func getAdminCredentials(ctx context.Context, c client.Client, grafana *v1beta1. return credentials, nil } -func NewGrafanaClient(ctx context.Context, c client.Client, grafana *v1beta1.Grafana) (*grapi.Client, error) { - var timeout time.Duration - if grafana.Spec.Client != nil && grafana.Spec.Client.TimeoutSeconds != nil { - timeout = time.Duration(*grafana.Spec.Client.TimeoutSeconds) - if timeout < 0 { - timeout = 0 - } - } else { - timeout = 10 - } - - credentials, err := getAdminCredentials(ctx, c, grafana) - if err != nil { - return nil, err - } - - clientConfig := grapi.Config{ - HTTPHeaders: nil, - Client: &http.Client{ - Transport: NewInstrumentedRoundTripper(grafana.Name, metrics.GrafanaApiRequests, grafana.IsExternal()), - Timeout: time.Second * timeout, - }, - // TODO populate me - OrgID: 0, - // TODO populate me - NumRetries: 0, - } - - if credentials.apikey != "" { - clientConfig.APIKey = credentials.apikey - } - - if credentials.username != "" && credentials.password != "" { - clientConfig.BasicAuth = url.UserPassword(credentials.username, credentials.password) - } - - grafanaClient, err := grapi.New(grafana.Status.AdminUrl, clientConfig) - if err != nil { - return nil, err - } - - return grafanaClient, nil -} - func NewGeneratedGrafanaClient(ctx context.Context, c client.Client, grafana *v1beta1.Grafana) (*genapi.GrafanaHTTPAPI, error) { var timeout time.Duration if grafana.Spec.Client != nil && grafana.Spec.Client.TimeoutSeconds != nil { diff --git a/go.mod b/go.mod index f26135a99..aca74f048 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/go-logr/logr v1.4.1 github.com/go-openapi/strfmt v0.23.0 github.com/google/go-jsonnet v0.20.0 - github.com/grafana/grafana-api-golang-client v0.27.0 github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.32.0 @@ -62,7 +61,6 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/go.sum b/go.sum index 62e5c0cea..5d3b50d92 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,6 @@ github.com/go-openapi/validate v0.23.0/go.mod h1:EeiAZ5bmpSIOJV1WLfyYF9qp/B1ZgSa github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b h1:/vQ+oYKu+JoyaMPDsv5FzwuL2wwWBgBbtj/YLCi4LuA= -github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b/go.mod h1:Xo4aNUOrJnVruqWQJBtW6+bTBDTniY8yZum5rF3b5jw= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grafana/grafana-api-golang-client v0.27.0 h1:zIwMXcbCB4n588i3O2N6HfNcQogCNTd/vPkEXTr7zX8= -github.com/grafana/grafana-api-golang-client v0.27.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y= github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7 h1:3ckIV9HQ+g7ZF0EuFktYNxQP7h0p8ATwxOus0CfINGA= github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7/go.mod h1:J+/va7PHxPwcbwvoXlK6ZpocYuolEb0kht3IfALng9s= -github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=