Added - Support for Add MR table feature into Oracle NoSQL Database Cloud

Author: Terraform Team Automation

examples/nosql/multiregion_table/main.tf

@@ -0,0 +1,68 @@
+// Copyright (c) 2017, 2023, 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" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "table_ddl_statement" {
+  default = "CREATE TABLE IF NOT EXISTS test_mrtable(id INTEGER, name STRING, info JSON, PRIMARY KEY(id)) with schema frozen"
+}
+
+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
+}
+
+resource "oci_nosql_table" "test_mrtable" {
+  #Required
+  compartment_id = var.compartment_ocid
+  ddl_statement  = var.table_ddl_statement
+  name           = "test_mrtable"
+
+  table_limits {
+    #Required
+    max_read_units     = "50"
+    max_write_units    = "50"
+    max_storage_in_gbs = "1"
+  }
+}
+
+resource "oci_nosql_table_replica" "replica_yul" {
+  table_name_or_id = oci_nosql_table.test_mrtable.id
+  region = "ca-montreal-1"
+
+  #Optional
+  max_read_units     = "60"
+  max_write_units    = "60"
+}
+
+data "oci_nosql_table" "get_test_mrtable" {
+  compartment_id = var.compartment_ocid
+  table_name_or_id = oci_nosql_table.test_mrtable.id
+
+  depends_on = [oci_nosql_table_replica.replica_yul]
+}
+
+output "test_mrtable_replicas" {
+  value = [
+    data.oci_nosql_table.get_test_mrtable.replicas
+  ]
+}

internal/integrationtest/nosql_table_replica_test.go

@@ -0,0 +1,153 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
+	"github.com/oracle/oci-go-sdk/v65/common"
+	oci_nosql "github.com/oracle/oci-go-sdk/v65/nosql"
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+	"github.com/oracle/terraform-provider-oci/internal/acctest"
+	tf_client "github.com/oracle/terraform-provider-oci/internal/client"
+	"github.com/oracle/terraform-provider-oci/internal/resourcediscovery"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+)
+
+var (
+	NosqlTableReplicaRequiredOnlyResource = NosqlTableReplicaResourceDependencies +
+		acctest.GenerateResourceFromRepresentationMap("oci_nosql_table_replica", "test_table_replica", acctest.Required, acctest.Create, NosqlTableReplicaRepresentation)
+
+	NosqlTableReplicaRepresentation = map[string]interface{}{
+		"region":           acctest.Representation{RepType: acctest.Required, Create: `ca-montreal-1`},
+		"table_name_or_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_nosql_table.test_mr_table.id}`},
+		"compartment_id":   acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
+		"max_read_units":   acctest.Representation{RepType: acctest.Optional, Create: `11`},
+		"max_write_units":  acctest.Representation{RepType: acctest.Optional, Create: `11`},
+	}
+
+	mrtable_ddl                 = "CREATE TABLE IF NOT EXISTS test_mr_table(id integer, info JSON, PRIMARY KEY(id)) WITH SCHEMA FROZEN"
+	mrTableLimitsRepresentation = map[string]interface{}{
+		"max_read_units":     acctest.Representation{RepType: acctest.Required, Create: `10`},
+		"max_write_units":    acctest.Representation{RepType: acctest.Required, Create: `10`},
+		"max_storage_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `1`},
+	}
+	mrTableRepresentation = map[string]interface{}{
+		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"ddl_statement":  acctest.Representation{RepType: acctest.Required, Create: mrtable_ddl},
+		"name":           acctest.Representation{RepType: acctest.Required, Create: "test_mr_table"},
+		"table_limits":   acctest.RepresentationGroup{RepType: acctest.Required, Group: mrTableLimitsRepresentation},
+		"lifecycle":      acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreTableDefinedTags},
+	}
+	NosqlTableReplicaResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_nosql_table", "test_mr_table", acctest.Required, acctest.Create, mrTableRepresentation)
+)
+
+// issue-routing-tag: nosql/default
+func TestNosqlTableReplicaResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestNosqlTableReplicaResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	resourceName := "oci_nosql_table_replica.test_table_replica"
+
+	var resId string
+	// Save TF content to Create resource with optional properties. This has to be exactly the same as the config part in the "create with optionals" step in the test.
+	acctest.SaveConfigContent(config+compartmentIdVariableStr+NosqlTableReplicaResourceDependencies+
+		acctest.GenerateResourceFromRepresentationMap("oci_nosql_table_replica", "test_table_replica", acctest.Optional, acctest.Create, NosqlTableReplicaRepresentation), "nosql", "tableReplica", t)
+
+	acctest.ResourceTest(t, testAccCheckNosqlTableReplicaDestroy, []resource.TestStep{
+		// verify Create
+		{
+			Config: config + compartmentIdVariableStr + NosqlTableReplicaResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_nosql_table_replica", "test_table_replica", acctest.Required, acctest.Create, NosqlTableReplicaRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "region", "ca-montreal-1"),
+				resource.TestCheckResourceAttrSet(resourceName, "table_name_or_id"),
+			),
+		},
+
+		// delete before next Create
+		{
+			Config: config + compartmentIdVariableStr + NosqlTableReplicaResourceDependencies,
+		},
+		// verify Create with optionals
+		{
+			Config: config + compartmentIdVariableStr + NosqlTableReplicaResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_nosql_table_replica", "test_table_replica", acctest.Optional, acctest.Create, NosqlTableReplicaRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "max_read_units", "11"),
+				resource.TestCheckResourceAttr(resourceName, "max_write_units", "11"),
+				resource.TestCheckResourceAttr(resourceName, "region", "ca-montreal-1"),
+				resource.TestCheckResourceAttrSet(resourceName, "table_name_or_id"),
+
+				func(s *terraform.State) (err error) {
+					resId, err = acctest.FromInstanceState(s, resourceName, "id")
+					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
+						if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+							return errExport
+						}
+					}
+					return err
+				},
+			),
+		},
+	})
+}
+
+func testAccCheckNosqlTableReplicaDestroy(s *terraform.State) error {
+	noResourceFound := true
+	client := acctest.TestAccProvider.Meta().(*tf_client.OracleClients).NosqlClient()
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type == "oci_nosql_table_replica" {
+
+			noResourceFound = false
+
+			request := oci_nosql.GetTableRequest{}
+
+			if value, ok := rs.Primary.Attributes["compartment_id"]; ok {
+				request.CompartmentId = &value
+			}
+			if value, ok := rs.Primary.Attributes["table_name_or_id"]; ok {
+				request.TableNameOrId = &value
+			}
+
+			request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(true, "nosql")
+			response, err := client.GetTable(context.Background(), request)
+
+			if err == nil {
+				deletedLifecycleStates := map[string]bool{
+					string(oci_nosql.TableLifecycleStateDeleted): true,
+				}
+				if _, ok := deletedLifecycleStates[string(response.LifecycleState)]; !ok {
+					//resource lifecycle state is not in expected deleted lifecycle states.
+					return fmt.Errorf("resource lifecycle state: %s is not in expected deleted lifecycle states", response.LifecycleState)
+				}
+				//resource lifecycle state is in expected deleted lifecycle states. continue with next one.
+				continue
+			}
+
+			//Verify that exception is for '404 not found'.
+			if failure, isServiceError := common.IsServiceError(err); !isServiceError || failure.GetHTTPStatusCode() != 404 {
+				return err
+			}
+		}
+	}
+
+	if noResourceFound {
+		return fmt.Errorf("at least one resource was expected from the state file, but could not be found")
+	}
+	return nil
+}

internal/integrationtest/nosql_table_test.go

@@ -227,8 +227,11 @@ func TestNosqlTableResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "is_auto_reclaimable", "false"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "is_multi_region"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "name", "test_table"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "replicas.#", "0"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "schema.#", "1"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "schema_state"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.0.column_name", "id"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.0.is_always", "true"),

internal/service/nosql/nosql_export.go

@@ -58,6 +58,11 @@ var exportNosqlIndexHints = &tf_export.TerraformResourceHints{
 	},
 }
 
+var exportNosqlTableReplicaHints = &tf_export.TerraformResourceHints{
+	ResourceClass:        "oci_nosql_table_replica",
+	ResourceAbbreviation: "table_replica",
+}
+
 var nosqlResourceGraph = tf_export.TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportNosqlTableHints},

internal/service/nosql/nosql_table_data_source.go

@@ -93,20 +93,36 @@ func (s *NosqlTableDataSourceCrud) SetData() error {
 		s.D.Set("is_auto_reclaimable", *s.Res.IsAutoReclaimable)
 	}
 
+	if s.Res.IsMultiRegion != nil {
+		s.D.Set("is_multi_region", *s.Res.IsMultiRegion)
+	}
+
 	if s.Res.LifecycleDetails != nil {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}
 
+	if s.Res.LocalReplicaInitializationInPercent != nil {
+		s.D.Set("local_replica_initialization_in_percent", *s.Res.LocalReplicaInitializationInPercent)
+	}
+
 	if s.Res.Name != nil {
 		s.D.Set("name", *s.Res.Name)
 	}
 
+	replicas := []interface{}{}
+	for _, item := range s.Res.Replicas {
+		replicas = append(replicas, ReplicaToMap(item))
+	}
+	s.D.Set("replicas", replicas)
+
 	if s.Res.Schema != nil {
 		s.D.Set("schema", []interface{}{SchemaToMap(s.Res.Schema)})
 	} else {
 		s.D.Set("schema", nil)
 	}
 
+	s.D.Set("schema_state", s.Res.SchemaState)
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.SystemTags != nil {