From e456ba4b4f059edadcb50426da8ed77a1c905366 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 29 Oct 2021 08:22:17 +0300 Subject: refactor integration test ssh_host_key configuration --- internal/config/initializer.go | 1 - internal/ssh/server/hostkey.go | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/config/initializer.go b/internal/config/initializer.go index f1f9b9b..2f4e7cc 100644 --- a/internal/config/initializer.go +++ b/internal/config/initializer.go @@ -83,7 +83,6 @@ func (in *initializer) transformConfig(sourceProcess source.Source, args *Args, func (in *initializer) processEnvVars() { if Env("DTAIL_INTEGRATION_TEST_RUN_MODE") { os.Setenv("DTAIL_HOSTNAME_OVERRIDE", "integrationtest") - in.Server.HostKeyFile = "./ssh_host_key" } } diff --git a/internal/ssh/server/hostkey.go b/internal/ssh/server/hostkey.go index 33bd4e8..4844d36 100644 --- a/internal/ssh/server/hostkey.go +++ b/internal/ssh/server/hostkey.go @@ -12,6 +12,9 @@ import ( // PrivateHostKey retrieves the private server RSA host key. func PrivateHostKey() []byte { hostKeyFile := config.Server.HostKeyFile + if config.Env("DTAIL_INTEGRATION_TEST_RUN_MODE") { + hostKeyFile = "./ssh_host_key" + } _, err := os.Stat(hostKeyFile) if os.IsNotExist(err) { -- cgit v1.2.3