Merge pull request #2386 from oracle/release_gh

Releasing version 7.2.0

Author: varakali

CHANGELOG.md

@@ -36,6 +36,8 @@ variable "compartment_ocid" {
 }
 
 provider "oci" {
+  # un-ignore to run backwards compatibility testing
+  #version = "6.32.0"
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
   fingerprint      = var.fingerprint

examples/mysql/cross_region_backup/main.tf

@@ -20,6 +20,8 @@ variable "compartment_ocid" {
 }
 
 provider "oci" {
+  # un-ignore to run backwards compatibility testing
+  #version = "6.32.0"
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
   fingerprint      = var.fingerprint
@@ -38,6 +40,11 @@ resource "oci_core_vcn" "test_vcn" {
   compartment_id = var.compartment_ocid
 }
 
+resource "oci_core_network_security_group" "test_network_security_group" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.test_vcn.id
+}
+
 resource "oci_mysql_mysql_backup" "test_mysql_backup" {
   db_system_id = oci_mysql_mysql_db_system.test_mysql_backup_db_system.id
 }
@@ -111,6 +118,7 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
     window_start_time = "sun 01:00"
   }
 
+  nsg_ids       = [oci_core_network_security_group.test_network_security_group.id]
   port          = "3306"
   port_x        = "33306"
 
@@ -169,6 +177,16 @@ data "oci_identity_availability_domains" "test_availability_domains" {
   compartment_id = var.tenancy_ocid
 }
 
+data "oci_mysql_mysql_db_system" "test_mysql_db_system" {
+  #Required
+  db_system_id = oci_mysql_mysql_db_system.test_mysql_backup_db_system.id
+}
+
+data "oci_mysql_mysql_backup" "test_mysql_backup" {
+  #Required
+  backup_id = oci_mysql_mysql_backup.test_mysql_backup.id
+}
+
 output "configuration_id" {
   value = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
 }

examples/mysql/main.tf

@@ -19,6 +19,16 @@ variable "region" {
 variable "compartment_ocid" {
 }
 
+provider "oci" {
+  # un-ignore to run backwards compatibility testing
+  #version = "6.32.0"
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
 resource "oci_core_subnet" "test_subnet" {
   cidr_block     = "10.0.0.0/24"
   compartment_id = var.compartment_ocid
@@ -30,6 +40,11 @@ resource "oci_core_vcn" "test_vcn" {
   compartment_id = var.compartment_ocid
 }
 
+resource "oci_core_network_security_group" "test_network_security_group" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.test_vcn.id
+}
+
 resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
   #Required
   admin_password      = "BEstrO0ng_#11"
@@ -98,7 +113,9 @@ resource "oci_mysql_replica" "test_replica" {
   is_delete_protected  = false
   replica_overrides {
     configuration_id   = data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations[0].id
-    mysql_version      = "8.1.0"
+    # TODO: fix unsupported version
+    #mysql_version      = "8.1.0"
+    nsg_ids            = [oci_core_network_security_group.test_network_security_group.id]
     shape_name         = "MySQL.VM.Standard.E3.4.64GB"
   }
 }

examples/mysql/replica/main.tf

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

examples/zips/adm.zip

@@ -156,8 +156,8 @@ github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DV
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oracle/oci-go-sdk/v65 v65.91.0 h1:maO6AxKxVfszH0X4tbbtN21jOk03lCRR3IqiA8/FzZc=
-github.com/oracle/oci-go-sdk/v65 v65.91.0/go.mod h1:u6XRPsw9tPziBh76K7GrrRXPa8P8W3BQeqJ6ZZt9VLA=
+github.com/oracle/oci-go-sdk/v65 v65.91.1 h1:jRE4jUiJd+sDhJTyTCXIJdzLjTx+99gA3PgzpVTaF/I=
+github.com/oracle/oci-go-sdk/v65 v65.91.1/go.mod h1:u6XRPsw9tPziBh76K7GrrRXPa8P8W3BQeqJ6ZZt9VLA=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
 github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

examples/zips/aiAnomalyDetection.zip

@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "7.1.0"
-const ReleaseDate = "2025-05-14"
+const Version = "7.2.0"
+const ReleaseDate = "2025-05-24"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

examples/zips/aiDocument.zip

@@ -0,0 +1,99 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+	"github.com/oracle/terraform-provider-oci/internal/acctest"
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+)
+
+var (
+	disabledPitrPolicy = map[string]interface{}{
+		"is_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
+	}
+
+	disabledBackupPolicy = map[string]interface{}{
+		"is_enabled":  acctest.Representation{RepType: acctest.Optional, Create: `false`},
+		"pitr_policy": acctest.RepresentationGroup{RepType: acctest.Optional, Group: disabledPitrPolicy},
+	}
+
+	mysqlDbSystemNsgIds = map[string]interface{}{
+		// standard required properties
+		"admin_password":          acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
+		"admin_username":          acctest.Representation{RepType: acctest.Required, Create: `adminUser`},
+		"availability_domain":     acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"compartment_id":          acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"shape_name":              acctest.Representation{RepType: acctest.Required, Create: `MySQL.VM.Standard.E3.1.8GB`},
+		"subnet_id":               acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
+		"data_storage_size_in_gb": acctest.Representation{RepType: acctest.Required, Create: `50`},
+
+		// use an easier to track display name
+		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `TestDbSystemNsgIds`},
+
+		// avoid wasting time setting up DBM when that's not what we're testing here
+		"database_management": acctest.Representation{RepType: acctest.Optional, Create: `DISABLED`},
+
+		// disable backup policy to avoid wasting even more time and resources
+		"backup_policy": acctest.RepresentationGroup{RepType: acctest.Required, Group: disabledBackupPolicy},
+
+		// create with the default NSG and then clear NSGs on update
+		"nsg_ids": acctest.Representation{RepType: acctest.Optional,
+			Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`},
+			Update: []string{}},
+	}
+)
+
+// issue-routing-tag: mysql/default
+func TestMysqlMysqlDbSystemResource_nsgIds(t *testing.T) {
+	httpreplay.SetScenario("TestMysqlMysqlDbSystemResource_nsgIds")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	resourceName := "oci_mysql_mysql_db_system.test_mysql_db_system"
+
+	var resId, resId2 string
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify Create with optional fields
+		{
+			Config: config + compartmentIdVariableStr + MysqlMysqlDbSystemResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Optional, acctest.Create, mysqlDbSystemNsgIds),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "nsg_ids.#", "1"),
+
+				func(s *terraform.State) (err error) {
+					resId, err = acctest.FromInstanceState(s, resourceName, "id")
+					return err
+				},
+			),
+		},
+
+		// verify it is possible to change the network security groups
+		{
+			Config: config + compartmentIdVariableStr + MysqlMysqlDbSystemResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_mysql_mysql_db_system", "test_mysql_db_system", acctest.Optional, acctest.Update, mysqlDbSystemNsgIds),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "nsg_ids.#", "0"),
+
+				func(s *terraform.State) (err error) {
+					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
+					if resId != resId2 {
+						return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+					}
+					return err
+				},
+			),
+		},
+	})
+}

examples/zips/aiLanguage.zip

@@ -74,6 +74,7 @@ var (
 		"ip_address":              acctest.Representation{RepType: acctest.Optional, Create: `10.0.0.3`},
 		"is_highly_available":     acctest.Representation{RepType: acctest.Optional, Create: `false`},
 		"maintenance":             acctest.RepresentationGroup{RepType: acctest.Optional, Group: MysqlMysqlDbSystemMaintenanceRepresentation},
+		"nsg_ids":                 acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
 		"port":                    acctest.Representation{RepType: acctest.Optional, Create: `3306`},
 		"port_x":                  acctest.Representation{RepType: acctest.Optional, Create: `33306`},
 		"secure_connections":      acctest.RepresentationGroup{RepType: acctest.Optional, Group: MysqlMysqlDbSystemSecureConnectionsRepresentation},
@@ -135,6 +136,7 @@ var (
 	MysqlMysqlDbSystemResourceDependencies = MysqlMysqlConfigurationResourceConfig +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
+		acctest.GenerateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group", acctest.Required, acctest.Create, CoreNetworkSecurityGroupRepresentation) +
 		AvailabilityDomainConfig +
 		MysqlMysqlVersionResourceConfig
 )

examples/zips/aiVision.zip

@@ -64,8 +64,10 @@ var (
 
 	MysqlReplicaReplicaOverridesRepresentation = map[string]interface{}{
 		"configuration_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.configuration_id}`},
-		"mysql_version":    acctest.Representation{RepType: acctest.Optional, Create: `8.0.35`, Update: `8.1.0`},
-		"shape_name":       acctest.Representation{RepType: acctest.Optional, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.shape_name}`},
+		// TODO: fix unsupported versions
+		//"mysql_version":    acctest.Representation{RepType: acctest.Optional, Create: `8.0.35`, Update: `8.1.0`},
+		"nsg_ids":    acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
+		"shape_name": acctest.Representation{RepType: acctest.Optional, Create: `${oci_mysql_mysql_db_system.test_mysql_db_system.shape_name}`},
 	}
 
 	ignoreDefinedTagsChangesForMysqlReplica = map[string]interface{}{
@@ -162,7 +164,8 @@ func TestMysqlReplicaResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "port_x"),
 				resource.TestCheckResourceAttr(resourceName, "replica_overrides.#", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "replica_overrides.0.configuration_id"),
-				resource.TestCheckResourceAttr(resourceName, "replica_overrides.0.mysql_version", "8.0.35"),
+				// TODO: fix unsupported versions
+				//resource.TestCheckResourceAttr(resourceName, "replica_overrides.0.mysql_version", "8.0.35"),
 				resource.TestCheckResourceAttrSet(resourceName, "replica_overrides.0.shape_name"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -199,7 +202,8 @@ func TestMysqlReplicaResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "port_x"),
 				resource.TestCheckResourceAttr(resourceName, "replica_overrides.#", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "replica_overrides.0.configuration_id"),
-				resource.TestCheckResourceAttr(resourceName, "replica_overrides.0.mysql_version", "8.1.0"),
+				// TODO: fix unsupported versions
+				//resource.TestCheckResourceAttr(resourceName, "replica_overrides.0.mysql_version", "8.1.0"),
 				resource.TestCheckResourceAttrSet(resourceName, "replica_overrides.0.shape_name"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -245,7 +249,8 @@ func TestMysqlReplicaResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "replicas.0.port_x"),
 				resource.TestCheckResourceAttr(datasourceName, "replicas.0.replica_overrides.#", "1"),
 				resource.TestCheckResourceAttrSet(datasourceName, "replicas.0.replica_overrides.0.configuration_id"),
-				resource.TestCheckResourceAttr(datasourceName, "replicas.0.replica_overrides.0.mysql_version", "8.1.0"),
+				// TODO: fix unsupported versions
+				//resource.TestCheckResourceAttr(datasourceName, "replicas.0.replica_overrides.0.mysql_version", "8.1.0"),
 				resource.TestCheckResourceAttrSet(datasourceName, "replicas.0.replica_overrides.0.shape_name"),
 				resource.TestCheckResourceAttrSet(datasourceName, "replicas.0.shape_name"),
 				resource.TestCheckResourceAttrSet(datasourceName, "replicas.0.state"),
@@ -274,7 +279,8 @@ func TestMysqlReplicaResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "port"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "port_x"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "replica_overrides.#", "1"),
-				resource.TestCheckResourceAttr(singularDatasourceName, "replica_overrides.0.mysql_version", "8.1.0"),
+				// TODO: fix unsupported versions
+				//resource.TestCheckResourceAttr(singularDatasourceName, "replica_overrides.0.mysql_version", "8.1.0"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "secure_connections.#", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "shape_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),

examples/zips/always_free.zip

@@ -40,7 +40,6 @@ func DataSafeUnsetSecurityAssessmentBaselineResource() *schema.Resource {
 			"target_ids": {
 				Type:     schema.TypeList,
 				Optional: true,
-				Computed: true,
 				ForceNew: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,

examples/zips/analytics.zip

@@ -40,7 +40,6 @@ func DataSafeUnsetUserAssessmentBaselineResource() *schema.Resource {
 			"target_ids": {
 				Type:     schema.TypeList,
 				Optional: true,
-				Computed: true,
 				ForceNew: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,

examples/zips/announcements_service.zip

@@ -87,7 +87,7 @@ func (s *MysqlMysqlBackupDataSourceCrud) SetData() error {
 	}
 
 	if s.Res.DbSystemSnapshot != nil {
-		s.D.Set("db_system_snapshot", []interface{}{DbSystemSnapshotToMap(s.Res.DbSystemSnapshot)})
+		s.D.Set("db_system_snapshot", []interface{}{DbSystemSnapshotToMap(s.Res.DbSystemSnapshot, true)})
 	} else {
 		s.D.Set("db_system_snapshot", nil)
 	}