feat(k8s): version: add major_minor_only attribute for auto-upgrade

Author: Mia-Cross

internal/services/k8s/cluster_test.go

@@ -341,7 +341,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) {
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckK8SClusterAutoUpgrade(false, "any", 0, previousK8SVersion),
+				Config: testAccCheckK8SClusterAutoUpgrade(false, "any", 0, fmt.Sprintf("%q", previousK8SVersion)),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", previousK8SVersion),
@@ -351,7 +351,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccCheckK8SClusterAutoUpgrade(true, "any", 0, previousK8SVersionMinor),
+				Config: testAccCheckK8SClusterAutoUpgrade(true, "any", 0, fmt.Sprintf("%q", previousK8SVersionMinor)),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", previousK8SVersionMinor),
@@ -361,7 +361,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccCheckK8SClusterAutoUpgrade(true, "any", 0, latestK8SVersionMinor),
+				Config: testAccCheckK8SClusterAutoUpgrade(true, "any", 0, fmt.Sprintf("%q", latestK8SVersionMinor)),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", latestK8SVersionMinor),
@@ -371,7 +371,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccCheckK8SClusterAutoUpgrade(false, "any", 0, latestK8SVersion),
+				Config: testAccCheckK8SClusterAutoUpgrade(false, "any", 0, fmt.Sprintf("%q", latestK8SVersion)),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", latestK8SVersion),
@@ -381,7 +381,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccCheckK8SClusterAutoUpgrade(true, "tuesday", 3, latestK8SVersionMinor),
+				Config: testAccCheckK8SClusterAutoUpgrade(true, "tuesday", 3, fmt.Sprintf("%q", latestK8SVersionMinor)),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", latestK8SVersionMinor),
@@ -391,7 +391,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccCheckK8SClusterAutoUpgrade(true, "any", 0, latestK8SVersionMinor),
+				Config: testAccCheckK8SClusterAutoUpgrade(true, "any", 0, fmt.Sprintf("%q", latestK8SVersionMinor)),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", latestK8SVersionMinor),
@@ -789,7 +789,7 @@ resource "scaleway_vpc_private_network" "auto_upgrade" {
 
 resource "scaleway_k8s_cluster" "auto_upgrade" {
 	cni = "calico"
-	version = "%s"
+	version = %s
 	name = "test-auto-upgrade"
 	auto_upgrade {
 	    enable = %t

internal/services/k8s/k8s_version_data_source.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -19,7 +20,12 @@ func DataSourceVersion() *schema.Resource {
 			"name": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "Name of the Kubernetes version",
+				Description: "Name of the Kubernetes version in the form x.y.z",
+			},
+			"major_minor_only": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The name of the version in the form x.y (ignoring patch version)",
 			},
 			"available_cnis": {
 				Type:     schema.TypeList,
@@ -88,8 +94,11 @@ func DataSourceK8SVersionRead(ctx context.Context, d *schema.ResourceData, m any
 		version = res
 	}
 
+	withoutPatch := strings.Join(strings.Split(version.Name, ".")[:2], ".")
+
 	d.SetId(fmt.Sprintf("%s/%s", region, version.Name))
 	_ = d.Set("name", version.Name)
+	_ = d.Set("major_minor_only", withoutPatch)
 	_ = d.Set("available_cnis", version.AvailableCnis)
 	_ = d.Set("available_container_runtimes", version.AvailableContainerRuntimes)
 	_ = d.Set("available_feature_gates", version.AvailableFeatureGates)

internal/services/k8s/k8s_version_data_source_test.go

@@ -2,6 +2,7 @@ package k8s_test
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -15,19 +16,23 @@ func TestAccDataSourceVersion_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
+	version := "1.32.2"
+	versionWithoutPatch := "1.32"
+
 	resource.ParallelTest(t, resource.TestCase{
 		ProtoV6ProviderFactories: tt.ProviderFactories,
 		CheckDestroy:             testAccCheckK8SClusterDestroy(tt),
 		Steps: []resource.TestStep{
 			{
-				Config: `
+				Config: fmt.Sprintf(`
 					data "scaleway_k8s_version" "by_name" {
-						name = "1.32.2"
+						name = %q
 					}
-				`,
+				`, version),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckK8SVersionExists(tt, "data.scaleway_k8s_version.by_name"),
-					resource.TestCheckResourceAttrSet("data.scaleway_k8s_version.by_name", "name"),
+					resource.TestCheckResourceAttr("data.scaleway_k8s_version.by_name", "name", version),
+					resource.TestCheckResourceAttr("data.scaleway_k8s_version.by_name", "major_minor_only", versionWithoutPatch),
 					resource.TestCheckResourceAttr("data.scaleway_k8s_version.by_name", "available_cnis.#", "4"),
 					resource.TestCheckResourceAttr("data.scaleway_k8s_version.by_name", "available_cnis.0", "cilium"),
 					resource.TestCheckResourceAttr("data.scaleway_k8s_version.by_name", "available_cnis.1", "calico"),
@@ -75,6 +80,38 @@ func TestAccDataSourceVersion_Latest(t *testing.T) {
 	})
 }
 
+func TestAccDataSourceVersion_WithAutoUpgrade(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt)
+	latestK8SVersionWithoutPatch := strings.Join(strings.Split(latestK8SVersion, ".")[:2], ".")
+
+	resource.ParallelTest(t, resource.TestCase{
+		ProtoV6ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:             testAccCheckK8SClusterDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					data "scaleway_k8s_version" "latest" {
+						name = "latest"
+					}
+					` + testAccCheckK8SClusterAutoUpgrade(true, "any", 0, "data.scaleway_k8s_version.latest.major_minor_only"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckK8SVersionExists(tt, "data.scaleway_k8s_version.latest"),
+					testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.auto_upgrade"),
+					resource.TestCheckResourceAttr("data.scaleway_k8s_version.latest", "name", latestK8SVersion),
+					resource.TestCheckResourceAttr("data.scaleway_k8s_version.latest", "major_minor_only", latestK8SVersionWithoutPatch),
+					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "version", latestK8SVersionWithoutPatch),
+					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "auto_upgrade.0.enable", "true"),
+					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "auto_upgrade.0.maintenance_window_day", "any"),
+					resource.TestCheckResourceAttr("scaleway_k8s_cluster.auto_upgrade", "auto_upgrade.0.maintenance_window_start_hour", "0"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckK8SVersionExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]