fix bastion ssh config extension

corpix · Aug 21, 2022 · 553c61d · 553c61d
1 parent 317a5c2
commit 553c61d
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/provider/provider.go b/provider/provider.go
@@ -304,23 +304,21 @@ func (p *Provider) NewSsh(resource ResourceBox) *Ssh {
 	bastionHost, _ := bastionSettings[KeySshHost].(string)
 	if bastionHost != "" {
 		bastionConfigMap := p.SshConfigMap(bastionSettings)
-		if bastionConfigMap.Len() > 0 {
-			// NOTE: base ssh configuration (ssh {}) extended with bastion ssh configuration (ssh { bastion {} })
-			extendedBastionConfigMap := configMap.Copy()
-			extendedBastionConfigMap.Extend(bastionConfigMap)
-
-			bastion := NewSsh(
-				SshOptionConfigMap(extendedBastionConfigMap),
-				SshOptionNonInteractive(),
-				SshOptionIORedirection("%h", "%p"),
-				SshOptionHost(bastionHost),
-			)
-			command, arguments, _ := bastion.Command()
-			configMap.Set(
-				SshConfigKeyProxyCommand,
-				strings.Join(append([]string{command}, arguments...), " "),
-			)
-		}
+		// NOTE: base ssh configuration (ssh {}) extended with bastion ssh configuration (ssh { bastion {} })
+		extendedBastionConfigMap := configMap.Copy()
+		extendedBastionConfigMap.Extend(bastionConfigMap)
+
+		bastion := NewSsh(
+			SshOptionConfigMap(extendedBastionConfigMap),
+			SshOptionNonInteractive(),
+			SshOptionIORedirection("%h", "%p"),
+			SshOptionHost(bastionHost),
+		)
+		command, arguments, _ := bastion.Command()
+		configMap.Set(
+			SshConfigKeyProxyCommand,
+			strings.Join(append([]string{command}, arguments...), " "),
+		)
 	}
 
 	if configMap.Len() > 0 {