Skip to content

Commit d1e0779

Browse files
author
Michael Recachinas
committed
Add MinioUseSSL
1 parent 362cc77 commit d1e0779

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
sigplot-data-service
2+
dist/
3+
.git/
4+
ui/node_modules/
5+
sdscache/
6+
tests

sds_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ type Location struct {
120120
Location string `json:"location"`
121121
MinioAccessKey string `json:"minioAccessKey"`
122122
MinioSecretKey string `json:"minioSecretKey"`
123+
MinioUseSSL bool `json:"minioUseSSL"`
123124
}
124125

125126
// Configuration Struct for Configuraion File

sigplot_data_service.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,12 @@ func openDataSource(url string, urlPosition int) (io.ReadSeeker, string, bool) {
711711
file, inCache := getItemFromCache(cacheFileName, "miniocache/")
712712
if !inCache {
713713
log.Println("Minio File not in local file Cache, Need to fetch")
714-
minioClient, err := minio.New(currentLocation.Location, currentLocation.MinioAccessKey, currentLocation.MinioSecretKey, false)
714+
minioClient, err := minio.New(
715+
currentLocation.Location,
716+
currentLocation.MinioAccessKey,
717+
currentLocation.MinioSecretKey,
718+
currentLocation.MinioUseSSL,
719+
)
715720
elapsed := time.Since(start)
716721
log.Println(" Time to Make connection ", elapsed)
717722
if err != nil {
@@ -1984,7 +1989,7 @@ func (s *fileSystemServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
19841989
currentLocation.Location,
19851990
currentLocation.MinioAccessKey,
19861991
currentLocation.MinioSecretKey,
1987-
false,
1992+
currentLocation.MinioUseSSL,
19881993
)
19891994
if err != nil {
19901995
log.Println("Error Establishing Connection to Minio", err)

0 commit comments

Comments
 (0)