Add range options to --scale

docs/cmd/kn_service_create.md

@@ -88,7 +88,7 @@ kn service create NAME --image IMAGE
       --requests-cpu string               DEPRECATED: please use --request instead. The requested CPU (e.g., 250m).
       --requests-memory string            DEPRECATED: please use --request instead. The requested memory (e.g., 64Mi).
       --revision-name string              The revision name to set. Must start with the service name and a dash as a prefix. Empty revision name will result in the server generating a name for the revision. Accepts golang templates, allowing {{.Service}} for the service name, {{.Generation}} for the generation, and {{.Random [n]}} for n random consonants. (default "{{.Service}}-{{.Random 5}}-{{.Generation}}")
-      --scale int                         Minimum and maximum number of replicas.
+      --scale string                      Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 (scale-min = 5, scale-max = 5) or --scale 1..5 (scale-min = 1, scale-max = 5) or --scale 1.. (scale-min = 1, scale-max = unchanged) or --scale ..5 (scale-min = unchanged, scale-max = 5)
       --scale-init int                    Initial number of replicas with which a service starts. Can be 0 or a positive integer.
       --scale-max int                     Maximum number of replicas.
       --scale-min int                     Minimum number of replicas.

docs/cmd/kn_service_update.md

@@ -71,7 +71,7 @@ kn service update NAME
       --requests-cpu string               DEPRECATED: please use --request instead. The requested CPU (e.g., 250m).
       --requests-memory string            DEPRECATED: please use --request instead. The requested memory (e.g., 64Mi).
       --revision-name string              The revision name to set. Must start with the service name and a dash as a prefix. Empty revision name will result in the server generating a name for the revision. Accepts golang templates, allowing {{.Service}} for the service name, {{.Generation}} for the generation, and {{.Random [n]}} for n random consonants. (default "{{.Service}}-{{.Random 5}}-{{.Generation}}")
-      --scale int                         Minimum and maximum number of replicas.
+      --scale string                      Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 (scale-min = 5, scale-max = 5) or --scale 1..5 (scale-min = 1, scale-max = 5) or --scale 1.. (scale-min = 1, scale-max = unchanged) or --scale ..5 (scale-min = unchanged, scale-max = 5)
       --scale-init int                    Initial number of replicas with which a service starts. Can be 0 or a positive integer.
       --scale-max int                     Maximum number of replicas.
       --scale-min int                     Minimum number of replicas.

pkg/kn/commands/service/configuration_edit_flags.go

@@ -15,6 +15,7 @@
 package service
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -39,7 +40,7 @@ type ConfigurationEditFlags struct {
 	PodSpecFlags knflags.PodSpecFlags
 
 	// Direct field manipulation
-	Scale                  int
+	Scale                  string
 	MinScale               int
 	MaxScale               int
 	ConcurrencyTarget      int
@@ -88,7 +89,11 @@ func (p *ConfigurationEditFlags) addSharedFlags(command *cobra.Command) {
 	command.Flags().MarkHidden("max-scale")
 	p.markFlagMakesRevision("max-scale")
 
-	command.Flags().IntVar(&p.Scale, "scale", 0, "Minimum and maximum number of replicas.")
+	command.Flags().StringVar(&p.Scale, "scale", "",
+		"Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, "+
+			"or set a range with min/max values, or set either min or max values without specifying the other. "+
+			"Example: --scale 5 (scale-min = 5, scale-max = 5) or --scale 1..5 (scale-min = 1, scale-max = 5) or --scale "+
+			"1.. (scale-min = 1, scale-max = unchanged) or --scale ..5 (scale-min = unchanged, scale-max = 5)")
 	p.markFlagMakesRevision("scale")
 
 	command.Flags().IntVar(&p.MinScale, "scale-min", 0, "Minimum number of replicas.")
@@ -358,14 +363,19 @@ func (p *ConfigurationEditFlags) Apply(
 		} else if cmd.Flags().Changed("scale-min") {
 			return fmt.Errorf("only --scale or --scale-min can be specified")
 		} else {
-			err = servinglib.UpdateMaxScale(template, p.Scale)
+			scaleMin, scaleMax, err := p.scaleConversion(p.Scale)
 			if err != nil {
 				return err
 			}
-			err = servinglib.UpdateMinScale(template, p.Scale)
+			err = servinglib.UpdateMinScale(template, scaleMin)
 			if err != nil {
 				return err
 			}
+			err = servinglib.UpdateMaxScale(template, scaleMax)
+			if err != nil {
+				return err
+			}
+
 		}
 	}
 
@@ -560,3 +570,43 @@ func (p *ConfigurationEditFlags) AnyMutation(cmd *cobra.Command) bool {
 	}
 	return false
 }
+
+// Helper function for --scale
+func (p *ConfigurationEditFlags) scaleConversion(scale string) (scaleMin int, scaleMax int, err error) {
+	if len(scale) <= 2 {
+		scaleMin, scaleMax, err = p.scaleSingleValue(scale)
+	} else if strings.Contains(scale, "..") {
+		scaleMin, scaleMax, err = p.scaleRange(scale)
+	} else {
+		return 0, 0, errors.New("Scale must be of the format x..y or x")
+	}
+	return scaleMin, scaleMax, err
+}
+
+func (p *ConfigurationEditFlags) scaleSingleValue(scale string) (scaleMin int, scaleMax int, err error) {
+	if !strings.Contains(scale, "..") {
+		scaleMin, err = strconv.Atoi(scale)
+		if err != nil {
+			return 0, 0, err
+		}
+		scaleMax = scaleMin
+	}
+	return scaleMin, scaleMax, err
+}
+
+func (p *ConfigurationEditFlags) scaleRange(scale string) (scaleMin int, scaleMax int, err error) {
+	scaleParts := strings.Split(scale, "..")
+	if scaleParts[0] != "" {
+		scaleMin, err = strconv.Atoi(scaleParts[0])
+		if err != nil {
+			return 0, 0, err
+		}
+	}
+	if scaleParts[1] != "" {
+		scaleMax, err = strconv.Atoi(scaleParts[1])
+		if err != nil {
+			return 0, 0, err
+		}
+	}
+	return scaleMin, scaleMax, err
+}

pkg/kn/commands/service/create_test.go

@@ -521,8 +521,9 @@ func TestServiceCreateMaxMinScale(t *testing.T) {
 
 	if err != nil {
 		t.Fatal(err)
-	} else if !action.Matches("create", "services") {
-		t.Fatalf("Bad action %v", action)
+	}
+	if !action.Matches("create", "services") {
+		t.Fatal("Bad action ", action)
 	}
 
 	template := &created.Spec.Template
@@ -555,8 +556,9 @@ func TestServiceCreateScale(t *testing.T) {
 
 	if err != nil {
 		t.Fatal(err)
-	} else if !action.Matches("create", "services") {
-		t.Fatalf("Bad action %v", action)
+	}
+	if !action.Matches("create", "services") {
+		t.Fatal("Bad action ", action)
 	}
 
 	template := &created.Spec.Template
@@ -583,7 +585,7 @@ func TestServiceCreateScaleWithNegativeValue(t *testing.T) {
 	if err == nil {
 		t.Fatal(err)
 	}
-	expectedErrMsg := "expected 0 <= -1 <= 2147483647: autoscaling.knative.dev/maxScale"
+	expectedErrMsg := "expected 0 <= -1 <= 2147483647: autoscaling.knative.dev/minScale"
 	if !strings.Contains(err.Error(), expectedErrMsg) {
 		t.Errorf("Invalid error output, expected: %s, got : '%s'", expectedErrMsg, err)
 	}
@@ -618,6 +620,119 @@ func TestServiceCreateScaleWithMinScaleSet(t *testing.T) {
 
 }
 
+func TestServiceCreateScaleRange(t *testing.T) {
+	action, created, _, err := fakeServiceCreate([]string{
+		"service", "create", "foo", "--image", "gcr.io/foo/bar:baz",
+		"--scale", "1..5", "--no-wait"}, false)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !action.Matches("create", "services") {
+		t.Fatal("Bad action ", action)
+	}
+
+	template := &created.Spec.Template
+
+	actualAnnos := template.Annotations
+	expectedAnnos := []string{
+		"autoscaling.knative.dev/minScale", "1",
+		"autoscaling.knative.dev/maxScale", "5",
+	}
+
+	for i := 0; i < len(expectedAnnos); i += 2 {
+		anno := expectedAnnos[i]
+		if actualAnnos[anno] != expectedAnnos[i+1] {
+			t.Fatalf("Unexpected annotation value for %s : %s (actual) != %s (expected)",
+				anno, actualAnnos[anno], expectedAnnos[i+1])
+		}
+	}
+}
+
+func TestServiceCreateScaleRangeOnlyMin(t *testing.T) {
+	action, created, _, err := fakeServiceCreate([]string{
+		"service", "create", "foo", "--image", "gcr.io/foo/bar:baz",
+		"--scale", "1..", "--no-wait"}, false)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !action.Matches("create", "services") {
+		t.Fatal("Bad action ", action)
+	}
+
+	template := &created.Spec.Template
+
+	actualAnnos := template.Annotations
+	expectedAnnos := []string{
+		"autoscaling.knative.dev/minScale", "1",
+	}
+
+	for i := 0; i < len(expectedAnnos); i += 2 {
+		anno := expectedAnnos[i]
+		if actualAnnos[anno] != expectedAnnos[i+1] {
+			t.Fatalf("Unexpected annotation value for %s : %s (actual) != %s (expected)",
+				anno, actualAnnos[anno], expectedAnnos[i+1])
+		}
+	}
+}
+
+func TestServiceCreateScaleRangeOnlyMax(t *testing.T) {
+	action, created, _, err := fakeServiceCreate([]string{
+		"service", "create", "foo", "--image", "gcr.io/foo/bar:baz",
+		"--scale", "..5", "--no-wait"}, false)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !action.Matches("create", "services") {
+		t.Fatal("Bad action ", action)
+	}
+
+	template := &created.Spec.Template
+
+	actualAnnos := template.Annotations
+	expectedAnnos := []string{
+		"autoscaling.knative.dev/maxScale", "5",
+	}
+
+	for i := 0; i < len(expectedAnnos); i += 2 {
+		anno := expectedAnnos[i]
+		if actualAnnos[anno] != expectedAnnos[i+1] {
+			t.Fatalf("Unexpected annotation value for %s : %s (actual) != %s (expected)",
+				anno, actualAnnos[anno], expectedAnnos[i+1])
+		}
+	}
+}
+
+func TestServiceCreateScaleRangeOnlyMinWrongSeparator(t *testing.T) {
+	_, _, _, err := fakeServiceCreate([]string{
+		"service", "create", "foo", "--image", "gcr.io/foo/bar:baz",
+		"--scale", "1--", "--no-wait"}, true)
+	if err == nil {
+		t.Fatal(err)
+	}
+	expectedErrMsg := "Scale must be of the format x..y or x"
+	if !strings.Contains(err.Error(), expectedErrMsg) {
+		t.Errorf("Invalid error output, expected: %s, got : '%s'", expectedErrMsg, err)
+	}
+
+}
+
+func TestServiceCreateScaleRangeOnlyMaxWrongSeparator(t *testing.T) {
+	_, _, _, err := fakeServiceCreate([]string{
+		"service", "create", "foo", "--image", "gcr.io/foo/bar:baz",
+		"--scale", "--1", "--no-wait"}, true)
+	if err == nil {
+		t.Fatal(err)
+	}
+	expectedErrMsg := "Scale must be of the format x..y or x"
+	if !strings.Contains(err.Error(), expectedErrMsg) {
+		t.Errorf("Invalid error output, expected: %s, got : '%s'", expectedErrMsg, err)
+	}
+
+}
+
 func TestServiceCreateRequestsLimitsCPUMemory(t *testing.T) {
 	action, created, _, err := fakeServiceCreate([]string{
 		"service", "create", "foo", "--image", "gcr.io/foo/bar:baz",
@@ -1054,5 +1169,5 @@ func TestServiceCreateFromYAMLWithOverrideError(t *testing.T) {
 	_, _, _, err = fakeServiceCreate([]string{
 		"service", "create", "foo", "--filename", tempFile, "--scale", "-1"}, false)
 	assert.Assert(t, err != nil)
-	assert.Assert(t, util.ContainsAll(err.Error(), "expected", "0", "<=", "2147483647", "autoscaling.knative.dev/maxScale"))
+	assert.Assert(t, util.ContainsAll(err.Error(), "expected 0 <= -1 <= 2147483647: autoscaling.knative.dev/minScale"))
 }