Simplify AKS version validation code

Co-authored-by: stephybun <[email protected]>
hashicorp · Jun 22, 2022 · 4a167e3 · 4a167e3
1 parent 124a8d9
commit 4a167e3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/internal/services/containers/kubernetes_cluster_validate.go b/internal/services/containers/kubernetes_cluster_validate.go
@@ -272,11 +272,10 @@ func validateNodePoolSupportsVersion(ctx context.Context, client *client.Client,
 				continue
 			}
 
-			supportedVersions = append(supportedVersions, *version.KubernetesVersion)
-			if *version.KubernetesVersion == desiredNodePoolVersion {
-				versionExists = true
-			} else if strings.Count(desiredNodePoolVersion, ".") == 1 && strings.HasPrefix(*version.KubernetesVersion, fmt.Sprintf("%s.", desiredNodePoolVersion)) {
-				// alias versions (major.minor) are also fine as the latest supported GA patch version is chosen automatically in this case
+			v := *version.KubernetesVersion
+			supportedVersions = append(supportedVersions, v)
+			// alias versions (major.minor) are also fine as the latest supported GA patch version is chosen automatically in this case
+			if v == desiredNodePoolVersion || v[:strings.LastIndex(v, ".")] == desiredNodePoolVersion {
 				versionExists = true
 			}
 		}