This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2410
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2410 by this push:
new c4fabf4 [DATALAB-2410]: changed variables usage
c4fabf4 is described below
commit c4fabf47d0be2005e883fa1553988801ac0ba2bf
Author: leonidfrolov <[email protected]>
AuthorDate: Thu Jun 10 16:44:47 2021 +0300
[DATALAB-2410]: changed variables usage
---
infrastructure-provisioning/terraform/bin/datalab.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/datalab.py
b/infrastructure-provisioning/terraform/bin/datalab.py
index 7ada59c..6a97ec4 100644
--- a/infrastructure-provisioning/terraform/bin/datalab.py
+++ b/infrastructure-provisioning/terraform/bin/datalab.py
@@ -294,8 +294,8 @@ class TerraformProvider:
params_str = get_args_string(tf_params)
command = ('terraform apply -auto-approve {} {}'
.format(self.no_color, params_str))
- logging.info('{} {}'.format(command, args_list[0]))
- Console.execute_to_command_line('{} {}'.format(command, args_list[1]))
+ logging.info('{} {}'.format(command, args_list[1]))
+ Console.execute_to_command_line('{} {}'.format(command, args_list[0]))
def destroy(self, tf_params, cli_args, keep_state_file=False):
"""Destroy terraform
@@ -312,8 +312,8 @@ class TerraformProvider:
params_str = get_args_string(tf_params)
command = ('terraform destroy -auto-approve {} {}'
.format(self.no_color, params_str))
- logging.info('{} {}'.format(command, args_list[0]))
- Console.execute_to_command_line('{} {}'.format(command, args_list[1]))
+ logging.info('{} {}'.format(command, args_list[1]))
+ Console.execute_to_command_line('{} {}'.format(command, args_list[0]))
if not keep_state_file:
state_file = tf_params['-state']
state_file_backup = tf_params['-state'] + '.backup'
@@ -807,18 +807,18 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
'-json ssn_k8s_nlb_dns_name'))
logging.info('apply ssn-helm-charts')
terraform_args = args.get('helm_charts')
- args_str = get_var_args_string(terraform_args)[0]
+ args_str = get_var_args_string(terraform_args)
with Console.ssh(self.ip, self.user_name, self.pkey_path) as conn:
with conn.cd('terraform/ssn-helm-charts/main'):
init = conn.run('terraform init').stdout.lower()
validate = conn.run('terraform validate').stdout.lower()
if 'success' not in init or 'success' not in validate:
raise TerraformProviderError
- command = ('terraform apply -auto-approve {} '
+ command = ('terraform apply -auto-approve '
'-var \'ssn_k8s_nlb_dns_name={}\''
- .format(args_str, nlb_dns_name))
- logging.info(command)
- conn.run(command)
+ .format(nlb_dns_name))
+ logging.info('{} {}'.format(command, args_str[1]))
+ conn.run('{} {}'.format(command, args_str[0]))
output = ' '.join(conn.run('terraform output -json')
.stdout.split())
self.fill_args_from_dict(json.loads(output))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
