Merge branch 'main' into fork-no-group

Author: m0hossam

go.mod

@@ -22,10 +22,16 @@ require (
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.15.0
+	github.com/stretchr/testify v1.9.0
 	golang.org/x/exp v0.0.0-20240716160929-1d5bc16f04a8
 	golang.org/x/sync v0.7.0
 )
 
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+)
+
 require (
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
@@ -61,7 +67,7 @@ require (
 	github.com/tursodatabase/libsql-client-go v0.0.0-20251205113610-b69dd6e475fc // indirect
 	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/sys v0.13.0
 	golang.org/x/term v0.13.0
 	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

internal/cmd/canary_flag.go

@@ -56,7 +56,6 @@ func init() {
 	flags.AddCSVSeparator(createCmd)
 	addLocationFlag(createCmd, "Location ID. If no ID is specified, closest location to you is used by default.")
 	addWaitFlag(createCmd, "Wait for the database to be ready to receive requests.")
-	addCanaryFlag(createCmd)
 	addEnableExtensionsFlag(createCmd)
 	addSchemaFlag(createCmd)
 	addTypeFlag(createCmd)
@@ -142,18 +141,13 @@ func CreateDatabase(name string) error {
 			return err
 		}
 
-		seed, err = parseDBSeedFlags(client, isAWS, remoteEncryptionCipherFlag)
+		seed, err = parseDBSeedFlags(client, isAWS, remoteEncryptionCipherFlag, multipartFlag)
 		if err != nil {
 			return err
 		}
 	}
 
-	version := "latest"
-	if canaryFlag {
-		version = "canary"
-	}
-
-	if err := ensureGroup(client, groupName, groups, location, version); err != nil {
+	if err := ensureGroup(client, groupName, groups, location, "latest"); err != nil {
 		return err
 	}
 
@@ -287,8 +281,12 @@ func validateEncryptionFlags() error {
 	}
 
 	// if cipher is empty, then it is only valid in case of forks and for everything else we need to have it set
-	if remoteEncryptionCipherFlag == "" && fromDBFlag == "" {
-		return fmt.Errorf("remote encryption cipher must be provided when remote encryption key is set")
+	if remoteEncryptionCipherFlag == "" {
+		if fromDBFlag == "" {
+			return fmt.Errorf("remote encryption cipher must be provided when remote encryption key is set")
+		}
+		// for forks, cipher can be derived from source database
+		return nil
 	}
 
 	if !isValidCipher(remoteEncryptionCipherFlag) {