opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 17:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

postgres: vendor in the file-exists helper (#80446)

Browse Source
This commit is contained in:
Gábor Farkas
2024-01-15 08:53:43 +01:00
committed by GitHub
parent b4d7c484c7
commit 6b5805dd1b
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/tsdb/grafana-postgresql-datasource/tlsmanager.go
View File

@ -10,7 +10,6 @@ import (
"time" "time"
"github.com/grafana/grafana-plugin-sdk-go/backend/log" "github.com/grafana/grafana-plugin-sdk-go/backend/log"
"github.com/grafana/grafana/pkg/infra/fs"
"github.com/grafana/grafana/pkg/tsdb/sqleng" "github.com/grafana/grafana/pkg/tsdb/sqleng"
) )
@ -132,7 +131,7 @@ func writeCertFile(logger log.Logger, fileContent string, generatedFilePath stri
} }
logger.Debug("Deleting cert file since no content is provided", "path", generatedFilePath) logger.Debug("Deleting cert file since no content is provided", "path", generatedFilePath)
exists, err := fs.Exists(generatedFilePath) exists, err := fileExists(generatedFilePath)
if err != nil { if err != nil {
return err return err
} }
@ -181,7 +180,7 @@ func (m *tlsManager) writeCertFiles(dsInfo sqleng.DataSourceInfo, tlsconfig *tls
} }
// Write certification directory and files // Write certification directory and files
exists, err := fs.Exists(workDir) exists, err := fileExists(workDir)
if err != nil { if err != nil {
return err return err
} }
@ -212,7 +211,7 @@ func validateCertFilePaths(rootCert, clientCert, clientKey string) error {
if fpath == "" { if fpath == "" {
continue continue
} }
exists, err := fs.Exists(fpath) exists, err := fileExists(fpath)
if err != nil { if err != nil {
return err return err
} }
@ -222,3 +221,16 @@ func validateCertFilePaths(rootCert, clientCert, clientKey string) error {
} }
return nil return nil
} }
// Exists determines whether a file/directory exists or not.
func fileExists(fpath string) (bool, error) {
_, err := os.Stat(fpath)
if err != nil {
if !os.IsNotExist(err) {
return false, err
}
return false, nil
}
return true, nil
}