Merge branch 'master' of ssh://bitbucket.oci.oraclecorp.com:7999/orc/terraform-provider into release_gh

Author: sagarp337

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 7.25.0 (November 4, 2025)
+
+### Added
+- Support for new service Data Intelligence Foundation
+- Support for VM Instance - Snapshot/Restore Read only
+- ZPR and PSA support
+- Support for IPA-Graceful Termination of Instance in Instance Pool
+
+### Bug Fix
+- make test compile failure
+
 ## 7.24.0 (October 29, 2025)
 
 ### Added

examples/database/db_systems/db_exadbxs/db_node_snapshot.tf

@@ -0,0 +1,53 @@
+// use oci_database_db_node_snapshot_management resource to create dbnode snapshot(s)
+resource "oci_database_db_node_snapshot_management" "test_db_node_snapshot_management" {
+  #Required
+  exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+  source_dbnode_ids = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.node_resource[*].node_id
+  name                = "snapshot-tf-test"
+  #Optional
+  defined_tags = {
+    "example-tag-namespace-all.example-tag" = "value"
+  }
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+  lifecycle {
+    ignore_changes = [defined_tags, freeform_tags]
+  }
+}
+
+// use oci_database_db_node_snapshot resource to mount / unmount / delete dbnode snapshot
+resource "oci_database_db_node_snapshot" "test_db_node_snapshot" {
+  #Required
+  dbnode_snapshot_id = oci_database_db_node_snapshot_management.test_db_node_snapshot_management.snapshots[0].id
+  mount_dbnode_id    = "null"
+}
+
+data "oci_database_db_node_snapshots" "test_db_node_snapshots" {
+  #Required
+  compartment_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.compartment_id
+
+  #Optional
+  cluster_id       = oci_database_db_node_snapshot_management.test_db_node_snapshot_management.exadb_vm_cluster_id
+  name             = oci_database_db_node_snapshot_management.test_db_node_snapshot_management.snapshots[0].name
+  source_dbnode_id = oci_database_db_node_snapshot_management.test_db_node_snapshot_management.snapshots[0].source_dbnode_id
+  state            = oci_database_db_node_snapshot_management.test_db_node_snapshot_management.snapshots[0].state
+
+  ## Example: filter db_node_snapshots by name
+  #filter {
+  #  name  = "name"
+  #  regex = true
+  #  values = ["^\\w+-${oci_database_db_node_snapshot_management.test_db_node_snapshot_management.name}$"]
+  #}
+  #
+  ## Example: Get all but Terminated db_node_snapshots
+  #filter {
+  #  name = "state"
+  #  values = ["CREATING", "AVAILABLE", "FAILED", "MOUNTED", "MOUNTING", "UNMOUNTING"]
+  #}
+}
+
+data "oci_database_db_node_snapshot" "test_db_node_snapshot" {
+  #Required
+  dbnode_snapshot_id = oci_database_db_node_snapshot_management.test_db_node_snapshot_management.snapshots[0].id
+}

examples/dif/stack.tf

@@ -0,0 +1,125 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+variable "compartment_id" { }
+
+variable "stack_display_name" {
+  default = "testtfstack"
+}
+
+variable "stack_freeform_tags" {
+  default = { "Division" = "DEV" }
+}
+
+variable "stack_adb_is_public" {
+  default = false
+}
+
+variable "password_secret_id" { }
+variable "dataflow_file_uri" { }
+variable "stack_subnet_id" { }
+
+resource "oci_dif_stack" "test_stack" {
+  #Required
+  compartment_id  = var.compartment_id
+  display_name    = var.stack_display_name
+
+  services = [
+    "OBJECTSTORAGE", "ADB", "DATAFLOW"
+  ]
+
+  stack_templates = [
+    "DATALAKE", "DATATRANSFORMATION"
+  ]
+
+  objectstorage {
+    instance_id       = "testLogBucket1"
+    object_versioning = "ENABLED"
+    storage_tier      = "STANDARD"
+  }
+
+  adb {
+    instance_id                 = "testadb1"
+    db_workload                 = "DW"
+    ecpu                        = 2
+    data_storage_size_in_tbs    = 1
+    admin_password_id          = var.password_secret_id
+    is_public                  = var.stack_adb_is_public
+    subnet_id                  = var.stack_subnet_id
+    db_version                 = "19c"
+  }
+
+  dataflow {
+    instance_id = "testApp"
+    log_bucket_instance_id = "testLogBucket1"
+    num_executors = "3"
+    spark_version = "3.5.0"
+    connections {
+      connection_details {
+        dif_dependencies {
+          service_instance_id = "testadb1"
+          service_type = "ADB"
+        }
+        domain_names = ["custpvtsubnet.oraclevcn.com"]
+      }
+      subnet_id = var.stack_subnet_id
+    }
+    driver_shape = "VM.Standard.E5.Flex"
+    driver_shape_config {
+      memory_in_gbs = "16"
+      ocpus = "1"
+    }
+    executor_shape = "VM.Standard.E5.Flex"
+    executor_shape_config {
+      memory_in_gbs = "16"
+      ocpus = "1"
+    }
+    execute = var.dataflow_file_uri
+  }
+  objectstorage {
+    instance_id       = "testBucket2"
+    object_versioning = "DISABLED"
+    storage_tier      = "STANDARD"
+  }
+
+  subnet_id = var.stack_subnet_id
+
+  deploy_artifacts_trigger = 1
+  add_service_trigger = 1
+
+  //ignore so that this does not cause perpetual diff
+  lifecycle {
+    ignore_changes = [
+      # Ignore service-generated metadata and tags
+      defined_tags,
+      freeform_tags,
+      system_tags,
+      service_details,
+      time_created,
+      time_updated,
+    ]
+  }
+}

examples/vn_monitoring/path_analysis/main.tf

@@ -4,6 +4,8 @@
 variable "region" {}
 variable "compartment_ocid" {}
 
+variable "tenancy_ocid" {}
+
 variable "path_analysi_destination_endpoint_type" {
   default = "SUBNET"
 }
@@ -121,7 +123,7 @@ variable "on_prem_path_analyzer_test_destination_endpoint_type" {
   default = "ON_PREM"
 }
 variable "on_prem_path_analyzer_test_destination_endpoint_address" {
-  default = "10.2.41.5"
+  default = "10.50.1.5"
 }
 variable "on_prem_path_analyzer_test_protocol" {
   default = 6
@@ -130,7 +132,7 @@ variable "on_prem_path_analyzer_test_source_endpoint_type" {
   default = "IP_ADDRESS"
 }
 variable "on_prem_path_analyzer_test_source_endpoint_address" {
-  default = "100.130.10.100"
+  default = "10.11.1.5"
 }
 variable "on_prem_path_analyzer_test_display_name" {
   default = "On Prem Path Analysis"
@@ -186,3 +188,11 @@ resource "oci_vn_monitoring_path_analysi" "on_prem_test_path_analysis" {
   }
 }
 
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}
+
+output "ads" {
+  value = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
+}
+

examples/vn_monitoring/path_analyzer_test/main.tf

@@ -4,6 +4,8 @@
 variable "region" {}
 variable "compartment_ocid" {}
 
+variable "tenancy_ocid" {}
+
 variable "path_analyzer_test_defined_tags_value" {
   default = "value"
 }
@@ -212,3 +214,11 @@ data "oci_vn_monitoring_path_analyzer_tests" "test_path_analyzer_tests" {
   display_name = var.path_analyzer_test_display_name
   state        = var.path_analyzer_test_state
 }
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}
+
+output "ads" {
+  value = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
+}

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.103.0
+	github.com/oracle/oci-go-sdk/v65 v65.104.0
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/mod v0.24.0
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -209,6 +209,8 @@ github.com/oracle/oci-go-sdk/v65 v65.102.1 h1:zLNLz5dVzZxOf5DK/f3WGZUjwrQ9m27fd4
 github.com/oracle/oci-go-sdk/v65 v65.102.1/go.mod h1:oB8jFGVc/7/zJ+DbleE8MzGHjhs2ioCz5stRTdZdIcY=
 github.com/oracle/oci-go-sdk/v65 v65.103.0 h1:HfyZx+JefCPK3At0Xt45q+wr914jDXuoyzOFX3XCbno=
 github.com/oracle/oci-go-sdk/v65 v65.103.0/go.mod h1:oB8jFGVc/7/zJ+DbleE8MzGHjhs2ioCz5stRTdZdIcY=
+github.com/oracle/oci-go-sdk/v65 v65.104.0 h1:l9awEvzWvxmYhy/97A0hZ87pa7BncYXmcO/S8+rvgK0=
+github.com/oracle/oci-go-sdk/v65 v65.104.0/go.mod h1:oB8jFGVc/7/zJ+DbleE8MzGHjhs2ioCz5stRTdZdIcY=
 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/client/dif_clients.go

@@ -0,0 +1,34 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package client
+
+import (
+	oci_dif "github.com/oracle/oci-go-sdk/v65/dif"
+
+	oci_common "github.com/oracle/oci-go-sdk/v65/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_dif.StackClient", &OracleClient{InitClientFn: initDifStackClient})
+}
+
+func initDifStackClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
+	client, err := oci_dif.NewStackClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+
+	if serviceClientOverrides.HostUrlOverride != "" {
+		client.Host = serviceClientOverrides.HostUrlOverride
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) StackClient() *oci_dif.StackClient {
+	return m.GetClient("oci_dif.StackClient").(*oci_dif.StackClient)
+}

internal/globalvar/version.go

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