Merge branch 'master' into update-secret-usage

Author: Leda06

CHANGES.md

@@ -1,6 +1,6 @@
 ## v5.1.0 (unreleased)
 
-* Add `--deployment-strategy` which can have the value `rolling`, `canary`, `blue-green` or `immediate` to service. 
+* Add `--deployment-strategy` which can have the value `rolling`, `blue-green` or `immediate` to service. 
   - https://github.com/koyeb/koyeb-cli/pull/248/files
 
 ## v5.0.0 (2024-08-20)

docs/reference.md

@@ -283,7 +283,7 @@ See examples of koyeb service create --help
       --checks-grace-period strings              Set healthcheck grace period in seconds.
                                                  Use the format <healthcheck>=<seconds>, for example --checks-grace-period 8080=10
                                                  
-      --deployment-strategy STRATEGY             Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
+      --deployment-strategy string               Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
       --docker string                            Docker image
       --docker-args strings                      Set arguments to the docker command. To provide multiple arguments, use the --docker-args flag multiple times.
       --docker-command string                    Set the docker CMD explicitly. To provide arguments to the command, use the --docker-args flag.
@@ -576,7 +576,7 @@ koyeb deploy <path> <app>/<service> [flags]
       --checks-grace-period strings              Set healthcheck grace period in seconds.
                                                  Use the format <healthcheck>=<seconds>, for example --checks-grace-period 8080=10
                                                  
-      --deployment-strategy STRATEGY             Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
+      --deployment-strategy string               Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
       --env strings                              Update service environment variables using the format KEY=VALUE, for example --env FOO=bar
                                                  To use the value of a secret as an environment variable, use the following syntax: 
                                                  --env FOO={{secret.bar}}
@@ -1377,7 +1377,7 @@ $> koyeb service create myservice --app myapp --docker nginx --port 80:tcp
       --checks-grace-period strings              Set healthcheck grace period in seconds.
                                                  Use the format <healthcheck>=<seconds>, for example --checks-grace-period 8080=10
                                                  
-      --deployment-strategy STRATEGY             Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
+      --deployment-strategy string               Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
       --docker string                            Docker image
       --docker-args strings                      Set arguments to the docker command. To provide multiple arguments, use the --docker-args flag multiple times.
       --docker-command string                    Set the docker CMD explicitly. To provide arguments to the command, use the --docker-args flag.
@@ -1798,7 +1798,7 @@ $> koyeb service update myapp/myservice --port 80:tcp --route '!/'
       --checks-grace-period strings              Set healthcheck grace period in seconds.
                                                  Use the format <healthcheck>=<seconds>, for example --checks-grace-period 8080=10
                                                  
-      --deployment-strategy STRATEGY             Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
+      --deployment-strategy string               Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".
       --docker string                            Docker image
       --docker-args strings                      Set arguments to the docker command. To provide multiple arguments, use the --docker-args flag multiple times.
       --docker-command string                    Set the docker CMD explicitly. To provide arguments to the command, use the --docker-args flag.

pkg/koyeb/services.go

@@ -308,7 +308,7 @@ func (h *ServiceHandler) addServiceDefinitionFlagsForAllSources(flags *pflag.Fla
 		[]string{},
 		"Add a region where the service is deployed. You can specify this flag multiple times to deploy the service in multiple regions.\n"+
 			"To update a service and remove a region, prefix the region name with '!', for example --region '!par'\n"+
-			"If the region is not specified on service creation, the service is deployed in fra\n",
+			"If the region is not specified on service creation, the service is deployed in was\n",
 	)
 	flags.StringSlice(
 		"env",
@@ -320,7 +320,7 @@ func (h *ServiceHandler) addServiceDefinitionFlagsForAllSources(flags *pflag.Fla
 	flags.String("instance-type", "nano", "Instance type")
 
 	var strategy DeploymentStrategy
-	flags.Var(&strategy, "deployment-strategy", `Deployment strategy, either "rolling" (default), "canary", "blue-green" or "immediate".`)
+	flags.Var(&strategy, "deployment-strategy", `Deployment strategy, either "rolling" (default), "blue-green" or "immediate".`)
 
 	flags.Int64("scale", 1, "Set both min-scale and max-scale")
 	flags.Int64("min-scale", 1, "Min scale")
@@ -1736,14 +1736,12 @@ func (s *DeploymentStrategy) Set(value string) error {
 	switch value {
 	case "rolling":
 		*s = DeploymentStrategy(koyeb.DEPLOYMENTSTRATEGYTYPE_ROLLING)
-	case "canary":
-		*s = DeploymentStrategy(koyeb.DEPLOYMENTSTRATEGYTYPE_CANARY)
 	case "blue-green":
 		*s = DeploymentStrategy(koyeb.DEPLOYMENTSTRATEGYTYPE_BLUE_GREEN)
 	case "immediate":
 		*s = DeploymentStrategy(koyeb.DEPLOYMENTSTRATEGYTYPE_IMMEDIATE)
 	default:
-		return fmt.Errorf("invalid deployment strategy: %s. Valid values are: rolling, canary, blue-green, immediate.", value)
+		return fmt.Errorf("invalid deployment strategy: %s. Valid values are: rolling, blue-green, immediate.", value)
 	}
 	return nil
 }