From de057533fbfcea4bc39e335d5ee4deb55c8e9d0e Mon Sep 17 00:00:00 2001 From: Yevhen Sukhomud Date: Mon, 20 Jun 2022 19:14:30 +0700 Subject: [PATCH] Reverted changes in SshBastionContainer (#13934) --- .../integrations/base/ssh/SshBastionContainer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/base/ssh/SshBastionContainer.java b/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/base/ssh/SshBastionContainer.java index f7acac0f0f5f2d..7b6032061ec777 100644 --- a/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/base/ssh/SshBastionContainer.java +++ b/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/base/ssh/SshBastionContainer.java @@ -40,9 +40,13 @@ public JsonNode getTunnelConfig(final SshTunnel.TunnelMethod tunnelMethod, final return Jsons.jsonNode(builderWithSchema .put("tunnel_method", Jsons.jsonNode(ImmutableMap.builder() - .put("tunnel_host", bastion.getHost()) + .put("tunnel_host", + Objects.requireNonNull(bastion.getContainerInfo().getNetworkSettings() + .getNetworks() + .get(((Network.NetworkImpl) network).getName()) + .getIpAddress())) .put("tunnel_method", tunnelMethod) - .put("tunnel_port", bastion.getFirstMappedPort()) + .put("tunnel_port", bastion.getExposedPorts().get(0)) .put("tunnel_user", SSH_USER) .put("tunnel_user_password", tunnelMethod.equals(SSH_PASSWORD_AUTH) ? SSH_PASSWORD : "") .put("ssh_key", tunnelMethod.equals(SSH_KEY_AUTH) ? bastion.execInContainer("cat", "var/bastion/id_rsa").getStdout() : "")