From 312600aa2c997f99bb7d344ae714cee6faabac07 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Tue, 17 Mar 2020 16:58:52 +0100 Subject: [PATCH] upgrades plugin sdk to 0.30.0 (#22846) ref grafana/grafana-plugin-sdk-go#94 ref grafana/grafana-plugin-sdk-go#70 (cherry picked from commit b0407b3578f40d86e6029976a16a3e0d05611b39) --- go.mod | 2 +- go.sum | 4 +- pkg/plugins/backendplugin/contracts.go | 2 +- .../backend/plugin/setup.go | 55 ------------------- .../genproto/pluginv2/backend.pb.go | 10 ++-- vendor/modules.txt | 2 +- 6 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 vendor/github.com/grafana/grafana-plugin-sdk-go/backend/plugin/setup.go diff --git a/go.mod b/go.mod index 7697ef347d3..8ea04646e6f 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/gorilla/websocket v1.4.1 github.com/gosimple/slug v1.4.2 github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4 - github.com/grafana/grafana-plugin-sdk-go v0.28.0 + github.com/grafana/grafana-plugin-sdk-go v0.30.0 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd github.com/hashicorp/go-plugin v1.0.1 github.com/hashicorp/go-version v1.1.0 diff --git a/go.sum b/go.sum index 1707e9510af..3b04a5e224b 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/gosimple/slug v1.4.2 h1:jDmprx3q/9Lfk4FkGZtvzDQ9Cj9eAmsjzeQGp24PeiQ= github.com/gosimple/slug v1.4.2/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0= github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4 h1:SPdxCL9BChFTlyi0Khv64vdCW4TMna8+sxL7+Chx+Ag= github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4/go.mod h1:nc0XxBzjeGcrMltCDw269LoWF9S8ibhgxolCdA1R8To= -github.com/grafana/grafana-plugin-sdk-go v0.28.0 h1:vRyaOOzpvqKhh4619Woepqe7wen4juQyKFxPFPFz1wE= -github.com/grafana/grafana-plugin-sdk-go v0.28.0/go.mod h1:G6Ov9M+FDOZXNw8eKXINO6XzqdUvTs7huwyQp5jLTBQ= +github.com/grafana/grafana-plugin-sdk-go v0.30.0 h1:G2mA0Vsh629aTG8FkpnUmPsWtLQocwCFMLMANjT1wgg= +github.com/grafana/grafana-plugin-sdk-go v0.30.0/go.mod h1:G6Ov9M+FDOZXNw8eKXINO6XzqdUvTs7huwyQp5jLTBQ= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd h1:rNuUHR+CvK1IS89MMtcF0EpcVMZtjKfPRp4MEmt/aTs= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-plugin v1.0.1 h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE= diff --git a/pkg/plugins/backendplugin/contracts.go b/pkg/plugins/backendplugin/contracts.go index e726220baaa..de9c8ec303d 100644 --- a/pkg/plugins/backendplugin/contracts.go +++ b/pkg/plugins/backendplugin/contracts.go @@ -40,7 +40,7 @@ func (hs HealthStatus) String() string { type CheckHealthResult struct { Status HealthStatus Message string - JSONDetails string + JSONDetails []byte } func checkHealthResultFromProto(protoResp *pluginv2.CheckHealthResponse) *CheckHealthResult { diff --git a/vendor/github.com/grafana/grafana-plugin-sdk-go/backend/plugin/setup.go b/vendor/github.com/grafana/grafana-plugin-sdk-go/backend/plugin/setup.go deleted file mode 100644 index b0f5e667bd2..00000000000 --- a/vendor/github.com/grafana/grafana-plugin-sdk-go/backend/plugin/setup.go +++ /dev/null @@ -1,55 +0,0 @@ -package plugin - -import ( - "fmt" - "net/http" - "net/http/pprof" - "os" - - hclog "github.com/hashicorp/go-hclog" -) - -// SetupPluginEnvironment will read the environment variables and apply the -// standard environment behavior. As the SDK evolves, this will likely change! -func SetupPluginEnvironment(pluginID string) hclog.Logger { - pluginLogger := hclog.New(&hclog.LoggerOptions{ - Name: pluginID, - // TODO: How to make level configurable? - Level: hclog.LevelFromString("DEBUG"), - JSONFormat: true, - // Color: hclog.ColorOff, (when we use 0.12) - }) - - // Enable profiler - profilerEnabled := false - if value, ok := os.LookupEnv("GF_PLUGINS_PROFILER"); ok { - // compare value to plugin name - if value == pluginID { - profilerEnabled = true - } - } - pluginLogger.Info("Profiler", "enabled", profilerEnabled) - if profilerEnabled { - profilerPort := "6060" - if value, ok := os.LookupEnv("GF_PLUGINS_PROFILER_PORT"); ok { - profilerPort = value - } - - pluginLogger.Info("Profiler", "port", profilerPort) - portConfig := fmt.Sprintf(":%s", profilerPort) - - r := http.NewServeMux() - r.HandleFunc("/debug/pprof/", pprof.Index) - r.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline) - r.HandleFunc("/debug/pprof/profile", pprof.Profile) - r.HandleFunc("/debug/pprof/symbol", pprof.Symbol) - r.HandleFunc("/debug/pprof/trace", pprof.Trace) - - go func() { - if err := http.ListenAndServe(portConfig, r); err != nil { - pluginLogger.Error("Error Running profiler: %s", err.Error()) - } - }() - } - return pluginLogger -} diff --git a/vendor/github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2/backend.pb.go b/vendor/github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2/backend.pb.go index 8dfb8d244fc..7b5b7e52ef2 100644 --- a/vendor/github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2/backend.pb.go +++ b/vendor/github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2/backend.pb.go @@ -877,7 +877,7 @@ func (m *CheckHealthRequest) GetConfig() *PluginConfig { type CheckHealthResponse struct { Status CheckHealthResponse_HealthStatus `protobuf:"varint,1,opt,name=status,proto3,enum=pluginv2.CheckHealthResponse_HealthStatus" json:"status,omitempty"` Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - JsonDetails string `protobuf:"bytes,3,opt,name=jsonDetails,proto3" json:"jsonDetails,omitempty"` + JsonDetails []byte `protobuf:"bytes,3,opt,name=jsonDetails,proto3" json:"jsonDetails,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -922,11 +922,11 @@ func (m *CheckHealthResponse) GetMessage() string { return "" } -func (m *CheckHealthResponse) GetJsonDetails() string { +func (m *CheckHealthResponse) GetJsonDetails() []byte { if m != nil { return m.JsonDetails } - return "" + return nil } func init() { @@ -1016,7 +1016,7 @@ var fileDescriptor_5ab9ba5b8d8b2ba5 = []byte{ 0x33, 0xa7, 0xce, 0xd9, 0x2e, 0x25, 0x3e, 0x9f, 0xff, 0x47, 0xb2, 0xd9, 0x7f, 0x68, 0xb0, 0x59, 0x4a, 0xb3, 0x6c, 0xa6, 0xc6, 0x38, 0xe1, 0xea, 0xe5, 0x8d, 0x92, 0x98, 0x5e, 0x0f, 0x1f, 0xa4, 0xe6, 0x44, 0xde, 0xc0, 0xea, 0x26, 0xb2, 0x04, 0x20, 0x8c, 0x91, 0x59, 0x06, 0x70, 0x66, 0x0a, - 0x61, 0x90, 0x3f, 0x06, 0x28, 0x27, 0x9e, 0xcf, 0x94, 0xe0, 0x17, 0x5d, 0xf6, 0x40, 0xd2, 0x6d, + 0x61, 0x90, 0x3f, 0x06, 0x28, 0x27, 0x9e, 0xcf, 0x94, 0x24, 0x15, 0x5d, 0xf6, 0x40, 0xd2, 0x6d, 0x99, 0x13, 0x35, 0xa1, 0x7e, 0x72, 0xb8, 0x7f, 0x78, 0xf4, 0xfd, 0x61, 0xfb, 0x23, 0x54, 0x03, 0xfd, 0x68, 0xbf, 0xad, 0x21, 0x13, 0xaa, 0x63, 0x8c, 0x8f, 0x70, 0x5b, 0x1f, 0xfe, 0x00, 0x8d, 0x4c, 0x07, 0xd1, 0x11, 0xb4, 0x8a, 0xba, 0x88, 0x1e, 0xdd, 0xf8, 0x87, 0xa0, 0xfb, 0xf8, 0x66, @@ -1027,7 +1027,7 @@ var fileDescriptor_5ab9ba5b8d8b2ba5 = []byte{ 0xe9, 0xf0, 0x04, 0xcc, 0xb7, 0x31, 0x09, 0xd9, 0x69, 0x14, 0x07, 0x68, 0x17, 0xee, 0x2d, 0x8d, 0xff, 0x87, 0xc3, 0x8f, 0x70, 0xbf, 0x94, 0x49, 0x80, 0xbf, 0x4d, 0x9c, 0xb3, 0xbb, 0x81, 0x79, 0xbb, 0xf5, 0x0e, 0x06, 0x2f, 0xb3, 0xef, 0xd3, 0x9a, 0xfc, 0x87, 0xe5, 0xf9, 0x3f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x9f, 0xc1, 0xca, 0xb8, 0xc1, 0x0c, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xfc, 0xf3, 0x6d, 0x5e, 0xc1, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/modules.txt b/vendor/modules.txt index e9c08c2b9be..474d02ccca8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -148,7 +148,7 @@ github.com/gosimple/slug # github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4 github.com/grafana/grafana-plugin-model/go/datasource github.com/grafana/grafana-plugin-model/go/renderer -# github.com/grafana/grafana-plugin-sdk-go v0.28.0 +# github.com/grafana/grafana-plugin-sdk-go v0.30.0 github.com/grafana/grafana-plugin-sdk-go/backend/plugin github.com/grafana/grafana-plugin-sdk-go/data github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2