chore(cts): remove CheckDeleted from CTS data source and add CheckDel…

…eted to resource deletion (#5326)
huaweicloud · Aug 5, 2024 · bb90873 · bb90873
1 parent 2bdcbed
commit bb90873
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/huaweicloud/services/cts/data_source_huaweicloud_cts_notifications.go b/huaweicloud/services/cts/data_source_huaweicloud_cts_notifications.go
@@ -10,7 +10,6 @@ import (
 
 	cts "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cts/v3/model"
 
-	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/common"
 	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/config"
 	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/utils"
 )
@@ -192,7 +191,7 @@ func dataSourceNotificationsRead(_ context.Context, d *schema.ResourceData, meta
 
 	response, err := ctsClient.ListNotifications(listOpts)
 	if err != nil {
-		return common.CheckDeletedDiag(d, err, "error retrieving CTS key event notification")
+		return diag.Errorf("error retrieving CTS key event notification: %s", err)
 	}
 	randUUID, err := uuid.GenerateUUID()
 	if err != nil {

diff --git a/huaweicloud/services/cts/resource_huaweicloud_cts_data_tracker.go b/huaweicloud/services/cts/resource_huaweicloud_cts_data_tracker.go
@@ -478,7 +478,10 @@ func resourceCTSDataTrackerDelete(_ context.Context, d *schema.ResourceData, met
 
 	_, err = ctsClient.DeleteTracker(&deleteOpts)
 	if err != nil {
-		return diag.Errorf("error deleting CTS data tracker %s: %s", trackerName, err)
+		return common.CheckDeletedDiag(d,
+			convertExpected403ErrInto404Err(err, "CTS.0013"),
+			fmt.Sprintf("error deleting CTS data tracker %s", trackerName),
+		)
 	}
 
 	return nil

diff --git a/huaweicloud/services/cts/resource_huaweicloud_cts_notification.go b/huaweicloud/services/cts/resource_huaweicloud_cts_notification.go
@@ -406,7 +406,7 @@ func resourceCTSNotificationDelete(_ context.Context, d *schema.ResourceData, me
 
 	_, err = ctsClient.DeleteNotification(&deleteOpts)
 	if err != nil {
-		return diag.Errorf("error deleting CTS key events notification: %s", err)
+		return common.CheckDeletedDiag(d, err, "error deleting CTS key events notification")
 	}
 
 	return nil

diff --git a/huaweicloud/services/cts/resource_huaweicloud_cts_tracker.go b/huaweicloud/services/cts/resource_huaweicloud_cts_tracker.go
@@ -363,7 +363,7 @@ func resourceCTSTrackerDelete(_ context.Context, d *schema.ResourceData, meta in
 
 		_, err = ctsClient.DeleteTracker(&deleteOpts)
 		if err != nil {
-			return diag.Errorf("error deleting CTS system tracker %s: %s", trackerName, err)
+			return common.CheckDeletedDiag(d, convertExpected403ErrInto404Err(err, "CTS.0013"), "error deleting CTS system tracker")
 		}
 		return nil
 	}
@@ -534,3 +534,12 @@ func updateSystemTrackerStatus(c *client.CtsClient, status string) error {
 	_, err := c.UpdateTracker(&statusReq)
 	return err
 }
+
+func convertExpected403ErrInto404Err(err error, errCode string) error {
+	if responseErr, ok := err.(*sdkerr.ServiceResponseError); ok {
+		if responseErr.StatusCode == http.StatusForbidden && responseErr.ErrorCode == errCode {
+			return golangsdk.ErrDefault404{}
+		}
+	}
+	return err
+}