refactor: remove redundant SnapshotType enum and use protobuf oneof d… (#370)

refactor: remove redundant SnapshotType enum and use protobuf oneof d…

Author: dberkov

cmd/ateapi/internal/controlapi/functional_test.go

@@ -1556,7 +1556,6 @@ func TestSuspendActor(t *testing.T) {
 			ActorTemplateName:      "tmpl1",
 			Status:                 ateapipb.Actor_STATUS_SUSPENDED,
 			LatestSnapshotInfo: &ateapipb.SnapshotInfo{
-				Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL,
 				Data: &ateapipb.SnapshotInfo_External{
 					External: &ateapipb.ExternalSnapshotInfo{
 						SnapshotUriPrefix: fmt.Sprintf("gs://fake-fake-fake/%s/", id),
@@ -1641,7 +1640,6 @@ func TestPauseActor(t *testing.T) {
 			ActorTemplateName:      "tmpl1",
 			Status:                 ateapipb.Actor_STATUS_PAUSED,
 			LatestSnapshotInfo: &ateapipb.SnapshotInfo{
-				Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_LOCAL,
 				Data: &ateapipb.SnapshotInfo_Local{
 					Local: &ateapipb.LocalSnapshotInfo{
 						SnapshotPrefix:            "id1",

cmd/ateapi/internal/controlapi/syncer_test.go

@@ -195,7 +195,6 @@ func TestSyncer_DeleteBoundWorker_ClearsActor(t *testing.T) {
 		AteomPodNamespace: ns, AteomPodName: pod, AteomPodIp: ip,
 		InProgressSnapshot: "gs://snapshots/partial",
 		LatestSnapshotInfo: &ateapipb.SnapshotInfo{
-			Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL,
 			Data: &ateapipb.SnapshotInfo_External{
 				External: &ateapipb.ExternalSnapshotInfo{
 					SnapshotUriPrefix: "gs://snapshots/last",

cmd/ateapi/internal/controlapi/workflow_pause.go

@@ -204,7 +204,6 @@ func (s *FinalizePausedStep) Execute(ctx context.Context, input *PauseInput, sta
 		// TODO(dberkov) - what if InProgressSnapshot is empty? That shouldn't be possible.
 		if latestActor.InProgressSnapshot != "" {
 			latestActor.LatestSnapshotInfo = &ateapipb.SnapshotInfo{
-				Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_LOCAL,
 				Data: &ateapipb.SnapshotInfo_Local{
 					Local: &ateapipb.LocalSnapshotInfo{
 						SnapshotPrefix:            latestActor.InProgressSnapshot,

cmd/ateapi/internal/controlapi/workflow_resume.go

@@ -267,7 +267,7 @@ func (s *CallAteletRestoreStep) Execute(ctx context.Context, input *ResumeInput,
 		return err
 	}
 
-	if state.Actor.GetLatestSnapshotInfo().GetType() != ateapipb.SnapshotType_SNAPSHOT_TYPE_UNSPECIFIED {
+	if data := state.Actor.GetLatestSnapshotInfo().GetData(); data != nil {
 		slog.InfoContext(ctx, "Actor has snapshot; Restoring from snapshot")
 
 		req := &ateletpb.RestoreRequest{
@@ -278,25 +278,25 @@ func (s *CallAteletRestoreStep) Execute(ctx context.Context, input *ResumeInput,
 			ActorTemplateName:      state.Actor.GetActorTemplateName(),
 			Spec:                   workloadSpec,
 		}
-		switch state.Actor.GetLatestSnapshotInfo().GetType() {
-		case ateapipb.SnapshotType_SNAPSHOT_TYPE_LOCAL:
+		switch d := data.(type) {
+		case *ateapipb.SnapshotInfo_Local:
 			req.Type = ateletpb.CheckpointType_CHECKPOINT_TYPE_LOCAL
 			req.Config = &ateletpb.RestoreRequest_LocalConfig{
 				LocalConfig: &ateletpb.LocalCheckpointConfiguration{
-					SnapshotPrefix: state.Actor.GetLatestSnapshotInfo().GetLocal().SnapshotPrefix,
+					SnapshotPrefix: d.Local.GetSnapshotPrefix(),
 				},
 			}
 			req.Scope = toAteletSnapshotScope(state.ActorTemplate.Spec.SnapshotsConfig.OnPause)
-		case ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL:
+		case *ateapipb.SnapshotInfo_External:
 			req.Type = ateletpb.CheckpointType_CHECKPOINT_TYPE_EXTERNAL
 			req.Config = &ateletpb.RestoreRequest_ExternalConfig{
 				ExternalConfig: &ateletpb.ExternalCheckpointConfiguration{
-					SnapshotUriPrefix: state.Actor.GetLatestSnapshotInfo().GetExternal().SnapshotUriPrefix,
+					SnapshotUriPrefix: d.External.GetSnapshotUriPrefix(),
 				},
 			}
 			req.Scope = toAteletSnapshotScope(state.ActorTemplate.Spec.SnapshotsConfig.OnCommit)
 		default:
-			return fmt.Errorf("unsupported snapshot type: %v", state.Actor.GetLatestSnapshotInfo().GetType())
+			return fmt.Errorf("unsupported snapshot type: %T", data)
 		}
 
 		_, err = client.Restore(ctx, req)

cmd/ateapi/internal/controlapi/workflow_suspend.go

@@ -197,7 +197,6 @@ func (s *FinalizeSuspendedStep) Execute(ctx context.Context, input *SuspendInput
 		latestActor.Status = ateapipb.Actor_STATUS_SUSPENDED
 		if latestActor.InProgressSnapshot != "" {
 			latestActor.LatestSnapshotInfo = &ateapipb.SnapshotInfo{
-				Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL,
 				Data: &ateapipb.SnapshotInfo_External{
 					External: &ateapipb.ExternalSnapshotInfo{
 						SnapshotUriPrefix: latestActor.InProgressSnapshot,

cmd/ateapi/internal/store/ateredis/ateredis_test.go

@@ -452,7 +452,6 @@ func TestListActors(t *testing.T) {
 		ActorTemplateName:      "tmpl1",
 		Status:                 ateapipb.Actor_STATUS_SUSPENDED,
 		LatestSnapshotInfo: &ateapipb.SnapshotInfo{
-			Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL,
 			Data: &ateapipb.SnapshotInfo_External{
 				External: &ateapipb.ExternalSnapshotInfo{
 					SnapshotUriPrefix: "gs://b1/f1",
@@ -466,7 +465,6 @@ func TestListActors(t *testing.T) {
 		ActorTemplateName:      "tmpl1",
 		Status:                 ateapipb.Actor_STATUS_SUSPENDED,
 		LatestSnapshotInfo: &ateapipb.SnapshotInfo{
-			Type: ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL,
 			Data: &ateapipb.SnapshotInfo_External{
 				External: &ateapipb.ExternalSnapshotInfo{
 					SnapshotUriPrefix: "gs://b1/f2",

cmd/atecontroller/internal/controllers/actortemplate_controller.go

@@ -151,8 +151,8 @@ func (r *ActorTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 			return ctrl.Result{}, fmt.Errorf("while suspending golden actor: %w", err)
 		}
 
-		if resp.GetActor().GetLatestSnapshotInfo().GetType() != ateapipb.SnapshotType_SNAPSHOT_TYPE_EXTERNAL {
-			return ctrl.Result{}, fmt.Errorf("unexpected snapshot type for golden actor: %v", resp.GetActor().GetLatestSnapshotInfo().GetType())
+		if resp.GetActor().GetLatestSnapshotInfo().GetExternal() == nil {
+			return ctrl.Result{}, fmt.Errorf("unexpected snapshot type for golden actor: %T", resp.GetActor().GetLatestSnapshotInfo().GetData())
 		}
 
 		// Transition to PhaseReady