merge

1 files changed, 25 insertions, 12 deletions

diff --git a/internal/ssh/client/authmethods.go b/internal/ssh/client/authmethods.go
index 87d40d8..65fec1f 100644
--- a/internal/ssh/client/authmethods.go
+++ b/internal/ssh/client/authmethods.go
@@ -26,6 +26,22 @@ func InitSSHAuthMethods(sshAuthMethods []gossh.AuthMethod,
 	return initKnownHostsAuthMethods(trustAllHosts, throttleCh, privateKeyPath)
 }
 
+func initIntegrationTestKnownHostsAuthMethods() []gossh.AuthMethod {
+	var sshAuthMethods []gossh.AuthMethod
+	privateKeyPath := "./id_rsa"
+
+	GeneratePrivatePublicKeyPairIfNotExists(privateKeyPath, 4096)
+	authMethod, err := ssh.PrivateKey(privateKeyPath)
+	if err != nil {
+		dlog.Client.FatalPanic("Unable to use private SSH key", privateKeyPath, err)
+	}
+
+	sshAuthMethods = append(sshAuthMethods, authMethod)
+	dlog.Client.Debug("initKnownHostsAuthMethods",
+		"Added path to list of auth methods, not adding further methods", privateKeyPath)
+	return sshAuthMethods
+}
+
 func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{},
 	privateKeyPath string) ([]gossh.AuthMethod, HostKeyCallback) {
 
@@ -40,17 +56,19 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{},
 	if err != nil {
 		dlog.Client.FatalPanic(knownHostsFile, err)
 	}
-
 	dlog.Client.Debug("initKnownHostsAuthMethods", "Added known hosts file path", knownHostsFile)
 
-	// First try to read custom private key path.
+	if config.Env("DTAIL_INTEGRATION_TEST_RUN_MODE") {
+		return initIntegrationTestKnownHostsAuthMethods(), knownHostsCallback
+	}
+
+	// Try to read custom private key path.
 	if privateKeyPath != "" {
 		authMethod, err := ssh.PrivateKey(privateKeyPath)
 		if err == nil {
 			sshAuthMethods = append(sshAuthMethods, authMethod)
 			dlog.Client.Debug("initKnownHostsAuthMethods",
-				"Added path to list of auth methods, not adding further methods",
-				privateKeyPath)
+				"Added path to list of auth methods, not adding further methods", privateKeyPath)
 			return sshAuthMethods, knownHostsCallback
 		}
 		dlog.Client.FatalPanic("Unable to use private SSH key", privateKeyPath, err)
@@ -64,8 +82,7 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{},
 			"to list of auth methods, not adding further methods")
 		return sshAuthMethods, knownHostsCallback
 	}
-	dlog.Client.Debug("initKnownHostsAuthMethods",
-		"Unable to init SSH Agent auth method", err)
+	dlog.Client.Debug("initKnownHostsAuthMethods", "Unable to init SSH Agent auth method", err)
 
 	// Third, try Linux/UNIX default key paths
 	privateKeyPath = os.Getenv("HOME") + "/.ssh/id_rsa"
@@ -76,8 +93,7 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{},
 			"Added path to list of auth methods, not adding further methods", privateKeyPath)
 		return sshAuthMethods, knownHostsCallback
 	}
-	dlog.Client.Debug("initKnownHostsAuthMethods", "Unable to use private key",
-		privateKeyPath, err)
+	dlog.Client.Debug("initKnownHostsAuthMethods", "Unable to use private key", privateKeyPath, err)
 
 	privateKeyPath = os.Getenv("HOME") + "/.ssh/id_dsa"
 	authMethod, err = ssh.PrivateKey(privateKeyPath)
@@ -97,10 +113,7 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{},
 		return sshAuthMethods, knownHostsCallback
 	}
 
-	dlog.Client.Debug("initKnownHostsAuthMethods", "Unable to use private key",
-		privateKeyPath, err)
-
-	dlog.Client.FatalPanic("Unable to find private SSH key information")
+	dlog.Client.FatalPanic("Unable to find private SSH key information", privateKeyPath, err)
 	// Never reach this point.
 	return sshAuthMethods, knownHostsCallback
 }