fix test

Author: protobuf-ci-cd

docs/resources/key_manager_key.md

@@ -1,4 +1,3 @@
----
 # scaleway_key_manager_key
 
 Provides a Scaleway Key Manager Key resource.  
@@ -30,17 +29,17 @@ The following arguments are supported:
 - `region` (String) – The region in which to create the key (e.g., `fr-par`).  
 - `project_id` (String, Optional) – The ID of the project the key belongs to.  
 - `usage` (String, **Required**) – The usage of the key. Valid values are:
-  - `symmetric_encryption`
-  - `asymmetric_encryption`
-  - `asymmetric_signing`
+    - `symmetric_encryption`
+    - `asymmetric_encryption`
+    - `asymmetric_signing`
 - `description` (String, Optional) – A description for the key.
 - `tags` (List of String, Optional) – A list of tags to assign to the key.
 - `unprotected` (Boolean, Optional) – If `true`, the key can be deleted. Defaults to `false` (protected).
 - `origin` (String, Optional) – The origin of the key. Valid values are:
-  - `scaleway_kms` (default)
-  - `external`
+    - `scaleway_kms` (default)
+    - `external`
 - `rotation_policy` (Block, Optional) – Rotation policy for the key:
-  - `rotation_period` (String, Optional) – The period between key rotations (e.g., `"720h"` for 30 days).
+    - `rotation_period` (String, Optional) – The period between key rotations (e.g., `"720h"` for 30 days).
 
 ## Attributes Reference
 
@@ -57,8 +56,8 @@ In addition to the arguments above, the following attributes are exported:
 - `origin_read` – The origin of the key as returned by the API.
 - `region_read` – The region of the key as returned by the API.
 - `rotation_policy` (Block)
-  - `rotation_period` – The period between key rotations.
-  - `next_rotation_at` – The date and time of the next scheduled rotation.
+    - `rotation_period` – The period between key rotations.
+    - `next_rotation_at` – The date and time of the next scheduled rotation.
 
 ## Import
 

internal/services/keymanager/helpers.go

@@ -1,9 +1,13 @@
 package keymanager
 
 import (
+	"fmt"
+	"strings"
 	"time"
 
 	key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 )
 
 func ExpandStringList(v interface{}) []string {
@@ -48,3 +52,22 @@ func TimeToRFC3339(t *time.Time) string {
 
 	return t.Format(time.RFC3339)
 }
+
+// ExtractRegionAndKeyID parses an ID of the form "region/key_id" and returns the region and key ID.
+func ExtractRegionAndKeyID(id string) (scw.Region, string, error) {
+	parts := strings.SplitN(id, "/", 2)
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("unexpected ID format (%s), expected region/key_id", id)
+	}
+	return scw.Region(parts[0]), parts[1], nil
+}
+
+// NewKeyManagerAPIWithRegionAndID returns a Key Manager API client, region, and key ID from meta and a composite ID.
+func NewKeyManagerAPIWithRegionAndID(m any, id string) (*key_manager.API, scw.Region, string, error) {
+	region, keyID, err := ExtractRegionAndKeyID(id)
+	if err != nil {
+		return nil, "", "", err
+	}
+	client := key_manager.NewAPI(meta.ExtractScwClient(m))
+	return client, region, keyID, nil
+}

internal/services/keymanager/key_resource.go

@@ -2,6 +2,7 @@ package keymanager
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -144,15 +145,16 @@ func resourceKeyManagerKeyCreate(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
-	d.SetId(key.ID)
+	d.SetId(fmt.Sprintf("%s/%s", key.Region, key.ID))
 
 	return resourceKeyManagerKeyRead(ctx, d, m)
 }
 
 func resourceKeyManagerKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	client := key_manager.NewAPI(meta.ExtractScwClient(m))
-	region := scw.Region(d.Get("region").(string))
-	keyID := d.Id()
+	client, region, keyID, err := NewKeyManagerAPIWithRegionAndID(m, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	key, err := client.GetKey(&key_manager.GetKeyRequest{
 		Region: region,
@@ -168,8 +170,7 @@ func resourceKeyManagerKeyRead(ctx context.Context, d *schema.ResourceData, m in
 	_ = d.Set("usage", UsageToString(key.Usage))
 	_ = d.Set("description", key.Description)
 	_ = d.Set("tags", key.Tags)
-	_ = d.Set("rotation_count", key.RotationCount)
-	_ = d.Set("state", key.State.String())
+	_ = d.Set("rotation_count", int(key.RotationCount))
 	_ = d.Set("created_at", TimeToRFC3339(key.CreatedAt))
 	_ = d.Set("updated_at", TimeToRFC3339(key.UpdatedAt))
 	_ = d.Set("protected", key.Protected)
@@ -197,9 +198,10 @@ func resourceKeyManagerKeyRead(ctx context.Context, d *schema.ResourceData, m in
 }
 
 func resourceKeyManagerKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	client := key_manager.NewAPI(meta.ExtractScwClient(m))
-	region := scw.Region(d.Get("region").(string))
-	keyID := d.Id()
+	client, region, keyID, err := NewKeyManagerAPIWithRegionAndID(m, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	updateReq := &key_manager.UpdateKeyRequest{
 		Region: region,
@@ -239,7 +241,7 @@ func resourceKeyManagerKeyUpdate(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
-	_, err := client.UpdateKey(updateReq)
+	_, err = client.UpdateKey(updateReq)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -248,11 +250,12 @@ func resourceKeyManagerKeyUpdate(ctx context.Context, d *schema.ResourceData, m
 }
 
 func resourceKeyManagerKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	client := key_manager.NewAPI(meta.ExtractScwClient(m))
-	region := scw.Region(d.Get("region").(string))
-	keyID := d.Id()
+	client, region, keyID, err := NewKeyManagerAPIWithRegionAndID(m, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
-	err := client.DeleteKey(&key_manager.DeleteKeyRequest{
+	err = client.DeleteKey(&key_manager.DeleteKeyRequest{
 		Region: region,
 		KeyID:  keyID,
 	})

internal/services/keymanager/key_resource_test.go

@@ -1,10 +1,15 @@
 package keymanager_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/keymanager"
 )
 
 func TestAccKeyManagerKey_Basic(t *testing.T) {
@@ -14,6 +19,7 @@ func TestAccKeyManagerKey_Basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      IsKeyManagerKeyDestroyed(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -46,6 +52,7 @@ func TestAccKeyManagerKey_Update(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      IsKeyManagerKeyDestroyed(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -83,3 +90,35 @@ func TestAccKeyManagerKey_Update(t *testing.T) {
 		},
 	})
 }
+
+func IsKeyManagerKeyDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
+	return func(state *terraform.State) error {
+		for _, rs := range state.RootModule().Resources {
+			if rs.Type != "scaleway_key_manager_key" {
+				continue
+			}
+
+			client, region, keyID, err := keymanager.NewKeyManagerAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+			if err != nil {
+				return err
+			}
+
+			key, err := client.GetKey(&key_manager.GetKeyRequest{
+				Region: region,
+				KeyID:  keyID,
+			})
+			if err == nil {
+				// If the key exists but has DeletionRequestedAt set, we consider it "destroyed" for test purposes
+				if key.DeletionRequestedAt != nil {
+					continue
+				}
+				return fmt.Errorf("Key (%s) still exists", rs.Primary.ID)
+			}
+
+			if !httperrors.Is404(err) {
+				return err
+			}
+		}
+		return nil
+	}
+}