feat(apple-silicon): commitment

Author: Laure-di

internal/services/applesilicon/server.go

@@ -50,6 +50,13 @@ func ResourceServer() *schema.Resource {
 				Default:     false,
 				Description: "Whether or not to enable VPC access",
 			},
+			"commitment": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Default:          "duration_24h",
+				Description:      "The commitment period of the server",
+				ValidateDiagFunc: verify.ValidateEnum[applesilicon.CommitmentType](),
+			},
 			"private_network": {
 				Type:        schema.TypeSet,
 				Optional:    true,
@@ -151,10 +158,11 @@ func ResourceAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceDat
 	}
 
 	createReq := &applesilicon.CreateServerRequest{
-		Name:      types.ExpandOrGenerateString(d.Get("name"), "m1"),
-		Type:      d.Get("type").(string),
-		ProjectID: d.Get("project_id").(string),
-		EnableVpc: d.Get("enable_vpc").(bool),
+		Name:           types.ExpandOrGenerateString(d.Get("name"), "m1"),
+		Type:           d.Get("type").(string),
+		ProjectID:      d.Get("project_id").(string),
+		EnableVpc:      d.Get("enable_vpc").(bool),
+		CommitmentType: applesilicon.CommitmentType(d.Get("commitment").(string)),
 	}
 
 	res, err := asAPI.CreateServer(createReq, scw.WithContext(ctx))
@@ -264,6 +272,10 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		req.Name = types.ExpandStringPtr(d.Get("name"))
 	}
 
+	if d.HasChange("commitment") {
+		req.CommitmentType = &applesilicon.CommitmentTypeValue{CommitmentType: applesilicon.CommitmentType(d.Get("commitment").(string))}
+	}
+
 	if d.HasChange("enable_vpc") {
 		enableVpc := d.Get("enable_vpc").(bool)
 		req.EnableVpc = &enableVpc

internal/services/applesilicon/server_test.go

@@ -2,6 +2,7 @@ package applesilicon_test
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -128,6 +129,7 @@ func TestAccServer_EnableVPC(t *testing.T) {
 					isServerPresent(tt, "scaleway_apple_silicon_server.main"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableVPC"),
 					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "commitment", "duration_24h"),
 					// Computed
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
 					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
@@ -225,6 +227,73 @@ func TestAccServer_EnableVPC(t *testing.T) {
 	})
 }
 
+func TestAccServer_Commitment(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      isServerDestroyed(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableDisableVPC"
+						type = "M2-M"
+						zone = "fr-par-3"
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isServerPresent(tt, "scaleway_apple_silicon_server.main"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableDisableVPC"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "commitment", "duration_24h"),
+					// Computed
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "created_at"),
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "deletable_at"),
+				),
+			},
+			{
+				Config: `
+
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableDisableVPC"
+						type = "M2-M"
+						commitment = "renewed_monthly"
+						zone = "fr-par-3"
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isServerPresent(tt, "scaleway_apple_silicon_server.main"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "TestAccServerEnableDisableVPC"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
+					resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "commitment", "renewed_monthly"),
+					// Computed
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "vnc_url"),
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "created_at"),
+					resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "deletable_at"),
+				),
+			},
+			{
+				Config: `
+
+					resource scaleway_apple_silicon_server main {
+						name = "TestAccServerEnableDisableVPC"
+						type = "M2-M"
+						commitment = "duration_24h"
+						zone = "fr-par-3"
+					}
+				`,
+				ExpectError: regexp.MustCompile("can not commit from monthly to hourly changes to the server"),
+			},
+		},
+	})
+}
+
 func isServerPresent(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]