fix(enterprise/coderd): check provisionerd API version on connection (#12191)

coderd/healthcheck/provisioner.go

@@ -7,6 +7,7 @@ import (
 
 	"golang.org/x/mod/semver"
 
+	"github.com/coder/coder/v2/apiversion"
 	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/db2sdk"
@@ -14,7 +15,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/coderd/provisionerdserver"
-	"github.com/coder/coder/v2/coderd/util/apiversion"
 	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/provisionersdk"

coderd/util/apiversion/apiversion.go

@@ -1,89 +0,0 @@
-package apiversion
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"golang.org/x/xerrors"
-)
-
-// New returns an *APIVersion with the given major.minor and
-// additional supported major versions.
-func New(maj, min int) *APIVersion {
-	v := &APIVersion{
-		supportedMajor:   maj,
-		supportedMinor:   min,
-		additionalMajors: make([]int, 0),
-	}
-	return v
-}
-
-type APIVersion struct {
-	supportedMajor   int
-	supportedMinor   int
-	additionalMajors []int
-}
-
-func (v *APIVersion) WithBackwardCompat(majs ...int) *APIVersion {
-	v.additionalMajors = append(v.additionalMajors, majs[:]...)
-	return v
-}
-
-func (v *APIVersion) String() string {
-	return fmt.Sprintf("%d.%d", v.supportedMajor, v.supportedMinor)
-}
-
-// Validate validates the given version against the given constraints:
-// A given major.minor version is valid iff:
-//  1. The requested major version is contained within v.supportedMajors
-//  2. If the requested major version is the 'current major', then
-//     the requested minor version must be less than or equal to the supported
-//     minor version.
-//
-// For example, given majors {1, 2} and minor 2, then:
-// - 0.x is not supported,
-// - 1.x is supported,
-// - 2.0, 2.1, and 2.2 are supported,
-// - 2.3+ is not supported.
-func (v *APIVersion) Validate(version string) error {
-	major, minor, err := Parse(version)
-	if err != nil {
-		return err
-	}
-	if major > v.supportedMajor {
-		return xerrors.Errorf("server is at version %d.%d, behind requested major version %s",
-			v.supportedMajor, v.supportedMinor, version)
-	}
-	if major == v.supportedMajor {
-		if minor > v.supportedMinor {
-			return xerrors.Errorf("server is at version %d.%d, behind requested minor version %s",
-				v.supportedMajor, v.supportedMinor, version)
-		}
-		return nil
-	}
-	for _, mjr := range v.additionalMajors {
-		if major == mjr {
-			return nil
-		}
-	}
-	return xerrors.Errorf("version %s is no longer supported", version)
-}
-
-// Parse parses a valid major.minor version string into (major, minor).
-// Both major and minor must be valid integers separated by a period '.'.
-func Parse(version string) (major int, minor int, err error) {
-	parts := strings.Split(version, ".")
-	if len(parts) != 2 {
-		return 0, 0, xerrors.Errorf("invalid version string: %s", version)
-	}
-	major, err = strconv.Atoi(parts[0])
-	if err != nil {
-		return 0, 0, xerrors.Errorf("invalid major version: %s", version)
-	}
-	minor, err = strconv.Atoi(parts[1])
-	if err != nil {
-		return 0, 0, xerrors.Errorf("invalid minor version: %s", version)
-	}
-	return major, minor, nil
-}

coderd/util/apiversion/apiversion_test.go

@@ -1,90 +0,0 @@
-package apiversion_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/coderd/util/apiversion"
-)
-
-func TestAPIVersionValidate(t *testing.T) {
-	t.Parallel()
-
-	// Given
-	v := apiversion.New(2, 1).WithBackwardCompat(1)
-
-	for _, tc := range []struct {
-		name          string
-		version       string
-		expectedError string
-	}{
-		{
-			name:    "OK",
-			version: "2.1",
-		},
-		{
-			name:    "MinorOK",
-			version: "2.0",
-		},
-		{
-			name:    "MajorOK",
-			version: "1.0",
-		},
-		{
-			name:          "TooNewMinor",
-			version:       "2.2",
-			expectedError: "behind requested minor version",
-		},
-		{
-			name:          "TooNewMajor",
-			version:       "3.1",
-			expectedError: "behind requested major version",
-		},
-		{
-			name:          "Malformed0",
-			version:       "cats",
-			expectedError: "invalid version string",
-		},
-		{
-			name:          "Malformed1",
-			version:       "cats.dogs",
-			expectedError: "invalid major version",
-		},
-		{
-			name:          "Malformed2",
-			version:       "1.dogs",
-			expectedError: "invalid minor version",
-		},
-		{
-			name:          "Malformed3",
-			version:       "1.0.1",
-			expectedError: "invalid version string",
-		},
-		{
-			name:          "Malformed4",
-			version:       "11",
-			expectedError: "invalid version string",
-		},
-		{
-			name:          "TooOld",
-			version:       "0.8",
-			expectedError: "no longer supported",
-		},
-	} {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			// When
-			err := v.Validate(tc.version)
-
-			// Then
-			if tc.expectedError == "" {
-				require.NoError(t, err)
-			} else {
-				require.ErrorContains(t, err, tc.expectedError)
-			}
-		})
-	}
-}