|
@@ -4,6 +4,7 @@ import (
|
|
"context"
|
|
"context"
|
|
"errors"
|
|
"errors"
|
|
"eta/eta_api/utils"
|
|
"eta/eta_api/utils"
|
|
|
|
+ "fmt"
|
|
"github.com/minio/minio-go/v7"
|
|
"github.com/minio/minio-go/v7"
|
|
"github.com/minio/minio-go/v7/pkg/credentials"
|
|
"github.com/minio/minio-go/v7/pkg/credentials"
|
|
"log"
|
|
"log"
|
|
@@ -425,11 +426,9 @@ func (m *MinioOss) UploadFile(fileName, filePath, savePath string) (string, erro
|
|
}
|
|
}
|
|
bucketName := utils.MinIoBucketname
|
|
bucketName := utils.MinIoBucketname
|
|
exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
|
|
exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
|
|
- if errBucketExists == nil && exists {
|
|
|
|
- log.Printf("We already own %s\n", bucketName)
|
|
|
|
- } else {
|
|
|
|
- log.Fatalln(errBucketExists)
|
|
|
|
- return "2", errBucketExists
|
|
|
|
|
|
+ if errBucketExists != nil || !exists {
|
|
|
|
+ err = fmt.Errorf("BucketExists: %v; err: %v", exists, errBucketExists)
|
|
|
|
+ return "2", err
|
|
}
|
|
}
|
|
|
|
|
|
path := savePath
|
|
path := savePath
|