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:31:22 UTC
[incubator-datalab] branch DATALAB-2410 updated: [DATALAB-2410]:
added hidden strings
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 1b1943f [DATALAB-2410]: added hidden strings
1b1943f is described below
commit 1b1943ff37697da06aba7c87a3f31a749137572a
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Jun 10 16:31:08 2021 +0300
[DATALAB-2410]: added hidden strings
---
.../terraform/bin/datalab.py | 35 ++++++++++++----------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/datalab.py b/infrastructure-provisioning/terraform/bin/datalab.py
index c7d7b9a..8795237 100644
--- a/infrastructure-provisioning/terraform/bin/datalab.py
+++ b/infrastructure-provisioning/terraform/bin/datalab.py
@@ -109,11 +109,9 @@ def get_var_args_string(cli_args):
for key, value in args:
if key in ["secret_access_key", "access_key_id", "ldap_host", "ldap_user", "ldap_bind_creds", "mongo_password"]:
value = '*****'
- print(key + '=' + value)
args_hidden = list()
args_hidden.append("-var '{0}={1}'".format(key, value))
- logging.info(' '.join(args_hidden))
- return ' '.join(args_plain)
+ return [ ' '.join(args_plain), ' '.join(args_hidden)]
def get_args_string(cli_args):
@@ -292,13 +290,16 @@ class TerraformProvider:
None
"""
logging.info('terraform apply')
-
- args_str = get_var_args_string(cli_args)
+ 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 = ('terraform apply -auto-approve {} {} {}'
- .format(self.no_color, params_str, args_str))
- logging.info(command)
- Console.execute_to_command_line(command)
+ 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)
def destroy(self, tf_params, cli_args, keep_state_file=False):
"""Destroy terraform
@@ -311,12 +312,16 @@ class TerraformProvider:
None
"""
logging.info('terraform destroy')
- args_str = get_var_args_string(cli_args)
+ 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 = ('terraform destroy -auto-approve {} {} {}'
- .format(self.no_color, params_str, args_str))
- logging.info(command)
- Console.execute_to_command_line(command)
+ 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)
if not keep_state_file:
state_file = tf_params['-state']
state_file_backup = tf_params['-state'] + '.backup'
@@ -810,7 +815,7 @@ 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)
+ args_str = get_var_args_string(terraform_args)[0]
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()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org