plugins: send secureJsonData unencrypted

pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go

@@ -28,12 +28,13 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
 
 
 	pbQuery := &datasource.DatasourceRequest{
 	pbQuery := &datasource.DatasourceRequest{
 		Datasource: &datasource.DatasourceInfo{
 		Datasource: &datasource.DatasourceInfo{
-			JsonData: string(jsonData),
 			Name:     ds.Name,
 			Name:     ds.Name,
 			Type:     ds.Type,
 			Type:     ds.Type,
 			Url:      ds.Url,
 			Url:      ds.Url,
 			Id:       ds.Id,
 			Id:       ds.Id,
 			OrgId:    ds.OrgId,
 			OrgId:    ds.OrgId,
+			JsonData: string(jsonData),
+			DecryptedSecureJsonData: ds.SecureJsonData.Decrypt(),
 		},
 		},
 		TimeRange: &datasource.TimeRange{
 		TimeRange: &datasource.TimeRange{
 			FromRaw:     query.TimeRange.From,
 			FromRaw:     query.TimeRange.From,

vendor/vendor.json

@@ -483,10 +483,10 @@
 			"revisionTime": "2016-12-15T22:53:35Z"
 			"revisionTime": "2016-12-15T22:53:35Z"
 		},
 		},
 		{
 		{
-			"checksumSHA1": "EtBErX/rtSQmC2z8fgl6WFBCt+E=",
+			"checksumSHA1": "pJYGEIHFn2dy4vmu6nhaglsq6L0=",
 			"path": "github.com/grafana/grafana_plugin_model/go/datasource",
 			"path": "github.com/grafana/grafana_plugin_model/go/datasource",
-			"revision": "50b475deb168a09c6b9be2658a230add915e913b",
-			"revisionTime": "2018-01-17T10:10:56Z"
+			"revision": "dfe5dc0a6ce05825ba7fe2d0323d92e631bffa89",
+			"revisionTime": "2018-01-18T10:12:58Z"
 		},
 		},
 		{
 		{
 			"checksumSHA1": "0OUXdKhaE6TzpHevY0VFlAA5YJ8=",
 			"checksumSHA1": "0OUXdKhaE6TzpHevY0VFlAA5YJ8=",