Skip to content

Patch terraform to 1.5 #83

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Patch terraform to 1.5 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
966a1f8
21.7.3.0.1
sankara911 Aug 19, 2025
02cb2b1
patch file for updating the terraform version to 1.5
sankara911 Nov 13, 2025
459b4f6
Merge branch 'main' into snh-patch-terraform
sankara911 Nov 13, 2025
256b890
update the ecpu patch file from releases zip to branch
sankara911 Nov 14, 2025
82afd82
Merge branch 'main' into patch-terraform
sankara911 Nov 28, 2025
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
12 changes: 12 additions & 0 deletions scripts/ecpupatch/ecpu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- main.tf 2025-09-02 17:41:14
+++ main.tf.new 2025-09-02 17:59:54
@@ -103,7 +103,8 @@
resource "oci_database_autonomous_database" "autonomous_database" {
admin_password = local.bootstrap_password
compartment_id = var.compartment_id
- cpu_core_count = "1"
+ compute_model = "ECPU"
+ compute_count = "4.0"
data_storage_size_in_tbs = "1"
db_name = var.db_name
db_workload = var.db_workload == "Autonomous Transaction Processing" ? "OLTP" : "DW"
17 changes: 0 additions & 17 deletions scripts/ecpupatch/patch-DB-model.sh
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions scripts/ecpupatch/readme.txt
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions scripts/patchtfversion/update-tf-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/versions.tf
+++ b/versions.tf
@@ -3,7 +3,7 @@
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

terraform {
- required_version = "~> 1.0"
+ required_version = "~> 1.5"
required_providers {
local = {
source = "hashicorp/local"
4 changes: 2 additions & 2 deletions terraform/essbase.auto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Listing details for the Essbase custom image for Bring Your Own License.
## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
essbase_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
essbase_listing_resource_version = "21.7.2.0.1_250530"
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaa3bsrlznlhabomte5nj6cvo5rfbneqsiaqt7vur7pi5x6bp6x72ya"
essbase_listing_resource_version = "21.7.3.0.1_250805"
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaagpq4a3lxwmdnmykcspwoys222k67xpaqj2visggof6atkfzqiotq"
4 changes: 2 additions & 2 deletions terraform/essbase.auto.tfvars.ucm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Listing details for the Essbase custom image.
# The resource_id values here should match the build script and oci_images.tf
essbase_listing_id="ocid1.appcataloglisting.oc1..aaaaaaaanstxnoz6uttexhw5jfpqhu4gkwsp2ebmw4i2p7gkq65sr3e7z4gq"
essbase_listing_resource_version="21.7.2.0.1_250530"
essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaa3z4j3t5ctqkqvqzzquor7koo6kged4zxyrc4wnpulvi26pbbb7ta"
essbase_listing_resource_version="21.7.3.0.1_250805"
essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaalujvgnvdkyjbof4ve7mc6v7t3v34r46mpcet5yufy7a7kskwwhoq"
4 changes: 3 additions & 1 deletion terraform/modules/database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,15 @@ resource "oci_core_network_security_group_security_rule" "vcn_nsg_rule3" {
resource "oci_database_autonomous_database" "autonomous_database" {
admin_password = local.bootstrap_password
compartment_id = var.compartment_id
cpu_core_count = "1"
# cpu_core_count = "1" # parameter invalid if compute_model is ECPU
data_storage_size_in_tbs = "1"
db_name = var.db_name
db_workload = var.db_workload == "Autonomous Transaction Processing" ? "OLTP" : "DW"
is_auto_scaling_enabled = true
subnet_id = local.secure_count == 1 ? var.subnet_id : null
nsg_ids = local.secure_count == 1 ? [oci_core_network_security_group.vcn_nsg[0].id] : null
compute_model = "ECPU"
compute_count = "4.0" # Minimum value is 1 for ECPU model. 1 OCPU = 4 ECPU

display_name = "${var.display_name_prefix}-database"
freeform_tags = var.freeform_tags
Expand Down