follow-up to 7b2552e: moving away from specific notebook id conversio…

…n to generic
DataDog · Jan 20, 2025 · b198577 · b198577
1 parent 5a1b155
commit b198577
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/internal/controller/datadoggenericresource/notebooks.go b/internal/controller/datadoggenericresource/notebooks.go
@@ -3,8 +3,6 @@ package datadoggenericresource
 import (
 	"context"
 	"encoding/json"
-	"fmt"
-	"strconv"
 
 	"github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1"
 	"github.com/go-logr/logr"
@@ -23,7 +21,7 @@ func (h *NotebookHandler) createResourcefunc(r *Reconciler, logger logr.Logger,
 		return err
 	}
 	logger.Info("created a new notebook", "notebook Id", createdNotebook.Data.GetId())
-	status.Id = notebookInt64ToString(createdNotebook.Data.GetId())
+	status.Id = resourceInt64ToStringID(createdNotebook.Data.GetId())
 	createdTime := metav1.NewTime(*createdNotebook.Data.GetAttributes().Created)
 	status.Created = &createdTime
 	status.LastForceSyncTime = &createdTime
@@ -46,7 +44,7 @@ func (h *NotebookHandler) deleteResourcefunc(r *Reconciler, instance *v1alpha1.D
 }
 
 func getNotebook(auth context.Context, client *datadogV1.NotebooksApi, notebookStringID string) (datadogV1.NotebookResponse, error) {
-	notebookID, err := notebookStringToInt64(notebookStringID)
+	notebookID, err := resourceStringToInt64ID(notebookStringID)
 	if err != nil {
 		return datadogV1.NotebookResponse{}, err
 	}
@@ -58,7 +56,7 @@ func getNotebook(auth context.Context, client *datadogV1.NotebooksApi, notebookS
 }
 
 func deleteNotebook(auth context.Context, client *datadogV1.NotebooksApi, notebookStringID string) error {
-	notebookID, err := notebookStringToInt64(notebookStringID)
+	notebookID, err := resourceStringToInt64ID(notebookStringID)
 	if err != nil {
 		return err
 	}
@@ -81,7 +79,7 @@ func createNotebook(auth context.Context, client *datadogV1.NotebooksApi, instan
 func updateNotebook(auth context.Context, client *datadogV1.NotebooksApi, instance *v1alpha1.DatadogGenericResource) (datadogV1.NotebookResponse, error) {
 	notebookUpdateData := &datadogV1.NotebookUpdateRequest{}
 	json.Unmarshal([]byte(instance.Spec.JsonSpec), notebookUpdateData)
-	notebookID, err := notebookStringToInt64(instance.Status.Id)
+	notebookID, err := resourceStringToInt64ID(instance.Status.Id)
 	if err != nil {
 		return datadogV1.NotebookResponse{}, err
 	}
@@ -91,15 +89,3 @@ func updateNotebook(auth context.Context, client *datadogV1.NotebooksApi, instan
 	}
 	return notebookUpdated, nil
 }
-
-func notebookStringToInt64(notebookStringID string) (int64, error) {
-	notebookID, err := strconv.ParseInt(notebookStringID, 10, 64)
-	if err != nil {
-		return 0, fmt.Errorf("error parsing notebook Id: %w", err)
-	}
-	return notebookID, nil
-}
-
-func notebookInt64ToString(notebookID int64) string {
-	return strconv.FormatInt(notebookID, 10)
-}