- Added - Support for Data Guard Protection Modes

Author: govindrao55

oci/database_data_guard_association_resource.go

@@ -49,7 +49,6 @@ func DatabaseDataGuardAssociationResource() *schema.Resource {
 			"database_admin_password": {
 				Type:      schema.TypeString,
 				Required:  true,
-				ForceNew:  true,
 				Sensitive: true,
 			},
 			"database_id": {
@@ -64,12 +63,10 @@ func DatabaseDataGuardAssociationResource() *schema.Resource {
 			"protection_mode": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"transport_type": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 
 			// Optional
@@ -208,6 +205,14 @@ func readDatabaseDataGuardAssociation(d *schema.ResourceData, m interface{}) err
 	return ReadResource(sync)
 }
 
+func updateDatabaseDataGuardAssociation(d *schema.ResourceData, m interface{}) error {
+	sync := &DatabaseDataGuardAssociationResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).databaseClient()
+
+	return UpdateResource(d, sync)
+}
+
 func deleteDatabaseDataGuardAssociation(d *schema.ResourceData, m interface{}) error {
 	sync := &DatabaseDataGuardAssociationResourceCrud{}
 	sync.D = d
@@ -301,6 +306,41 @@ func (s *DatabaseDataGuardAssociationResourceCrud) Get() error {
 	return nil
 }
 
+func (s *DatabaseDataGuardAssociationResourceCrud) Update() error {
+	request := oci_database.UpdateDataGuardAssociationRequest{}
+
+	tmp := s.D.Id()
+	request.DataGuardAssociationId = &tmp
+
+	if databaseAdminPassword, ok := s.D.GetOkExists("database_admin_password"); ok {
+		tmp := databaseAdminPassword.(string)
+		request.DatabaseAdminPassword = &tmp
+	}
+
+	if databaseId, ok := s.D.GetOkExists("database_id"); ok {
+		tmp := databaseId.(string)
+		request.DatabaseId = &tmp
+	}
+
+	if protectionMode, ok := s.D.GetOkExists("protection_mode"); ok {
+		request.ProtectionMode = oci_database.UpdateDataGuardAssociationDetailsProtectionModeEnum(protectionMode.(string))
+	}
+
+	if transportType, ok := s.D.GetOkExists("transport_type"); ok {
+		request.TransportType = oci_database.UpdateDataGuardAssociationDetailsTransportTypeEnum(transportType.(string))
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "database")
+
+	response, err := s.Client.UpdateDataGuardAssociation(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response.DataGuardAssociation
+	return nil
+}
+
 func (s *DatabaseDataGuardAssociationResourceCrud) SetData() error {
 
 	if backupNetworkNsgIds, ok := s.D.GetOkExists("backup_network_nsg_ids"); ok {
@@ -505,10 +545,6 @@ func (s *DatabaseDataGuardAssociationResourceCrud) populateTopLevelPolymorphicCr
 	return nil
 }
 
-func (s *DatabaseDataGuardAssociationResourceCrud) Update() error {
-	return s.Get()
-}
-
 func (s *DatabaseDataGuardAssociationResourceCrud) Delete() error {
 	if deleteStandbyDbHomeOnDelete, ok := s.D.GetOkExists("delete_standby_db_home_on_delete"); ok {
 		tmp := deleteStandbyDbHomeOnDelete.(string)
@@ -631,14 +667,6 @@ func (s *DatabaseDataGuardAssociationResourceCrud) Delete() error {
 	return fmt.Errorf("unrecognized creation_type during delete")
 }
 
-func updateDatabaseDataGuardAssociation(d *schema.ResourceData, m interface{}) error {
-	sync := &DatabaseDataGuardAssociationResourceCrud{}
-	sync.D = d
-	sync.Client = m.(*OracleClients).databaseClient()
-
-	return UpdateResource(d, sync)
-}
-
 func (s *DatabaseDataGuardAssociationResourceCrud) ExtraWaitPostCreateDelete() time.Duration {
 	if httpreplay.ShouldRetryImmediately() {
 		return 10 * time.Millisecond

oci/database_data_guard_association_test.go

@@ -212,7 +212,7 @@ func TestDatabaseDataGuardAssociationResource_basic(t *testing.T) {
 	datasourceName := "data.oci_database_data_guard_associations.test_data_guard_associations"
 	singularDatasourceName := "data.oci_database_data_guard_association.test_data_guard_association"
 
-	var resId string
+	var resId, resId2 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.
 	saveConfigContent(config+compartmentIdVariableStr+DataGuardAssociationResourceDependencies+
 		generateResourceFromRepresentationMap("oci_database_data_guard_association", "test_data_guard_association", Optional, Create, dataGuardAssociationRepresentationExistingDbSystem), "database", "dataGuardAssociation", t)
@@ -237,6 +237,11 @@ func TestDatabaseDataGuardAssociationResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "protection_mode", "MAXIMUM_PERFORMANCE"),
 					resource.TestCheckResourceAttr(resourceName, "shape", "VM.Standard2.1"),
 					resource.TestCheckResourceAttr(resourceName, "transport_type", "ASYNC"),
+
+					func(s *terraform.State) (err error) {
+						resId, err = fromInstanceState(s, resourceName, "id")
+						return err
+					},
 				),
 			},
 
@@ -273,6 +278,33 @@ func TestDatabaseDataGuardAssociationResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify updates to updatable parameters
+			{
+				Config: config + compartmentIdVariableStr + DataGuardAssociationResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_data_guard_association", "test_data_guard_association", Optional, Update, dataGuardAssociationRepresentationExistingDbSystem),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "creation_type", "ExistingDbSystem"),
+					resource.TestCheckResourceAttr(resourceName, "database_admin_password", "BEstrO0ng_#11"),
+					resource.TestCheckResourceAttrSet(resourceName, "database_id"),
+					resource.TestCheckResourceAttr(resourceName, "delete_standby_db_home_on_delete", "true"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "peer_db_home_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "peer_db_system_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "peer_role"),
+					resource.TestCheckResourceAttr(resourceName, "protection_mode", "MAXIMUM_PERFORMANCE"),
+					resource.TestCheckResourceAttrSet(resourceName, "role"),
+					resource.TestCheckResourceAttrSet(resourceName, "state"),
+					resource.TestCheckResourceAttr(resourceName, "transport_type", "ASYNC"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+						}
+						return err
+					},
+				),
+			},
 			// verify datasource
 			{
 				Config: config +

website/docs/r/database_data_guard_association.html.markdown

@@ -54,7 +54,7 @@ The following arguments are supported:
 * `availability_domain` - (Applicable when creation_type=NewDbSystem) The name of the availability domain that the standby database DB system will be located in. For example- "Uocm:PHX-AD-1".
 * `backup_network_nsg_ids` - (Applicable when creation_type=NewDbSystem) A list of the [OCIDs](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the network security groups (NSGs) that the backup network of this DB system belongs to. Setting this to an empty array after the list is created removes the resource from all NSGs. For more information about NSGs, see [Security Rules](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/securityrules.htm). Applicable only to Exadata systems. 
 * `creation_type` - (Required) Specifies whether to create the peer database in an existing DB system or in a new DB system. 
-* `database_admin_password` - (Required) A strong password for the `SYS`, `SYSTEM`, and `PDB Admin` users to apply during standby creation.
+* `database_admin_password` - (Required) (Updatable) A strong password for the `SYS`, `SYSTEM`, and `PDB Admin` users to apply during standby creation.
 
 	The password must contain no fewer than nine characters and include:
 	* At least two uppercase characters.
@@ -73,7 +73,7 @@ The following arguments are supported:
 * `peer_db_home_id` - (Applicable when creation_type=ExistingDbSystem | ExistingVmCluster) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB home in which to create the standby database. You must supply this value to create standby database with an existing DB home 
 * `peer_db_system_id` - (Applicable when creation_type=ExistingDbSystem) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB system in which to create the standby database. You must supply this value if creationType is `ExistingDbSystem`. 
 * `peer_vm_cluster_id` - (Applicable when creation_type=ExistingVmCluster) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the VM Cluster in which to create the standby database. You must supply this value if creationType is `ExistingVmCluster`. 
-* `protection_mode` - (Required) The protection mode to set up between the primary and standby databases. For more information, see [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) in the Oracle Data Guard documentation.
+* `protection_mode` - (Required) (Updatable) The protection mode to set up between the primary and standby databases. For more information, see [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) in the Oracle Data Guard documentation.
 
 	**IMPORTANT** - The only protection mode currently supported by the Database service is MAXIMUM_PERFORMANCE. 
 * `shape` - (Applicable when creation_type=NewDbSystem) The virtual machine DB system shape to launch for the standby database in the Data Guard association. The shape determines the number of CPU cores and the amount of memory available for the DB system. Only virtual machine shapes are valid options. If you do not supply this parameter, the default shape is the shape of the primary DB system.
@@ -83,7 +83,7 @@ The following arguments are supported:
 	* For 1- and 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.16.16/28
 
 	These subnets are used by the Oracle Clusterware private interconnect on the database instance. Specifying an overlapping subnet will cause the private interconnect to malfunction. This restriction applies to both the client subnet and backup subnet. 
-* `transport_type` - (Required) The redo transport type to use for this Data Guard association.  Valid values depend on the specified `protectionMode`:
+* `transport_type` - (Required) (Updatable) The redo transport type to use for this Data Guard association.  Valid values depend on the specified `protectionMode`:
 	* MAXIMUM_AVAILABILITY - SYNC or FASTSYNC
 	* MAXIMUM_PERFORMANCE - ASYNC
 	* MAXIMUM_PROTECTION - SYNC