Fix TFE version parsing for newer version types (#641)

Author: Shweta-Deshpande

.changes/unreleased/BUG FIXES-638-20250918-163816.yaml

@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: Support TFE versions of type vX.Y.Z
+time: 2025-09-18T16:38:16.255351-07:00
+custom:
+    PR: "641"

docs/faq.md

@@ -235,13 +235,15 @@
 
 - **Can I delete a project that has workspaces in it?**
 
-  This decision was made intentionally to follow the single-responsibility principle and to simplify deployment in a multi-cluster environment.
+  No, you can only delete a project if it is empty and you have the proper permissions.
+
 
 ## Runs Collector Controller
 
 - **Why can't I configure multiple Agent Pools for scraping within a single CR?**
 
-  No, you can only delete a project if it is empty and you have the proper permissions.
+  This decision was made intentionally to follow the single-responsibility principle and to simplify deployment in a multi-cluster environment.
+
 
 ## Workspace Controller
 

internal/controller/agentpool_controller_autoscaling.go

@@ -245,7 +245,7 @@ func (r *AgentPoolReconciler) reconcileAgentAutoscaling(ctx context.Context, ap
 			return pendingWorkspaceRuns(ctx, ap)
 		}
 		tfeVersion := ap.tfClient.Client.RemoteTFEVersion()
-		version, err := parseTFEVersion(tfeVersion)
+		useRunsEndpoint, err := validateTFEVersion(tfeVersion)
 		if err != nil {
 			// If the TFE version parsing fails, do not return the error here and proceed further.
 			// In this case, a legacy algorithm will be taken.
@@ -254,7 +254,7 @@ func (r *AgentPoolReconciler) reconcileAgentAutoscaling(ctx context.Context, ap
 		}
 		// In TFE version v202409-1, a new API endpoint was introduced.
 		// It now allows retrieving a list of runs for the organization.
-		if version >= 2024091 {
+		if useRunsEndpoint {
 			ap.log.Info("Reconcile Agent Autoscaling", "msg", fmt.Sprintf("Proceeding with the new algorithm based on the detected TFE version %s", tfeVersion))
 			return pendingWorkspaceRuns(ctx, ap)
 		}

internal/controller/helpers.go

@@ -100,12 +100,34 @@ func secretKeyRef(ctx context.Context, c client.Client, nn types.NamespacedName,
 	return "", fmt.Errorf("unable to find key=%q in secret=%q namespace=%q", key, nn.Name, nn.Namespace)
 }
 
-func parseTFEVersion(version string) (int, error) {
+func validateTFEVersion(version string) (bool, error) {
+	// For versions 1.0.0 and 1.0.1 version string will be empty
+	if version == "" {
+		return true, nil
+	}
+
+	// Check for the version format vYYYYMM-N (e.g., v202310-1)
 	versionRegexp := regexp.MustCompile(`^v([0-9]{6})-([0-9]{1})$`)
 	matches := versionRegexp.FindStringSubmatch(version)
 	if len(matches) == 3 {
-		return strconv.Atoi(matches[1] + matches[2])
+		dateVersion, err := strconv.Atoi(matches[1] + matches[2])
+		if err != nil {
+			return false, err
+		}
+		if dateVersion >= 2024091 {
+			return true, nil
+		}
+	}
+
+	// Check for the version format vX.Y.Z (e.g., v1.2.3) or X.Y.Z (e.g., 1.2.3)
+	isASemVer, err := regexp.MatchString(`v?([0-9]+)\.([0-9]+)\.([0-9]+)`, version)
+	if err != nil {
+		return false, err
+	}
+	if isASemVer {
+		return true, nil
 	}
 
-	return 0, fmt.Errorf("malformed TFE version %s", version)
+	// If the version does not match any of the expected formats, return an error
+	return false, fmt.Errorf("malformed TFE version %s", version)
 }

internal/controller/helpers_test.go

@@ -200,22 +200,49 @@ var _ = Describe("Helpers", Label("Unit"), func() {
 		})
 	})
 
-	Context("ParseTFEVersion", func() {
+	Context("ValidateTFEVersion", func() {
 		It("Valid TFE version", func() {
 			version := "v202502-1"
-			v, err := parseTFEVersion(version)
+			answer, err := validateTFEVersion(version)
 			Expect(err).To(Succeed())
-			Expect(v).To(Equal(2025021))
+			Expect(answer).To(Equal(true))
 		})
 		It("Invalid TFE version", func() {
 			version := "202502-1"
-			_, err := parseTFEVersion(version)
+			answer, err := validateTFEVersion(version)
 			Expect(err).ToNot(Succeed())
+			Expect(answer).To(Equal(false))
+
 		})
 		It("Empty TFE version", func() {
 			version := ""
-			_, err := parseTFEVersion(version)
+			answer, err := validateTFEVersion(version)
+			Expect(err).To(Succeed())
+			Expect(answer).To(Equal(true))
+		})
+		It("New valid TFE version", func() {
+			version := "1.0.0"
+			answer, err := validateTFEVersion(version)
+			Expect(err).To(Succeed())
+			Expect(answer).To(Equal(true))
+		})
+		It("New valid TFE version 2", func() {
+			version := "v1.0.1"
+			answer, err := validateTFEVersion(version)
+			Expect(err).To(Succeed())
+			Expect(answer).To(Equal(true))
+		})
+		It("New invalid TFE version", func() {
+			version := "1.0"
+			answer, err := validateTFEVersion(version)
+			Expect(err).ToNot(Succeed())
+			Expect(answer).To(Equal(false))
+		})
+		It("New invalid TFE version 2", func() {
+			version := "v1.0"
+			answer, err := validateTFEVersion(version)
 			Expect(err).ToNot(Succeed())
+			Expect(answer).To(Equal(false))
 		})
 	})
 })