From 0868747dfc6a30fc61826ea19271fc5955f4f8dc Mon Sep 17 00:00:00 2001 From: Daniel Podwysocki <48068081+danielpodwysocki@users.noreply.github.com> Date: Wed, 14 Feb 2024 18:59:33 +0100 Subject: [PATCH] fix #239 , use python-style templating instead of Jinja in all drivers login_cmd_template This file assumes Jinja templating for the port parameter and passes a Jinja-style "{{ port }}". https://github.com/ansible/molecule/blob/main/src/molecule/command/login.py#L105 When it reaches molecule, it is subsituted in this file and is done by python calling `.format()` on the string. That causes it to not render correctly and gives users issues running molecule login. ref: https://github.com/ansible-community/molecule-plugins/issues/239 Fixed all affected plugins. --- src/molecule_plugins/azure/driver.py | 8 ++++---- src/molecule_plugins/ec2/driver.py | 8 ++++---- src/molecule_plugins/gce/driver.py | 8 ++++---- src/molecule_plugins/vagrant/driver.py | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/molecule_plugins/azure/driver.py b/src/molecule_plugins/azure/driver.py index 5550604d..dbed9499 100644 --- a/src/molecule_plugins/azure/driver.py +++ b/src/molecule_plugins/azure/driver.py @@ -90,10 +90,10 @@ def login_cmd_template(self): connection_options = " ".join(self.ssh_connection_options) return ( - "ssh {{address}} " - "-l {{user}} " - "-p {{port}} " - "-i {{identity_file}} " + "ssh {address} " + "-l {user} " + "-p {port} " + "-i {identity_file} " f"{connection_options}" ) diff --git a/src/molecule_plugins/ec2/driver.py b/src/molecule_plugins/ec2/driver.py index fdefc810..53355b2c 100644 --- a/src/molecule_plugins/ec2/driver.py +++ b/src/molecule_plugins/ec2/driver.py @@ -195,10 +195,10 @@ def login_cmd_template(self): connection_options = " ".join(self.ssh_connection_options) return ( - "ssh {{address}} " - "-l {{user}} " - "-p {{port}} " - "-i {{identity_file}} " + "ssh {address} " + "-l {user} " + "-p {port} " + "-i {identity_file} " f"{connection_options}" ) diff --git a/src/molecule_plugins/gce/driver.py b/src/molecule_plugins/gce/driver.py index 197334b7..9f6da57f 100644 --- a/src/molecule_plugins/gce/driver.py +++ b/src/molecule_plugins/gce/driver.py @@ -94,10 +94,10 @@ def login_cmd_template(self): connection_options = " ".join(self.ssh_connection_options) return ( - "ssh {{address}} " - "-l {{user}} " - "-p {{port}} " - "-i {{identity_file}} " + "ssh {address} " + "-l {user} " + "-p {port} " + "-i {identity_file} " f"{connection_options}" ) diff --git a/src/molecule_plugins/vagrant/driver.py b/src/molecule_plugins/vagrant/driver.py index aed8693e..401417b5 100644 --- a/src/molecule_plugins/vagrant/driver.py +++ b/src/molecule_plugins/vagrant/driver.py @@ -149,10 +149,10 @@ def login_cmd_template(self): connection_options = " ".join(self.ssh_connection_options) return ( - "ssh {{address}} " - "-l {{user}} " - "-p {{port}} " - "-i {{identity_file}} " + "ssh {address} " + "-l {user} " + "-p {port} " + "-i {identity_file} " f"{connection_options}" )