Merge remote-tracking branch 'bb/master' into release_gh

Author: Maxrovr

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 7.18.0 (September 10, 2025)
+
+### Added
+- Support for Support resource locking for Email Delivery
+- Support for OCI FSS IPv6 Support
+
+### Bug Fix
+- TERSI-7599: 08/11-NewDev - UDX fixes only to allow ENTERPRISE_EDITION_EXTREME_PERFORMANCE
+
 ## 7.17.0 (September 4, 2025)
 
 ### Added
@@ -8,52 +17,6 @@
 - Support for dbmulticloud GCP and azure fixes
 - Prod Endpoint for AI Vision Service Stream Video Processing
 - Support for AI Vision Service Stream Video Processing
-- README.md of service examples with magic button
-- Support for Compute: GPU Memory Fabric API Update - availableHostCount
-- Support for Mixed License, Recovery Point Time, filter deployments by type
-- Support for E6 - Standard x86 shape for BaseDB on DRCC Butterfly | BaseDB
-- Support for OCI Generative AI Agent - CY25 Q2 Release
-- Support for New managed service leveraging full capabilities and performance potential of raw Apache Kafka
-- Support for Oracle 19C Database in Exadata Database Service on Exascale Infrastructure (ExaDB-XS)
-- MySQL database support for FSDR
-- Data Safe Support for Target Database Group
-- README.md of service examples with magic button
-- Support for APIGW Resource Locking
-- Support for IPv6-Prefix-for-Subnet & Flexible CIDR support for secondary IPs on VNIC Multi-Prefix-for-Subnet & Flexible CIDR support for secondary IP addresses on VNIC
-- Support for PDB Snapshots on ExaDB-XS
-- README.md of service examples with magic button
-- Description files for service examples
-- Support for scimQuery field for findingAnalytics API in data safe
-- Support for ODSC - Distributed Training V2 (DTv2)
-- Support for OCI Cache - Customer Managed Config Sets
-- Support for GoldenGate Connections Release 8
-- Support for OL8 migration for Devops Build runner
-- Support for fields computeClusterId and placementConstraintDetails in Instance Configuration Launch Details
-- Max Parallel Chunks configurable via env
-- Formatting changes in files
-- Support for ODSC - Enable Burstable for Data Science Notebooks, ML Jobs, and ML Pipeline
-- Support for APM - Scheduled Backend Queries - UI & API
-- Support for Ops Insights support for ADB@ExaCC
-- oprional parameters to import
-- Support for API Platform Cloud Service
-- Support for OCI Data Science Multi Model Deployment Experience
-- Support for Design/Implement CPU architecture agnostic configurations
-- Support for Secrets in Vault - Cross Region Replication Feature
-- Support for APM - Agent & Configurations Updates
-- README.md of service examples with magic button
-- Description files for service examples
-
-### Bug Fix
-- Fix using security_attributes in UpdateInstance and add tests
-- remove usages of freeformTags and definedTags from ApplianceImageSummary
-- EXACC update fix to send destionationDetails
-- Resolved errors with VCN update requests for IPv6 CIDRs
-- for Create route table when route rule contains route_type.
-- Api Gateway terraform correction to align with public sdk resource locking changes
-- Adbs switchover logic and secret Id bug
-- Fix for VCN is_ipv6enabled plan drift on apply.
-- ed - Pagination for resource discovery of private zones
-- Update domain override logic to get realm domain from oci-go-sdk instead of using regex to extract realmn domain
 
 ## 7.16.0 (August 27, 2025)
 

examples/database/db_systems/db_vm/storage_performance/variables.tf

@@ -35,5 +35,5 @@ variable "shape_type" {
 }
 
 variable "database_edition" {
-  default = "ENTERPRISE_EDITION_DEVELOPER"
+  default = "ENTERPRISE_EDITION_EXTREME_PERFORMANCE"
 }

examples/email/emaildomain.tf

@@ -18,3 +18,7 @@ resource "oci_email_email_domain" "test_email_domain" {
 
   depends_on = [random_id.random_email_domain]
 }
+
+data "oci_email_email_domain" "test_email_domain" {
+	email_domain_id = oci_email_email_domain.test_email_domain.id
+}

examples/storage/fss/mount_target.tf

@@ -30,6 +30,23 @@ resource "oci_file_storage_mount_target" "my_mount_target_1" {
   is_lock_override = var.is_lock_override
 }
 
+resource "oci_file_storage_mount_target" "my_mount_target_3" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  subnet_id           = oci_core_subnet.my_subnet1.id
+
+  #Optional
+  display_name = var.mount_target_3_display_name
+  ip_address = cidrhost(oci_core_vcn.my_vcn.ipv6cidr_blocks[0], 21)
+  freeform_tags = {
+    "Department" = "FinanceTest"
+  }
+  requested_throughput = "1"
+
+  nsg_ids = [oci_core_network_security_group.test_network_security_group.id]
+}
+
 resource "oci_file_storage_mount_target" "my_mount_target_2" {
   #Required
   availability_domain = data.oci_identity_availability_domain.ad.name

examples/storage/fss/network.tf

@@ -6,6 +6,7 @@ resource "oci_core_vcn" "my_vcn" {
   compartment_id = var.compartment_ocid
   display_name   = "myvcn"
   dns_label      = "myvcn"
+  is_ipv6enabled = true
 }
 
 resource "oci_core_internet_gateway" "my_internet_gateway" {
@@ -38,6 +39,19 @@ resource "oci_core_subnet" "my_subnet" {
   route_table_id      = oci_core_route_table.my_route_table.id
 }
 
+resource "oci_core_subnet" "my_subnet1" {
+  depends_on          = [oci_core_network_security_group.test_network_security_group]
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  cidr_block          = var.my_subnet1_cidr
+  display_name        = "mysubnet1"
+  dns_label           = "mysubnet1"
+  compartment_id      = var.compartment_ocid
+  vcn_id              = oci_core_vcn.my_vcn.id
+  security_list_ids   = [oci_core_security_list.my_security_list.id]
+  route_table_id      = oci_core_route_table.my_route_table.id
+  ipv6cidr_blocks = ["${substr(oci_core_vcn.my_vcn.ipv6cidr_blocks[0], 0, length(oci_core_vcn.my_vcn.ipv6cidr_blocks[0]) - 2)}${64}"]
+}
+
 resource "oci_core_network_security_group" "test_network_security_group" {
   #Required
   compartment_id = var.compartment_ocid

examples/storage/fss/variables.tf

@@ -34,6 +34,10 @@ variable "my_subnet_cidr" {
   default = "10.0.1.0/24"
 }
 
+variable "my_subnet1_cidr" {
+  default = "10.0.2.0/24"
+}
+
 variable "file_system_1_display_name" {
   default = "my_fs_1"
 }
@@ -78,6 +82,10 @@ variable "mount_target_2_display_name" {
   default = "my_mount_target_2"
 }
 
+variable "mount_target_3_display_name" {
+  default = "my_mount_target_3"
+}
+
 variable "export_path_fs1_mt1" {
   default = "/myfsspaths/fs1/path1"
 }

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/hashicorp/terraform-plugin-mux v0.18.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
 	github.com/hashicorp/terraform-plugin-testing v1.9.0
-	github.com/oracle/oci-go-sdk/v65 v65.99.2
+	github.com/oracle/oci-go-sdk/v65 v65.100.0
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/mod v0.24.0
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -194,6 +194,8 @@ github.com/oracle/oci-go-sdk/v65 v65.99.1 h1:fWNC7Ef1XQ3m7QyWa7848eHnGR8c4O3+t9k
 github.com/oracle/oci-go-sdk/v65 v65.99.1/go.mod h1:RGiXfpDDmRRlLtqlStTzeBjjdUNXyqm3KXKyLCm3A/Q=
 github.com/oracle/oci-go-sdk/v65 v65.99.2 h1:W1HzD28r+xqqT57FpH7ymOFE3BM/p4J/Ia1SfDf55nM=
 github.com/oracle/oci-go-sdk/v65 v65.99.2/go.mod h1:RGiXfpDDmRRlLtqlStTzeBjjdUNXyqm3KXKyLCm3A/Q=
+github.com/oracle/oci-go-sdk/v65 v65.100.0 h1:pORdvqim3VW6X6g/Esi7/raCzDHpQ4BuREOoj5TS6bg=
+github.com/oracle/oci-go-sdk/v65 v65.100.0/go.mod h1:RGiXfpDDmRRlLtqlStTzeBjjdUNXyqm3KXKyLCm3A/Q=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
 github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=

internal/globalvar/version.go

@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "7.17.0"
-const ReleaseDate = "2025-09-04"
+const Version = "7.18.0"
+const ReleaseDate = "2025-09-10"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

internal/integrationtest/database_db_system_storage_performance_test.go

@@ -26,6 +26,12 @@ var (
 		"shape_type":         acctest.Representation{RepType: acctest.Required, Create: `AMPERE_FLEX_A1`},
 		"database_edition":   acctest.Representation{RepType: acctest.Required, Create: `ENTERPRISE_EDITION_DEVELOPER`},
 	}
+
+	dbSystemStoragePerformanceDataSourceRepresentationWithEEEP = map[string]interface{}{
+		"storage_management": acctest.Representation{RepType: acctest.Required, Create: `LVM`},
+		"shape_type":         acctest.Representation{RepType: acctest.Required, Create: `AMPERE_FLEX_A1`},
+		"database_edition":   acctest.Representation{RepType: acctest.Required, Create: `ENTERPRISE_EDITION_EXTREME_PERFORMANCE`},
+	}
 )
 
 // issue-routing-tag: database/default
@@ -70,5 +76,20 @@ func TestDatabaseDbSystemStoragePerformanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "database_edition", "ENTERPRISE_EDITION_DEVELOPER"),
 			),
 		},
+
+		// verify datasource with ENTERPRISE_EDITION_EXTREME_PERFORMANCE
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_database_db_system_storage_performances", "test_db_system_storage_performances", acctest.Required, acctest.Create, dbSystemStoragePerformanceDataSourceRepresentationWithEEEP),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(datasourceName, "db_system_storage_performances.#"),
+				resource.TestCheckResourceAttr(datasourceName, "db_system_storage_performances.#", "1"),
+				resource.TestCheckResourceAttrSet(datasourceName, "db_system_storage_performances.0.data_storage_performance_list.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "db_system_storage_performances.0.reco_storage_performance_list.#"),
+				resource.TestCheckResourceAttr(datasourceName, "db_system_storage_performances.0.shape_type", "AMPERE_FLEX_A1"),
+				resource.TestCheckResourceAttrSet(datasourceName, "database_edition"),
+				resource.TestCheckResourceAttr(datasourceName, "database_edition", "ENTERPRISE_EDITION_EXTREME_PERFORMANCE"),
+			),
+		},
 	})
 }