add tests for extractPlusVersionValues()

Author: pdabelf5

client/nginx.go

@@ -43,11 +43,12 @@ var (
 )
 
 var (
-	ErrParameterRequired = errors.New("parameter is required")
-	ErrServerNotFound    = errors.New("server not found")
-	ErrServerExists      = errors.New("server already exists")
-	ErrNotSupported      = errors.New("not supported")
-	ErrInvalidTimeout    = errors.New("invalid timeout")
+	ErrParameterRequired   = errors.New("parameter is required")
+	ErrServerNotFound      = errors.New("server not found")
+	ErrServerExists        = errors.New("server already exists")
+	ErrNotSupported        = errors.New("not supported")
+	ErrInvalidTimeout      = errors.New("invalid timeout")
+	ErrPlusVersionNotFound = errors.New("plus version not found in the input string")
 )
 
 // NginxClient lets you access NGINX Plus API.
@@ -2031,18 +2032,18 @@ func (client *NginxClient) GetWorkers(ctx context.Context) ([]*Workers, error) {
 
 var rePlus = regexp.MustCompile(`-r(\d+)`)
 
-// extractPlusVersionValues
+// extractPlusVersionValues.
 func extractPlusVersionValues(input string) (int, error) {
 	var rValue int
 	matches := rePlus.FindStringSubmatch(input)
 
 	if len(matches) < 1 {
-		return 0, fmt.Errorf("no matches found in the input string")
+		return 0, fmt.Errorf("%w [%s]", ErrPlusVersionNotFound, input)
 	}
 
 	rValue, err := strconv.Atoi(matches[1])
 	if err != nil {
-		return 0, fmt.Errorf("failed to convert rValue to integer: %w", err)
+		return 0, fmt.Errorf("failed to convert NGINX Plus release to integer: %w", err)
 	}
 
 	return rValue, nil

client/nginx_test.go

@@ -910,3 +910,73 @@ func TestGetMaxAPIVersionClient(t *testing.T) {
 		t.Fatalf("expected %v, got %v", c.apiVersion, maxVer)
 	}
 }
+
+func TestExtractPlusVersion(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		name     string
+		version  string
+		expected int
+	}{
+		{
+			name:     "r32",
+			version:  "nginx-plus-r32",
+			expected: 32,
+		},
+		{
+			name:     "r32p1",
+			version:  "nginx-plus-r32-p1",
+			expected: 32,
+		},
+		{
+			name:     "r32p2",
+			version:  "nginx-plus-r32-p2",
+			expected: 32,
+		},
+		{
+			name:     "r33",
+			version:  "nginx-plus-r33",
+			expected: 33,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			version, err := extractPlusVersionValues(test.version)
+			if err != nil {
+				t.Error(err)
+			}
+			if version != test.expected {
+				t.Errorf("values do not match, got: %d, expected %d)", version, test.expected)
+			}
+		})
+	}
+}
+
+func TestExtractPlusVersionNegativeCase(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		name    string
+		version string
+	}{
+		{
+			name:    "no-number",
+			version: "nginx-plus-rxx",
+		},
+		{
+			name:    "extra-chars",
+			version: "nginx-plus-rxx4343",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			_, err := extractPlusVersionValues(test.version)
+			if err == nil {
+				t.Errorf("Expected error but got %v", err)
+			}
+		})
+	}
+}