Chore: Keeping the list of plugin executable complete (#60840)

* Keeping the list of executable complete

* Update pkg/plugins/storage/fs.go

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
pull/62127/head
Timur Olzhabayev 2 years ago committed by GitHub
parent 85bf098fdb
commit 0d7e303809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkg/plugins/storage/fs.go
  2. 2
      pkg/plugins/storage/fs_test.go

@ -220,7 +220,7 @@ func isSymlinkRelativeTo(basePath string, symlinkDestPath string, symlinkOrigPat
func extractFile(file *zip.File, filePath string) (err error) { func extractFile(file *zip.File, filePath string) (err error) {
fileMode := file.Mode() fileMode := file.Mode()
// This is entry point for backend plugins so we want to make them executable // This is entry point for backend plugins so we want to make them executable
if strings.HasSuffix(filePath, "_linux_amd64") || strings.HasSuffix(filePath, "_darwin_amd64") { if strings.HasSuffix(filePath, "_linux_amd64") || strings.HasSuffix(filePath, "_linux_arm") || strings.HasSuffix(filePath, "_linux_arm64") || strings.HasSuffix(filePath, "_darwin_amd64") || strings.HasSuffix(filePath, "_darwin_arm64") || strings.HasSuffix(filePath, "_windows_amd64.exe") {
fileMode = os.FileMode(0755) fileMode = os.FileMode(0755)
} }

@ -157,7 +157,7 @@ func TestExtractFiles(t *testing.T) {
// File in zip has permission 644 // File in zip has permission 644
fileInfo, err = os.Stat(pluginsDir + "/grafana-simple-json-datasource/simple-plugin_windows_amd64.exe") fileInfo, err = os.Stat(pluginsDir + "/grafana-simple-json-datasource/simple-plugin_windows_amd64.exe")
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "-rw-r--r--", fileInfo.Mode().String()) require.Equal(t, "-rwxr-xr-x", fileInfo.Mode().String())
// File in zip has permission 755 // File in zip has permission 755
fileInfo, err = os.Stat(pluginsDir + "/grafana-simple-json-datasource/non-plugin-binary") fileInfo, err = os.Stat(pluginsDir + "/grafana-simple-json-datasource/non-plugin-binary")

Loading…
Cancel
Save