* Fix unmaarshal of double pointer
* update sdk version
(cherry picked from commit 0bf889e058)
Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
This commit is contained in:
co-authored by
ying-jeanne
parent
be54ab63cb
commit
bd76bd0d0e
@@ -453,9 +453,10 @@ func (hs *HTTPServer) GetHomeDashboard(c *models.ReqContext) response.Response {
|
||||
dash.Meta.IsHome = true
|
||||
dash.Meta.CanEdit = c.SignedInUser.HasRole(models.ROLE_EDITOR)
|
||||
dash.Meta.FolderTitle = "General"
|
||||
dash.Dashboard = simplejson.New()
|
||||
|
||||
jsonParser := json.NewDecoder(file)
|
||||
if err := jsonParser.Decode(&dash.Dashboard); err != nil {
|
||||
if err := jsonParser.Decode(dash.Dashboard); err != nil {
|
||||
return response.Error(500, "Failed to load home dashboard", err)
|
||||
}
|
||||
|
||||
|
||||
@@ -1115,8 +1115,8 @@ func restoreDashboardVersionScenario(t *testing.T, desc string, url string, rout
|
||||
}
|
||||
|
||||
func (sc *scenarioContext) ToJSON() *simplejson.Json {
|
||||
var result *simplejson.Json
|
||||
err := json.NewDecoder(sc.resp.Body).Decode(&result)
|
||||
result := simplejson.New()
|
||||
err := json.NewDecoder(sc.resp.Body).Decode(result)
|
||||
require.NoError(sc.t, err)
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -73,11 +73,11 @@ func getUsageStats(t *testing.T, server *web.Mux) (*models.SystemStats, *httptes
|
||||
recorder := httptest.NewRecorder()
|
||||
server.ServeHTTP(recorder, req)
|
||||
|
||||
var usageStats *models.SystemStats
|
||||
var usageStats models.SystemStats
|
||||
if recorder.Code == http.StatusOK {
|
||||
require.NoError(t, json.NewDecoder(recorder.Body).Decode(&usageStats))
|
||||
}
|
||||
return usageStats, recorder
|
||||
return &usageStats, recorder
|
||||
}
|
||||
|
||||
func setupTestServer(t *testing.T, user *models.SignedInUser, service *UsageStats) *web.Mux {
|
||||
|
||||
@@ -82,7 +82,7 @@ func readPluginManifest(body []byte) (*pluginManifest, error) {
|
||||
}
|
||||
|
||||
// Convert to a well typed object
|
||||
manifest := &pluginManifest{}
|
||||
var manifest pluginManifest
|
||||
err := json.Unmarshal(block.Plaintext, &manifest)
|
||||
if err != nil {
|
||||
return nil, errutil.Wrap("Error parsing manifest JSON", err)
|
||||
@@ -99,7 +99,7 @@ func readPluginManifest(body []byte) (*pluginManifest, error) {
|
||||
return nil, errutil.Wrap("failed to check signature", err)
|
||||
}
|
||||
|
||||
return manifest, nil
|
||||
return &manifest, nil
|
||||
}
|
||||
|
||||
func Calculate(mlog log.Logger, plugin *plugins.Plugin) (plugins.Signature, error) {
|
||||
|
||||
@@ -56,9 +56,9 @@ func (s Settings) Value() (driver.Value, error) {
|
||||
func (s *Settings) Scan(value interface{}) error {
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
return json.Unmarshal([]byte(v), &s)
|
||||
return json.Unmarshal([]byte(v), s)
|
||||
case []uint8:
|
||||
return json.Unmarshal(v, &s)
|
||||
return json.Unmarshal(v, s)
|
||||
default:
|
||||
return fmt.Errorf("type assertion on scan failed: got %T", value)
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ func (api *ServiceAccountsAPI) updateServiceAccount(c *models.ReqContext) respon
|
||||
return response.Error(http.StatusBadRequest, "Service Account ID is invalid", err)
|
||||
}
|
||||
|
||||
cmd := &serviceaccounts.UpdateServiceAccountForm{}
|
||||
var cmd serviceaccounts.UpdateServiceAccountForm
|
||||
if err := web.Bind(c.Req, &cmd); err != nil {
|
||||
return response.Error(http.StatusBadRequest, "Bad request data", err)
|
||||
}
|
||||
@@ -188,7 +188,7 @@ func (api *ServiceAccountsAPI) updateServiceAccount(c *models.ReqContext) respon
|
||||
return response.Error(http.StatusBadRequest, "Invalid role specified", nil)
|
||||
}
|
||||
|
||||
resp, err := api.store.UpdateServiceAccount(c.Req.Context(), c.OrgId, scopeID, cmd)
|
||||
resp, err := api.store.UpdateServiceAccount(c.Req.Context(), c.OrgId, scopeID, &cmd)
|
||||
if err != nil {
|
||||
switch {
|
||||
case errors.Is(err, serviceaccounts.ErrServiceAccountNotFound):
|
||||
|
||||
@@ -99,7 +99,7 @@ func TestServerClient(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, resp.Body.Close())
|
||||
|
||||
var user *models.SignedInUser
|
||||
var user models.SignedInUser
|
||||
err = json.Unmarshal(bytes, &user)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, user)
|
||||
@@ -121,7 +121,7 @@ func TestServerClient(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, resp.Body.Close())
|
||||
|
||||
var user *models.SignedInUser
|
||||
var user models.SignedInUser
|
||||
err = json.Unmarshal(bytes, &user)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, user)
|
||||
|
||||
Reference in New Issue
Block a user