From 088e9c98dd48fd8edc1a35eb4f6c0b1c7f21c0e0 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Thu, 31 Aug 2023 18:13:14 +0200 Subject: [PATCH] test --- sda/cmd/s3inbox/healthchecks.go | 6 ++++-- sda/internal/config/config.go | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sda/cmd/s3inbox/healthchecks.go b/sda/cmd/s3inbox/healthchecks.go index ad57b7bb3..d8c98adef 100644 --- a/sda/cmd/s3inbox/healthchecks.go +++ b/sda/cmd/s3inbox/healthchecks.go @@ -9,7 +9,6 @@ import ( "time" "github.com/neicnordic/sensitive-data-archive/internal/config" - "github.com/heptiolabs/healthcheck" ) @@ -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 = 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 index c585b24b0..530a5831a 100644 --- a/sda/internal/config/config.go +++ b/sda/internal/config/config.go @@ -669,7 +669,6 @@ func configS3Storage(prefix string) storage.S3Conf { // Defaults (move to viper?) - s3.Port = 443 s3.Region = "us-east-1" s3.NonExistRetryTime = 2 * time.Minute