Added - Support for Autonomous Shared Database service wallet with GracePeriod feature during wallet rotation. Added - Support for Autonomous Shared Database service wallet with GracePeriod feature during wallet rotation.

karthikoracle1993 · Maxrovr · commit 0b71c8af6a8a · 2022-07-20T00:24:22.000-07:00
Squashed commit of the following:

commit 3979e953f4da9d04b60bf430ddac3ab5035f172a
Author: Karthik NEERAGUNDA RADHA KRISHNAN &lt;karthik.neeragunda.radha.kris@oracle.com&gt;
Date:   Mon May 9 23:47:22 2022 +0000

    Added - Support for Autonomous Shared Database service wallet with GracePeriod feature during wallet rotation.
diff --git a/internal/integrationtest/database_autonomous_database_instance_wallet_management_test.go b/internal/integrationtest/database_autonomous_database_instance_wallet_management_test.go
@@ -30,6 +30,7 @@ var (
 
 	DatabaseAutonomousDatabaseInstanceWalletManagementRepresentation = map[string]interface{}{
 		"autonomous_database_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_autonomous_database.test_autonomous_database.id}`},
+		"grace_period":           acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
 		"should_rotate":          acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 	}
 
@@ -63,8 +64,26 @@ func TestDatabaseAutonomousDatabaseInstanceWalletManagementResource_basic(t *tes
 				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_instance_wallet_management", "test_autonomous_database_instance_wallet_management", acctest.Required, acctest.Create, DatabaseAutonomousDatabaseInstanceWalletManagementRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "autonomous_database_id"),
-				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
+				func(s *terraform.State) (err error) {
+					resId, err = acctest.FromInstanceState(s, resourceName, "id")
+					return err
+				},
+			),
+		},
 
+		// delete before next Create
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseInstanceWalletManagementResourceDependencies,
+		},
+		// verify Create with optionals
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseInstanceWalletManagementResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_instance_wallet_management", "test_autonomous_database_instance_wallet_management", acctest.Optional, acctest.Create, DatabaseAutonomousDatabaseInstanceWalletManagementRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(resourceName, "autonomous_database_id"),
+				resource.TestCheckResourceAttr(resourceName, "grace_period", "10"),
+				resource.TestCheckResourceAttr(resourceName, "should_rotate", "false"),
+				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
 					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
@@ -82,9 +101,10 @@ func TestDatabaseAutonomousDatabaseInstanceWalletManagementResource_basic(t *tes
 				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_instance_wallet_management", "test_autonomous_database_instance_wallet_management", acctest.Optional, acctest.Update, DatabaseAutonomousDatabaseInstanceWalletManagementRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "autonomous_database_id"),
+				resource.TestCheckResourceAttr(resourceName, "grace_period", "11"),
+				resource.TestCheckResourceAttr(resourceName, "should_rotate", "true"),
 				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_rotated"),
-
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
 					if resId != resId2 {
diff --git a/internal/integrationtest/database_autonomous_database_regional_wallet_management_test.go b/internal/integrationtest/database_autonomous_database_regional_wallet_management_test.go
@@ -25,6 +25,7 @@ var (
 	DatabaseDatabaseAutonomousDatabaseRegionalWalletManagementSingularDataSourceRepresentation = map[string]interface{}{}
 
 	DatabaseAutonomousDatabaseRegionalWalletManagementRepresentation = map[string]interface{}{
+		"grace_period":  acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
 		"should_rotate": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 	}
 
@@ -56,6 +57,25 @@ func TestDatabaseAutonomousDatabaseRegionalWalletManagementResource_basic(t *tes
 			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_regional_wallet_management", "test_autonomous_database_regional_wallet_management", acctest.Required, acctest.Create, DatabaseAutonomousDatabaseRegionalWalletManagementRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+
+				func(s *terraform.State) (err error) {
+					resId, err = acctest.FromInstanceState(s, resourceName, "id")
+					return err
+				},
+			),
+		},
+
+		// delete before next Create
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies,
+		},
+		// verify Create with optionals
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_regional_wallet_management", "test_autonomous_database_regional_wallet_management", acctest.Optional, acctest.Create, DatabaseAutonomousDatabaseRegionalWalletManagementRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "grace_period", "10"),
+				resource.TestCheckResourceAttr(resourceName, "should_rotate", "false"),
 				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -73,6 +93,8 @@ func TestDatabaseAutonomousDatabaseRegionalWalletManagementResource_basic(t *tes
 			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseRegionalWalletManagementResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database_regional_wallet_management", "test_autonomous_database_regional_wallet_management", acctest.Optional, acctest.Update, DatabaseAutonomousDatabaseRegionalWalletManagementRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "grace_period", "11"),
+				resource.TestCheckResourceAttr(resourceName, "should_rotate", "true"),
 				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_rotated"),
 				func(s *terraform.State) (err error) {
diff --git a/internal/service/database/database_autonomous_database_instance_wallet_management_resource.go b/internal/service/database/database_autonomous_database_instance_wallet_management_resource.go
@@ -33,6 +33,11 @@ func DatabaseAutonomousDatabaseInstanceWalletManagementResource() *schema.Resour
 			},
 
 			// Optional
+			"grace_period": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+			},
 			"should_rotate": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -159,6 +164,11 @@ func (s *DatabaseAutonomousDatabaseInstanceWalletManagementResourceCrud) Update(
 		request.AutonomousDatabaseId = &tmp
 	}
 
+	if gracePeriod, ok := s.D.GetOkExists("grace_period"); ok {
+		tmp := gracePeriod.(int)
+		request.GracePeriod = &tmp
+	}
+
 	if shouldRotate, ok := s.D.GetOkExists("should_rotate"); ok {
 		tmp := shouldRotate.(bool)
 		request.ShouldRotate = &tmp
diff --git a/internal/service/database/database_autonomous_database_regional_wallet_management_resource.go b/internal/service/database/database_autonomous_database_regional_wallet_management_resource.go
@@ -29,6 +29,11 @@ func DatabaseAutonomousDatabaseRegionalWalletManagementResource() *schema.Resour
 			// Required
 
 			// Optional
+			"grace_period": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+			},
 			"should_rotate": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -147,6 +152,11 @@ func (s *DatabaseAutonomousDatabaseRegionalWalletManagementResourceCrud) Get() e
 func (s *DatabaseAutonomousDatabaseRegionalWalletManagementResourceCrud) Update() error {
 	request := oci_database.UpdateAutonomousDatabaseRegionalWalletRequest{}
 
+	if gracePeriod, ok := s.D.GetOkExists("grace_period"); ok {
+		tmp := gracePeriod.(int)
+		request.GracePeriod = &tmp
+	}
+
 	if shouldRotate, ok := s.D.GetOkExists("should_rotate"); ok {
 		tmp := shouldRotate.(bool)
 		request.ShouldRotate = &tmp
diff --git a/website/docs/r/database_autonomous_database_instance_wallet_management.html.markdown b/website/docs/r/database_autonomous_database_instance_wallet_management.html.markdown
@@ -21,6 +21,7 @@ resource "oci_database_autonomous_database_instance_wallet_management" "test_aut
 	autonomous_database_id = oci_database_autonomous_database.test_autonomous_database.id
 
 	#Optional
+	grace_period = var.autonomous_database_instance_wallet_management_grace_period
 	should_rotate = var.autonomous_database_instance_wallet_management_should_rotate
 }
 ```
@@ -30,6 +31,7 @@ resource "oci_database_autonomous_database_instance_wallet_management" "test_aut
 The following arguments are supported:
 
 * `autonomous_database_id` - (Required) (Updatable) The database [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
+* `grace_period` - (Optional) (Updatable) Grace period in hours to keep the existing wallet valid after rotation.
 * `should_rotate` - (Optional) (Updatable) Indicates whether to rotate the wallet or not. If `false`, the wallet will not be rotated. The default is `false`.
 
 
diff --git a/website/docs/r/database_autonomous_database_regional_wallet_management.html.markdown b/website/docs/r/database_autonomous_database_regional_wallet_management.html.markdown
@@ -19,6 +19,7 @@ Updates the Autonomous Database regional wallet.
 resource "oci_database_autonomous_database_regional_wallet_management" "test_autonomous_database_regional_wallet_management" {
 
 	#Optional
+	grace_period = var.autonomous_database_regional_wallet_management_grace_period
 	should_rotate = var.autonomous_database_regional_wallet_management_should_rotate
 }
 ```
@@ -27,6 +28,7 @@ resource "oci_database_autonomous_database_regional_wallet_management" "test_aut
 
 The following arguments are supported:
 
+* `grace_period` - (Optional) (Updatable) Grace period in hours to keep the existing wallet valid after rotation.
 * `should_rotate` - (Optional) (Updatable) Indicates whether to rotate the wallet or not. If `false`, the wallet will not be rotated. The default is `false`.
 
 
