You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/06/10 13:40:29 UTC
[incubator-datalab] branch DATALAB-2410 updated: [DATALAB-2410]:
changed variables usage
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 5e2b9b1 [DATALAB-2410]: changed variables usage
5e2b9b1 is described below
commit 5e2b9b1f2815fc1fed3fde11d1b18d61be60acb4
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Jun 10 16:40:16 2021 +0300
[DATALAB-2410]: changed variables usage
---
.../terraform/bin/datalab.py | 24 ++++++++--------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/datalab.py b/infrastructure-provisioning/terraform/bin/datalab.py
index 059139f..7ada59c 100644
--- a/infrastructure-provisioning/terraform/bin/datalab.py
+++ b/infrastructure-provisioning/terraform/bin/datalab.py
@@ -291,15 +291,11 @@ class TerraformProvider:
"""
logging.info('terraform apply')
args_list = get_var_args_string(cli_args)
- args_str_plain = args_list[0]
- args_str_hidden = args_list[1]
params_str = get_args_string(tf_params)
- command_plain = ('terraform apply -auto-approve {} {} {}'
- .format(self.no_color, params_str, args_str_plain))
- command_hidden = ('terraform apply -auto-approve {} {} {}'
- .format(self.no_color, params_str, args_str_hidden))
- logging.info(command_hidden)
- Console.execute_to_command_line(command_plain)
+ 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]))
def destroy(self, tf_params, cli_args, keep_state_file=False):
"""Destroy terraform
@@ -313,15 +309,11 @@ class TerraformProvider:
"""
logging.info('terraform destroy')
args_list = get_var_args_string(cli_args)
- args_str_plain = args_list[0]
- args_str_hidden = args_list[1]
params_str = get_args_string(tf_params)
- command_plain = ('terraform destroy -auto-approve {} {} {}'
- .format(self.no_color, params_str, args_str_plain))
- command_hidden = ('terraform destroy -auto-approve {} {} {}'
- .format(self.no_color, params_str, args_str_hidden))
- logging.info(command_hidden)
- Console.execute_to_command_line(command_plain)
+ 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]))
if not keep_state_file:
state_file = tf_params['-state']
state_file_backup = tf_params['-state'] + '.backup'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org