Skip to content

Commit 69cde79

Browse files
author
protobuf-ci-cd
committed
use parseID
1 parent 5cce6a2 commit 69cde79

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

internal/services/keymanager/helpers.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package keymanager
22

33
import (
4-
"fmt"
5-
"strings"
64
"time"
75

86
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
97
key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
108
"github.com/scaleway/scaleway-sdk-go/scw"
9+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
1110
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
1211
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
1312
)
@@ -32,15 +31,6 @@ func UsageToString(u *key_manager.KeyUsage) string {
3231
return ""
3332
}
3433

35-
func ExtractRegionAndKeyID(id string) (scw.Region, string, error) {
36-
parts := strings.SplitN(id, "/", 2)
37-
if len(parts) != 2 {
38-
return "", "", fmt.Errorf("unexpected ID format (%s), expected region/key_id", id)
39-
}
40-
41-
return scw.Region(parts[0]), parts[1], nil
42-
}
43-
4434
func newKeyManagerAPI(d *schema.ResourceData, m any) (*key_manager.API, scw.Region, error) {
4535
api := key_manager.NewAPI(meta.ExtractScwClient(m))
4636

@@ -53,7 +43,7 @@ func newKeyManagerAPI(d *schema.ResourceData, m any) (*key_manager.API, scw.Regi
5343
}
5444

5545
func NewKeyManagerAPIWithRegionAndID(m any, id string) (*key_manager.API, scw.Region, string, error) {
56-
region, keyID, err := ExtractRegionAndKeyID(id)
46+
region, keyID, err := regional.ParseID(id)
5747
if err != nil {
5848
return nil, "", "", err
5949
}

0 commit comments

Comments
 (0)