Merge branch '605-snapshot-id' into 'dle-4-0'

fix: take precedence snapshot ID over the branch name when clone creates (#605)

See merge request postgres-ai/database-lab!1011

Author: bogdan-ts

engine/internal/srv/routes.go

@@ -485,7 +485,30 @@ func (s *Server) createClone(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if cloneRequest.Branch != "" {
+	if cloneRequest.Snapshot != nil && cloneRequest.Snapshot.ID != "" {
+		fsm, err := s.getFSManagerForSnapshot(cloneRequest.Snapshot.ID)
+		if err != nil {
+			api.SendBadRequestError(w, r, err.Error())
+			return
+		}
+
+		if fsm == nil {
+			api.SendBadRequestError(w, r, "no pool manager found")
+			return
+		}
+
+		branch := branching.ParseBranchNameFromSnapshot(cloneRequest.Snapshot.ID, fsm.Pool().Name)
+		if branch == "" {
+			branch = branching.DefaultBranch
+		}
+
+		// Snapshot ID takes precedence over the branch name.
+		cloneRequest.Branch = branch
+	} else {
+		if cloneRequest.Branch == "" {
+			cloneRequest.Branch = branching.DefaultBranch
+		}
+
 		fsm, err := s.getFSManagerForBranch(cloneRequest.Branch)
 		if err != nil {
 			api.SendBadRequestError(w, r, err.Error())
@@ -510,8 +533,6 @@ func (s *Server) createClone(w http.ResponseWriter, r *http.Request) {
 		}
 
 		cloneRequest.Snapshot = &types.SnapshotCloneFieldRequest{ID: snapshotID}
-	} else {
-		cloneRequest.Branch = branching.DefaultBranch
 	}
 
 	if cloneRequest.ID != "" {

engine/internal/validator/validator.go

@@ -6,10 +6,10 @@
 package validator
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
-	"github.com/pkg/errors"
 	passwordvalidator "github.com/wagslane/go-password-validator"
 
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/client/dblabapi/types"
@@ -36,7 +36,7 @@ func (v Service) ValidateCloneRequest(cloneRequest *types.CloneCreateRequest) er
 	}
 
 	if cloneRequest.ID != "" && strings.Contains(cloneRequest.ID, "/") {
-		return errors.New("Clone ID cannot contain slash ('/'). Please choose another ID")
+		return errors.New("clone ID cannot contain slash ('/'). Please choose another ID")
 	}
 
 	if err := passwordvalidator.Validate(cloneRequest.DB.Password, minEntropyBits); err != nil {

engine/internal/validator/validator_test.go

@@ -19,7 +19,8 @@ func TestValidationCloneRequest(t *testing.T) {
 			DB: &types.DatabaseRequest{
 				Username: "username",
 				Password: "secret_password",
-			}})
+			},
+		})
 
 	assert.Nil(t, err)
 }
@@ -31,7 +32,8 @@ func TestWeakPassword(t *testing.T) {
 			DB: &types.DatabaseRequest{
 				Username: "username",
 				Password: "password",
-			}})
+			},
+		})
 
 	assert.ErrorContains(t, err, "insecure password")
 }
@@ -60,7 +62,7 @@ func TestValidationCloneRequestErrors(t *testing.T) {
 				DB: &types.DatabaseRequest{Username: "user", Password: "password"},
 				ID: "test/ID",
 			},
-			error: "Clone ID cannot contain slash ('/'). Please choose another ID",
+			error: "clone ID cannot contain slash ('/'). Please choose another ID",
 		},
 	}
 

engine/pkg/util/branching/branching.go

@@ -84,3 +84,27 @@ func parseCloneDataset(cloneDataset, poolName string) []string {
 
 	return splits
 }
+
+// ParseBranchNameFromSnapshot parses branch name from the snapshot ID.
+func ParseBranchNameFromSnapshot(snapshot, poolName string) string {
+	dataset, _, found := strings.Cut(snapshot, "@")
+	if !found {
+		return ""
+	}
+
+	branchPrefix := poolName + "/" + BranchDir + "/"
+	if !strings.HasPrefix(dataset, branchPrefix) {
+		return ""
+	}
+
+	trimmedDataset := strings.TrimPrefix(dataset, branchPrefix)
+
+	splits := strings.SplitN(trimmedDataset, "/", 2)
+	if len(splits) < 1 {
+		return ""
+	}
+
+	branch := splits[0]
+
+	return branch
+}

engine/pkg/util/branching/branching_test.go

@@ -0,0 +1,35 @@
+package branching
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParsingBranchNameFromSnapshot(t *testing.T) {
+	const poolName = "pool/pg17"
+
+	testCases := []struct {
+		input    string
+		expected string
+	}{
+		{
+			input:    "pool/pg17@snapshot_20250407101616",
+			expected: "",
+		},
+		{
+			input:    "pool/pg17/branch/dev@20250407101828",
+			expected: "dev",
+		},
+		{
+			input:    "pool/pg17/branch/main/cvpqe8gn9i6s73b49e3g/r0@20250407102140",
+			expected: "main",
+		},
+	}
+
+	for _, tc := range testCases {
+		branchName := ParseBranchNameFromSnapshot(tc.input, poolName)
+
+		assert.Equal(t, tc.expected, branchName)
+	}
+}