From 75dc56ab5b90efd9f0179bd837694ad56611238c Mon Sep 17 00:00:00 2001 From: Marc Gueury Date: Fri, 12 Jan 2024 15:55:47 +0100 Subject: [PATCH 1/4] v2.0 --- py_oci_starter.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/py_oci_starter.py b/py_oci_starter.py index 0e31bf65..b95c43e3 100755 --- a/py_oci_starter.py +++ b/py_oci_starter.py @@ -114,7 +114,7 @@ def allowed_options(): '-mode': {CLI, GIT, ZIP}, '-shape': {'amd','freetier_amd','ampere'}, '-db_install': {'default', 'shared_compute', 'kubernetes'}, - '-tls': {'none', 'new_http_01', 'new_dns_01', 'existing_ocid', 'existing_dir'} + '-tls': {'none', 'new_http_01', 'new_dns_01', 'existing', 'existing_ocid', 'existing_dir'} } def check_values(): @@ -577,7 +577,8 @@ def tf_var_comment(contents, param): comments = { 'auth_token': ['See doc: https://docs.oracle.com/en-us/iaas/Content/Registry/Tasks/registrygettingauthtoken.htm'], 'db_password': ['Min length 12 characters, 2 lowercase, 2 uppercase, 2 numbers, 2 special characters. Ex: LiveLab__12345', 'If not filled, it will be generated randomly during the first build.'], - 'license': ['BRING_YOUR_OWN_LICENSE or LICENSE_INCLUDED'] + 'license': ['BRING_YOUR_OWN_LICENSE or LICENSE_INCLUDED'], + 'certificate_ocid': ['OCID of the OCI Certificate','If the is not imported in OCI yet, use instead TF_VAR_certificate_dir=', '# export TF_VAR_certificate_dir="__TO_FILL__"'] }.get(param) if comments is not None: b=True From a8af21a6924326602e13d22717e4663f5a04fe11 Mon Sep 17 00:00:00 2001 From: Marc Gueury Date: Fri, 12 Jan 2024 15:56:17 +0100 Subject: [PATCH 2/4] v2.0 --- py_oci_starter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py_oci_starter.py b/py_oci_starter.py index b95c43e3..ecd4c689 100755 --- a/py_oci_starter.py +++ b/py_oci_starter.py @@ -114,7 +114,7 @@ def allowed_options(): '-mode': {CLI, GIT, ZIP}, '-shape': {'amd','freetier_amd','ampere'}, '-db_install': {'default', 'shared_compute', 'kubernetes'}, - '-tls': {'none', 'new_http_01', 'new_dns_01', 'existing', 'existing_ocid', 'existing_dir'} + '-tls': {'none', 'new_http_01', 'new_dns_01', 'existing_ocid', 'existing_dir'} } def check_values(): From e4fc8dca6d771053b2fcfb6d7323f2698f6d0438 Mon Sep 17 00:00:00 2001 From: Marc Gueury Date: Fri, 12 Jan 2024 16:31:56 +0100 Subject: [PATCH 3/4] v2.0 --- py_oci_starter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py_oci_starter.py b/py_oci_starter.py index ecd4c689..18ce48e7 100755 --- a/py_oci_starter.py +++ b/py_oci_starter.py @@ -578,7 +578,7 @@ def tf_var_comment(contents, param): 'auth_token': ['See doc: https://docs.oracle.com/en-us/iaas/Content/Registry/Tasks/registrygettingauthtoken.htm'], 'db_password': ['Min length 12 characters, 2 lowercase, 2 uppercase, 2 numbers, 2 special characters. Ex: LiveLab__12345', 'If not filled, it will be generated randomly during the first build.'], 'license': ['BRING_YOUR_OWN_LICENSE or LICENSE_INCLUDED'], - 'certificate_ocid': ['OCID of the OCI Certificate','If the is not imported in OCI yet, use instead TF_VAR_certificate_dir=', '# export TF_VAR_certificate_dir="__TO_FILL__"'] + 'certificate_ocid': ['OCID of the OCI Certificate','If the is not imported in OCI yet, use instead TF_VAR_certificate_dir=', 'export TF_VAR_certificate_dir="__TO_FILL__"'] }.get(param) if comments is not None: b=True @@ -587,7 +587,7 @@ def tf_var_comment(contents, param): b=False contents.append(f'# {get_tf_var(param)} : {comment}') else: - contents.append(f'# {comment}') + contents.append(f'# {comment}') From 52117b22f6c190e86b2c7069a9109f31cd9441e8 Mon Sep 17 00:00:00 2001 From: Marc Gueury Date: Sat, 13 Jan 2024 13:39:01 +0100 Subject: [PATCH 4/4] v2.0 --- py_oci_starter.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/py_oci_starter.py b/py_oci_starter.py index 18ce48e7..d3bd082e 100755 --- a/py_oci_starter.py +++ b/py_oci_starter.py @@ -171,7 +171,8 @@ def db_rules(): 'pluggable': 'system', 'mysql': 'root', 'psql': 'postgres', 'none': ''} params['db_user'] = default_users[params['db_type']] if params.get('db_type')=='none': - params.pop('db_password') + params.pop('db_user') + params.pop('db_password') # shared_compute is valid only in compute deployment if params.get('db_install') == "shared_compute": if params.get('deploy_type')!='compute': @@ -578,7 +579,7 @@ def tf_var_comment(contents, param): 'auth_token': ['See doc: https://docs.oracle.com/en-us/iaas/Content/Registry/Tasks/registrygettingauthtoken.htm'], 'db_password': ['Min length 12 characters, 2 lowercase, 2 uppercase, 2 numbers, 2 special characters. Ex: LiveLab__12345', 'If not filled, it will be generated randomly during the first build.'], 'license': ['BRING_YOUR_OWN_LICENSE or LICENSE_INCLUDED'], - 'certificate_ocid': ['OCID of the OCI Certificate','If the is not imported in OCI yet, use instead TF_VAR_certificate_dir=', 'export TF_VAR_certificate_dir="__TO_FILL__"'] + 'certificate_ocid': ['OCID of the OCI Certificate','If the certificate is not imported in OCI, use instead TF_VAR_certificate_dir=', 'export TF_VAR_certificate_dir="__TO_FILL__"'] }.get(param) if comments is not None: b=True