Skip to content

Automation Toolkit Release v2024.4.1 #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Automation Toolkit Release v2024.4.1 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d97fb15
Update installToolkit.sh
xs2suruchi Sep 30, 2024
eb4d342
Update README.md
xs2suruchi Sep 30, 2024
976c812
Update README.md
xs2suruchi Sep 30, 2024
bea2389
Update installToolkit.sh
xs2suruchi Sep 30, 2024
0d88778
Automation Toolkit Release v2024.4.1
xs2suruchi Sep 30, 2024
99e1c90
Automation Toolkit Release v2024.4.1
xs2suruchi Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cd3_automation_toolkit/Storage/ObjectStorage/create_terraform_oss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cd3_automation_toolkit/Storage/ObjectStorage/export_terraform_oss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion cd3_automation_toolkit/user-scripts/terraform/modules/identity/identity-domain-user/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading