From d97fb1596739723fbba9bcb7b838b302c52138dc Mon Sep 17 00:00:00 2001 From: Suruchi Date: Mon, 30 Sep 2024 12:53:02 +0530 Subject: [PATCH 1/6] Update installToolkit.sh --- OCIWorkVMStack/scripts/installToolkit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCIWorkVMStack/scripts/installToolkit.sh b/OCIWorkVMStack/scripts/installToolkit.sh index 8a9e3889d..74911ec4e 100644 --- a/OCIWorkVMStack/scripts/installToolkit.sh +++ b/OCIWorkVMStack/scripts/installToolkit.sh @@ -66,7 +66,7 @@ fi sudo podman --version >> $logfile 2>&1 echo "***Download Toolkit***" >> $logfile 2>&1 -sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git $toolkit_dir >> $logfile 2>&1 +sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop $toolkit_dir >> $logfile 2>&1 stop_exec curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/ -o /tmp/metadata.json From eb4d3424fd11b982801f60fbdf14577d72e667d5 Mon Sep 17 00:00:00 2001 From: Suruchi Date: Mon, 30 Sep 2024 12:53:25 +0530 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11bbc062f..a5e603f24 100755 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Additionally, the toolkit also supports seamless resource management using OCI D 🚀 Click the below button to quickly launch CD3 toolkit container in Oracle Cloud and start managing your Infra as Code.
-[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/main.zip) +[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/develop.zip)
From 976c8129eba766e42c8db24bf5298169001924f5 Mon Sep 17 00:00:00 2001 From: Suruchi Date: Mon, 30 Sep 2024 17:19:51 +0530 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5e603f24..11bbc062f 100755 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Additionally, the toolkit also supports seamless resource management using OCI D 🚀 Click the below button to quickly launch CD3 toolkit container in Oracle Cloud and start managing your Infra as Code.
-[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/develop.zip) +[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/main.zip)
From bea2389f492dac6191cfbb2f8a68e8353c1f8a5c Mon Sep 17 00:00:00 2001 From: Suruchi Date: Mon, 30 Sep 2024 17:20:31 +0530 Subject: [PATCH 4/6] Update installToolkit.sh --- OCIWorkVMStack/scripts/installToolkit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCIWorkVMStack/scripts/installToolkit.sh b/OCIWorkVMStack/scripts/installToolkit.sh index 74911ec4e..8a9e3889d 100644 --- a/OCIWorkVMStack/scripts/installToolkit.sh +++ b/OCIWorkVMStack/scripts/installToolkit.sh @@ -66,7 +66,7 @@ fi sudo podman --version >> $logfile 2>&1 echo "***Download Toolkit***" >> $logfile 2>&1 -sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop $toolkit_dir >> $logfile 2>&1 +sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git $toolkit_dir >> $logfile 2>&1 stop_exec curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/ -o /tmp/metadata.json From 0d887784ad6f4374708a272a8702b1b4e2e9a26b Mon Sep 17 00:00:00 2001 From: xs2suruchi Date: Mon, 30 Sep 2024 17:33:25 +0530 Subject: [PATCH 5/6] Automation Toolkit Release v2024.4.1 --- .../terraform/modules/identity/identity-domain-user/main.tf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cd3_automation_toolkit/user-scripts/terraform/modules/identity/identity-domain-user/main.tf b/cd3_automation_toolkit/user-scripts/terraform/modules/identity/identity-domain-user/main.tf index 0f12fef69..04c1e56c1 100644 --- a/cd3_automation_toolkit/user-scripts/terraform/modules/identity/identity-domain-user/main.tf +++ b/cd3_automation_toolkit/user-scripts/terraform/modules/identity/identity-domain-user/main.tf @@ -31,10 +31,14 @@ resource "oci_identity_domains_user" "user" { value = var.email verified = false } - emails { + dynamic "emails" { + for_each = var.recovery_email != null ?[1]:[] + content { type = "recovery" value = var.recovery_email +} } + dynamic "phone_numbers" { for_each = can(var.home_phone_number) && var.home_phone_number != null ? [var.home_phone_number] : [] content { From 99e1c90f1ff21118191a32482727f6a437e9f5bb Mon Sep 17 00:00:00 2001 From: xs2suruchi Date: Mon, 30 Sep 2024 18:49:09 +0530 Subject: [PATCH 6/6] Automation Toolkit Release v2024.4.1 --- .../Storage/ObjectStorage/create_terraform_oss.py | 2 ++ .../Storage/ObjectStorage/export_terraform_oss.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cd3_automation_toolkit/Storage/ObjectStorage/create_terraform_oss.py b/cd3_automation_toolkit/Storage/ObjectStorage/create_terraform_oss.py index ab77d99bb..8e842f039 100644 --- a/cd3_automation_toolkit/Storage/ObjectStorage/create_terraform_oss.py +++ b/cd3_automation_toolkit/Storage/ObjectStorage/create_terraform_oss.py @@ -289,10 +289,12 @@ def create_terraform_oss(inputfile, outdir, service_dir, prefix, ct): print( f"'{time_rule_locked}' is not in the correct format. It should be in the format 'dd-mm-yyyy'. The retention rules will not be processed.") continue + ''' else: print( f"'{time_rule_locked}' is not in the correct format. It should be in the format of 'YYYY-MM-DDThh:mm:ssZ' or 'YYYY-MM-DDThh:mm:ss.fffZ'. The retention rules will not be processed.") continue + ''' tempdict = {'retention_rule_display_name': retention_rule_display_name, 'time_unit': time_unit, diff --git a/cd3_automation_toolkit/Storage/ObjectStorage/export_terraform_oss.py b/cd3_automation_toolkit/Storage/ObjectStorage/export_terraform_oss.py index 425d1361f..11e9e15f4 100644 --- a/cd3_automation_toolkit/Storage/ObjectStorage/export_terraform_oss.py +++ b/cd3_automation_toolkit/Storage/ObjectStorage/export_terraform_oss.py @@ -236,11 +236,11 @@ def export_buckets(inputfile, outdir, service_dir, config, signer, ct, export_co rt_time_rule_locked = str(retention_policy.time_rule_locked) if rt_time_rule_locked != 'None' and rt_time_rule_locked != '': date_obj = parser.parse(rt_time_rule_locked) - rt_time_rule_locked = date_obj.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z" + # rt_time_rule_locked = date_obj.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z" + rt_time_rule_locked = (date_obj.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]).rstrip("0") + "Z" rt_data = rt_name + "::" + rt_time_amount + "::" + rt_time_unit + "::" + rt_time_rule_locked else: rt_data = rt_name + "::" + rt_time_amount + "::" + rt_time_unit - else: rt_data=rt_name + "::indefinite" retention_rule_data_list.append(rt_data)