SLO deletion, ignore 404 error in finalizer (#1854)

* SLO deletion, ignore 404 error in finalizer

* Return actual status instead of 200

Author: levan-m

internal/controller/datadogslo/controller.go

@@ -286,11 +286,14 @@ func (r *Reconciler) deleteResource(logger logr.Logger, instance *v1alpha1.Datad
 	return func(ctx context.Context, k8sObj client.Object, datadogID string) error {
 		if datadogID != "" {
 			kind := k8sObj.GetObjectKind().GroupVersionKind().Kind
-			if err := deleteSLO(r.datadogAuth, r.datadogClient, datadogID); err != nil {
-				logger.Error(err, "error deleting SLO", "kind", kind, "ID", datadogID)
+			httpErrorCode, err := deleteSLO(r.datadogAuth, r.datadogClient, datadogID)
+			if err != nil && httpErrorCode != 404 {
 				return err
+			} else if httpErrorCode == 404 {
+				logger.Info("Object not found, nothing to delete", "kind", kind, "ID", datadogID)
+			} else {
+				logger.Info("Successfully deleted object", "kind", kind, "ID", datadogID)
 			}
-			logger.Info("Successfully deleted object", "kind", kind, "ID", datadogID)
 		}
 		r.recordEvent(instance, buildEventInfo(k8sObj.GetName(), k8sObj.GetNamespace(), datadog.DeletionEvent))
 		return nil

internal/controller/datadogslo/slo.go

@@ -115,15 +115,16 @@ func updateSLO(auth context.Context, client *datadogV1.ServiceLevelObjectivesApi
 	return sloListResponse, nil
 }
 
-func deleteSLO(auth context.Context, client *datadogV1.ServiceLevelObjectivesApi, sloID string) error {
+func deleteSLO(auth context.Context, client *datadogV1.ServiceLevelObjectivesApi, sloID string) (int, error) {
 	force := "false"
 	optionalParams := datadogV1.DeleteSLOOptionalParameters{
 		Force: &force,
 	}
-	if _, _, err := client.DeleteSLO(auth, sloID, optionalParams); err != nil {
-		return translateClientError(err, "error deleting SLO")
+	_, localVarHTTPResponse, err := client.DeleteSLO(auth, sloID, optionalParams)
+	if err != nil {
+		return localVarHTTPResponse.StatusCode, translateClientError(err, "error deleting SLO")
 	}
-	return nil
+	return localVarHTTPResponse.StatusCode, nil
 }
 
 func translateClientError(err error, msg string) error {