Skip to content

JCS-14035 - Fail to get password expiry date when using connect string #225

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 1 commit into from
Sep 26, 2023
Merged

JCS-14035 - Fail to get password expiry date when using connect string #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion terraform/modules/validators/oci_db_validators.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ locals {
missing_oci_db_compartment_id = (var.is_oci_db && !local.has_oci_db_compartment_id)
missing_oci_db_database_id = (var.is_oci_db && !local.has_oci_db_database_id)

missing_oci_db_pdb_service_name = (var.is_oci_db && !local.has_oci_db_pdb_service_name)
missing_oci_db_pdb_service_name = (var.is_oci_db || var.oci_db_connection_string != "") && !local.has_oci_db_pdb_service_name

missing_oci_db_vcn_id = (var.is_oci_db && var.oci_db_existing_vcn_id == "")

Expand Down
19 changes: 7 additions & 12 deletions terraform/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ groupings:
- ${atp_db_password_id}
- ${atp_db_level}
- ${use_oci_db_connection_string}
- ${oci_db_connection_string}
- ${oci_db_compartment_id}
- ${oci_db_dbsystem_id}
- ${oci_db_network_compartment_id}
Expand All @@ -58,7 +59,6 @@ groupings:
- ${oci_db_dbhome_major_version}
- ${oci_db_database_id}
- ${oci_db_pdb_service_name}
- ${oci_db_connection_string}
- ${oci_db_user}
- ${oci_db_secret_compartment_id}
- ${oci_db_password_id}
Expand Down Expand Up @@ -1853,18 +1853,13 @@ variables:
- ${orm_create_mode}
- ${add_JRF}
- and:
- or:
- ${create_new_vcn}
- not:
- ${use_oci_db_connection_string}
- and:
- not:
- eq:
- ${oci_db_dbhome_major_version}
- "11"
- not:
- eq:
- ${db_strategy}
- "Database System"
- ${oci_db_dbhome_major_version}
- "11"
- eq:
- ${db_strategy}
- "Database System"

type: string
required: true
Expand Down