remove canary flag

Author: LeMikaelF

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)
@@ -119,12 +118,7 @@ func CreateDatabase(name string) error {
 		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
 	}
 

internal/cmd/db_create.go

@@ -18,7 +18,6 @@ import (
 
 func init() {
 	dbCmd.AddCommand(replicateCmd)
-	addCanaryFlag(replicateCmd)
 	addWaitFlag(replicateCmd, "Wait for the replica to be ready to receive requests.")
 }
 

internal/cmd/db_replicate.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -24,8 +23,7 @@ func init() {
 	groupCmd.AddCommand(unarchiveGroupCmd)
 	addLocationFlag(groupsCreateCmd, "Create the group primary in the specified location")
 	addWaitFlag(groupsCreateCmd, "Wait for group to be ready")
-	addCanaryFlag(groupsCreateCmd)
-	flags.AddVersion(groupsCreateCmd, "Version of the group. Valid values: 'latest', 'canary' or 'vector'")
+	flags.AddVersion(groupsCreateCmd, "Version of the group. Valid values: 'latest' or 'vector'")
 	groupCmd.AddCommand(groupsDestroyCmd)
 	addYesFlag(groupsDestroyCmd, "Confirms the destruction of the group, with all its locations and databases.")
 	groupCmd.AddCommand(groupShowCmd)
@@ -102,16 +100,8 @@ var groupsCreateCmd = &cobra.Command{
 			location, _ = closestLocation(client)
 		}
 
-		version := flags.Version()
-		if canaryFlag {
-			if version != "" {
-				return errors.New("cannot specify both --canary and --version flags")
-			}
-			version = "canary"
-		}
-
 		name := args[0]
-		return createGroup(client, name, location, version)
+		return createGroup(client, name, location, flags.Version())
 	},
 }
 

internal/cmd/group.go

@@ -13,7 +13,7 @@ import (
 func init() {
 	groupCmd.AddCommand(groupUpdateCmd)
 	flags.AddYes(groupUpdateCmd, "Confirms the update")
-	flags.AddVersion(groupUpdateCmd, "Version to update to. Valid values: 'latest', 'canary' or 'vector'")
+	flags.AddVersion(groupUpdateCmd, "Version to update to. Valid values: 'latest' or 'vector'")
 	flags.AddExtensions(groupUpdateCmd, "Extensions to enable. Valid values: 'all' or 'none'")
 }
 

internal/cmd/group_update.go

@@ -9,7 +9,7 @@ var versionFlag string
 func AddVersion(cmd *cobra.Command, desc string) {
 	cmd.Flags().StringVar(&versionFlag, "version", "", desc)
 	_ = cmd.RegisterFlagCompletionFunc("version", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return []string{"latest", "canary"}, cobra.ShellCompDirectiveNoFileComp
+		return []string{"latest"}, cobra.ShellCompDirectiveNoFileComp
 	})
 }