From 10c5a927cb619f1aa2a599cbe3667820f4766bda Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 9 Nov 2017 14:46:20 -0600 Subject: more global config ref cleanup (#7802) --- api4/apitestlib.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'api4/apitestlib.go') diff --git a/api4/apitestlib.go b/api4/apitestlib.go index d777f8c19..6f066a140 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -689,19 +689,20 @@ func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, regi return s3.NewWithCredentials(endpoint, creds, secure, region) } -func cleanupTestFile(info *model.FileInfo) error { - if *utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 { - endpoint := utils.Cfg.FileSettings.AmazonS3Endpoint - accessKey := utils.Cfg.FileSettings.AmazonS3AccessKeyId - secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey - secure := *utils.Cfg.FileSettings.AmazonS3SSL - signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 - region := utils.Cfg.FileSettings.AmazonS3Region +func (me *TestHelper) cleanupTestFile(info *model.FileInfo) error { + cfg := me.App.Config() + if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 { + endpoint := cfg.FileSettings.AmazonS3Endpoint + accessKey := cfg.FileSettings.AmazonS3AccessKeyId + secretKey := cfg.FileSettings.AmazonS3SecretAccessKey + secure := *cfg.FileSettings.AmazonS3SSL + signV2 := *cfg.FileSettings.AmazonS3SignV2 + region := cfg.FileSettings.AmazonS3Region s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) if err != nil { return err } - bucket := utils.Cfg.FileSettings.AmazonS3Bucket + bucket := cfg.FileSettings.AmazonS3Bucket if err := s3Clnt.RemoveObject(bucket, info.Path); err != nil { return err } @@ -717,19 +718,19 @@ func cleanupTestFile(info *model.FileInfo) error { return err } } - } else if *utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL { - if err := os.Remove(utils.Cfg.FileSettings.Directory + info.Path); err != nil { + } else if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL { + if err := os.Remove(cfg.FileSettings.Directory + info.Path); err != nil { return err } if info.ThumbnailPath != "" { - if err := os.Remove(utils.Cfg.FileSettings.Directory + info.ThumbnailPath); err != nil { + if err := os.Remove(cfg.FileSettings.Directory + info.ThumbnailPath); err != nil { return err } } if info.PreviewPath != "" { - if err := os.Remove(utils.Cfg.FileSettings.Directory + info.PreviewPath); err != nil { + if err := os.Remove(cfg.FileSettings.Directory + info.PreviewPath); err != nil { return err } } -- cgit v1.2.3-1-g7c22