[s3inbox] fix helthcheck url

neicnordic · Sep 18, 2023 · 4344b5f · 4344b5f
1 parent 2fa20b0
commit 4344b5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sda/cmd/s3inbox/healthchecks.go b/sda/cmd/s3inbox/healthchecks.go
@@ -8,9 +8,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/neicnordic/sensitive-data-archive/internal/config"
-
 	"github.com/heptiolabs/healthcheck"
+	"github.com/neicnordic/sensitive-data-archive/internal/config"
 )
 
 // HealthCheck registers and endpoint for healthchecking the service
@@ -26,8 +25,11 @@ type HealthCheck struct {
 // the backend S3 storage and the Message Broker so it can report readiness.
 func NewHealthCheck(port int, db *sql.DB, conf *config.Config, tlsConfig *tls.Config) *HealthCheck {
 	s3URL := conf.Inbox.S3.URL
+	if conf.Inbox.S3.Port != 0 {
+		s3URL = fmt.Sprintf("%s:%d", s3URL, conf.Inbox.S3.Port)
+	}
 	if conf.Inbox.S3.Readypath != "" {
-		s3URL = conf.Inbox.S3.URL + conf.Inbox.S3.Readypath
+		s3URL += conf.Inbox.S3.Readypath
 	}
 
 	brokerURL := fmt.Sprintf("%s:%d", conf.Broker.Host, conf.Broker.Port)

diff --git a/sda/internal/config/config.go b/sda/internal/config/config.go
@@ -698,7 +698,6 @@ func configS3Storage(prefix string) storage.S3Conf {
 
 	// Defaults (move to viper?)
 
-	s3.Port = 443
 	s3.Region = "us-east-1"
 	s3.NonExistRetryTime = 2 * time.Minute