chore(go): clean up state handling

Author: sinanmohd

internal/controller/snapshot_controller.go

@@ -250,8 +250,8 @@ func (r *SnapShotReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 			log.Error(err, "unable fetch daemonset job status")
 			return ctrl.Result{}, err
 		}
-		snapshot.Status.Stage = stove8sv1beta1.SnapShotStatusStage(ociStatus.Stage)
-		snapshot.Status.State = stove8sv1beta1.SnapShotStatusState(ociStatus.State)
+		snapshot.Status.Stage = ociStatus.Stage
+		snapshot.Status.State = ociStatus.State
 		if err := r.Status().Update(ctx, snapshot); err != nil {
 			log.Error(err, "unable to update Snapshot status with daemonset status")
 			return ctrl.Result{}, err
@@ -310,7 +310,7 @@ func (r *SnapShotReconciler) PodImageUpdate(
 func daemonsetStausFetch(
 	jobID string,
 	node stove8sv1beta1.SnapShotStatusNode,
-) (*oci.OciStatus, error) {
+) (*oci.Status, error) {
 	ociEndpoint := fmt.Sprintf("http://%s:%v/oci/%s", node.Addr, node.DeamonsetPort, jobID)
 	req, err := http.NewRequest(http.MethodGet, ociEndpoint, nil)
 	if err != nil {
@@ -324,7 +324,7 @@ func daemonsetStausFetch(
 		return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
 	}
 
-	var ociStatus oci.OciStatus
+	var ociStatus oci.Status
 	err = json.NewDecoder(resp.Body).Decode(&ociStatus)
 	if err != nil {
 		return nil, err
@@ -372,7 +372,7 @@ func daemonsetInit(
 		return "", err
 	}
 
-	return createResp.JobId, nil
+	return createResp.JobID, nil
 }
 
 func (r *SnapShotReconciler) kubeletEndpointFromPod(ctx context.Context, pod *corev1.Pod) (string, string, int32, error) {

internal/daemonset/daemonset.go

@@ -32,7 +32,7 @@ func routerInit() (*chi.Mux, error) {
 	router.Use(middlewareServerHeader)
 	router.Use(middleware.Recoverer)
 
-	ociHandler, err := oci.OciResource{}.Init()
+	ociHandler, err := oci.Resource{}.Init()
 	if err != nil {
 		return nil, err
 	}

internal/daemonset/resources/oci/create.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"net/http"
 
+	stove8sv1beta1 "bud.studio/stove8s/api/v1beta1"
 	"bud.studio/stove8s/internal/k8s"
 	"bud.studio/stove8s/internal/oci"
 	"github.com/go-playground/validator/v10"
@@ -28,28 +29,28 @@ type CreateResp struct {
 	JobID string `json:"job_id"`
 }
 
-func (rs OciResource) CreateAsync(id uuid.UUID, data *CreateReq) {
-	status := OciStatus{
-		Stage: Fromating,
-		State: Started,
+func (rs Resource) CreateAsync(id uuid.UUID, data *CreateReq) {
+	status := Status{
+		Stage: stove8sv1beta1.Fromating,
+		State: stove8sv1beta1.Started,
 	}
 	rs.jobs[id] = &status
 
 	img, err := oci.BuildImage(data.CheckpointDumpPath)
 	if err != nil {
 		slog.Error("Building oci image", "err", err)
-		status.State = Failed
+		status.State = stove8sv1beta1.Failed
 		return
 	}
 	ref, err := name.ParseReference(data.ImageReference)
 	if err != nil {
 		slog.Error("Creating reference", "err", err)
-		status.State = Failed
+		status.State = stove8sv1beta1.Failed
 		return
 	}
 
-	status.Stage = Pushing
-	status.State = Started
+	status.Stage = stove8sv1beta1.Pushing
+	status.State = stove8sv1beta1.Started
 
 	auth, err := k8s.ImagePushSecretGet(
 		rs.k8sClient,
@@ -59,7 +60,7 @@ func (rs OciResource) CreateAsync(id uuid.UUID, data *CreateReq) {
 	)
 	if err != nil {
 		slog.Error("Getting image push secret", "err", err)
-		status.State = Failed
+		status.State = stove8sv1beta1.Failed
 		return
 	}
 	err = remote.Write(
@@ -69,14 +70,14 @@ func (rs OciResource) CreateAsync(id uuid.UUID, data *CreateReq) {
 	)
 	if err != nil {
 		slog.Error("Pushing to remote", "err", err)
-		status.State = Failed
+		status.State = stove8sv1beta1.Failed
 		return
 	}
 
-	status.State = Success
+	status.State = stove8sv1beta1.Success
 }
 
-func (rs OciResource) Create(rw http.ResponseWriter, req *http.Request) {
+func (rs Resource) Create(rw http.ResponseWriter, req *http.Request) {
 	var data CreateReq
 	err := json.NewDecoder(req.Body).Decode(&data)
 	if err != nil {

internal/daemonset/resources/oci/get.go

@@ -10,10 +10,10 @@ import (
 )
 
 type listResp struct {
-	Jobs map[uuid.UUID]*OciStatus `json:"jobs"`
+	Jobs map[uuid.UUID]*Status `json:"jobs"`
 }
 
-func (rs OciResource) List(rw http.ResponseWriter, req *http.Request) {
+func (rs Resource) List(rw http.ResponseWriter, req *http.Request) {
 	resp, err := json.Marshal(listResp{
 		Jobs: rs.jobs,
 	})
@@ -29,7 +29,7 @@ func (rs OciResource) List(rw http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func (rs OciResource) Get(rw http.ResponseWriter, req *http.Request) {
+func (rs Resource) Get(rw http.ResponseWriter, req *http.Request) {
 	idString := chi.URLParam(req, "id")
 	if idString == "" {
 		http.Error(rw, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)

internal/daemonset/resources/oci/oci.go

@@ -4,32 +4,21 @@ import (
 	"fmt"
 	"os"
 
+	stove8sv1beta1 "bud.studio/stove8s/api/v1beta1"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-type ociStatusStage string
-type ociStatusState string
-
-const (
-	Fromating ociStatusStage = "Fromating"
-	Pushing   ociStatusStage = "Pushing"
-
-	Started ociStatusState = "Started"
-	Failed  ociStatusState = "Failed"
-	Success ociStatusState = "Success"
-)
-
-type OciStatus struct {
-	Stage ociStatusStage `json:"stage"`
-	State ociStatusState `json:"state"`
+type Status struct {
+	Stage stove8sv1beta1.SnapShotStatusStage `json:"stage"`
+	State stove8sv1beta1.SnapShotStatusState `json:"state"`
 }
 
-type OciResource struct {
-	jobs      map[uuid.UUID]*OciStatus
+type Resource struct {
+	jobs      map[uuid.UUID]*Status
 	k8sClient *kubernetes.Clientset
 }
 
@@ -54,14 +43,14 @@ func k8sClientInit() (*kubernetes.Clientset, error) {
 	return clientset, nil
 }
 
-func (rs OciResource) Init() (chi.Router, error) {
+func (rs Resource) Init() (chi.Router, error) {
 	k8sClient, err := k8sClientInit()
 	if err != nil {
 		return nil, err
 	}
 
 	rs.k8sClient = k8sClient
-	rs.jobs = make(map[uuid.UUID]*OciStatus)
+	rs.jobs = make(map[uuid.UUID]*Status)
 
 	r := chi.NewRouter()