Chore/fix lint issues (#27704)

* Chore: Fix linting issues

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-09-22 16:22:19 +02:00
committed by GitHub
parent ffc11cb63c
commit a5d9196a53
70 changed files with 274 additions and 276 deletions
@@ -13,7 +13,7 @@ import (
)
func TestPasswordMigrationCommand(t *testing.T) {
//setup datasources with password, basic_auth and none
// setup datasources with password, basic_auth and none
sqlstore := sqlstore.InitTestDB(t)
session := sqlstore.NewSession()
defer session.Close()
@@ -45,13 +45,13 @@ func TestPasswordMigrationCommand(t *testing.T) {
_, err = session.Exec("update data_source set secure_json_data = null where name = 'influxdb'")
require.NoError(t, err)
//run migration
// run migration
c, err := commandstest.NewCliContext(map[string]string{})
require.Nil(t, err)
err = EncryptDatasourcePasswords(c, sqlstore)
require.NoError(t, err)
//verify that no datasources still have password or basic_auth
// verify that no datasources still have password or basic_auth
var dss []*models.DataSource
err = session.SQL("select * from data_source").Find(&dss)
require.NoError(t, err)
@@ -40,23 +40,23 @@ func TestExtractFiles(t *testing.T) {
err := extractFiles(archive, "grafana-simple-json-datasource", pluginDir, false)
require.NoError(t, err)
//File in zip has permissions 755
// File in zip has permissions 755
fileInfo, err := os.Stat(filepath.Join(pluginDir, "grafana-simple-json-datasource",
"simple-plugin_darwin_amd64"))
require.NoError(t, err)
assert.Equal(t, "-rwxr-xr-x", fileInfo.Mode().String())
//File in zip has permission 755
// File in zip has permission 755
fileInfo, err = os.Stat(pluginDir + "/grafana-simple-json-datasource/simple-plugin_linux_amd64")
require.NoError(t, err)
assert.Equal(t, "-rwxr-xr-x", fileInfo.Mode().String())
//File in zip has permission 644
// File in zip has permission 644
fileInfo, err = os.Stat(pluginDir + "/grafana-simple-json-datasource/simple-plugin_windows_amd64.exe")
require.NoError(t, err)
assert.Equal(t, "-rw-r--r--", fileInfo.Mode().String())
//File in zip has permission 755
// File in zip has permission 755
fileInfo, err = os.Stat(pluginDir + "/grafana-simple-json-datasource/non-plugin-binary")
require.NoError(t, err)
assert.Equal(t, "-rwxr-xr-x", fileInfo.Mode().String())
+1 -1
View File
@@ -64,7 +64,7 @@ func returnOsDefault(currentOs string) string {
return "/var/db/grafana/plugins"
case "openbsd":
return "/var/grafana/plugins"
default: //"linux"
default: // "linux"
return "/var/lib/grafana/plugins"
}
}