From af53cd59359fc330eb5c5e635ed9325d49be0a9d Mon Sep 17 00:00:00 2001
From: Arthur Amstutz <arthur.amstutz@corp.ovh.com>
Date: Mon, 6 May 2024 08:02:49 +0000
Subject: [PATCH] fix: Use URN returned by the API for me_identity_group

---
 ovh/data_me_identity_group.go     |  8 +++++++-
 ovh/helpers/urn.go                |  4 ----
 ovh/resource_me_identity_group.go | 10 +++++-----
 ovh/types_me.go                   |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ovh/data_me_identity_group.go b/ovh/data_me_identity_group.go
index 06b039e9f..6e689d36c 100644
--- a/ovh/data_me_identity_group.go
+++ b/ovh/data_me_identity_group.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/url"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -37,6 +38,10 @@ func dataSourceMeIdentityGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"urn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -46,7 +51,7 @@ func dataSourceMeIdentityGroupRead(ctx context.Context, d *schema.ResourceData,
 
 	group := d.Get("name").(string)
 
-	endpoint := fmt.Sprintf("/me/identity/group/%s", group)
+	endpoint := fmt.Sprintf("/me/identity/group/%s", url.PathEscape(group))
 
 	var resp MeIdentityGroupResponse
 	err := config.OVHClient.GetWithContext(
@@ -68,6 +73,7 @@ func dataSourceMeIdentityGroupRead(ctx context.Context, d *schema.ResourceData,
 	d.Set("creation", resp.Creation)
 	d.Set("description", resp.Description)
 	d.Set("role", resp.Role)
+	d.Set("urn", resp.URN)
 
 	return nil
 }
diff --git a/ovh/helpers/urn.go b/ovh/helpers/urn.go
index fdff313d3..6acb8cbd5 100644
--- a/ovh/helpers/urn.go
+++ b/ovh/helpers/urn.go
@@ -2,10 +2,6 @@ package helpers
 
 import "fmt"
 
-const (
-	VPSkind string = "vps"
-)
-
 func ServiceURN(plate, kind, name string) string {
 	return fmt.Sprintf("urn:v1:%s:resource:%s:%s", plate, kind, name)
 }
diff --git a/ovh/resource_me_identity_group.go b/ovh/resource_me_identity_group.go
index 444a30095..9c26a6372 100644
--- a/ovh/resource_me_identity_group.go
+++ b/ovh/resource_me_identity_group.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/url"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -66,7 +67,7 @@ func resourceMeIdentityGroupRead(ctx context.Context, d *schema.ResourceData, me
 
 	identityGroup := &MeIdentityGroupResponse{}
 
-	endpoint := fmt.Sprintf("/me/identity/group/%s", d.Id())
+	endpoint := fmt.Sprintf("/me/identity/group/%s", url.PathEscape(d.Id()))
 	if err := config.OVHClient.GetWithContext(ctx, endpoint, identityGroup); err != nil {
 		return diag.FromErr(helpers.CheckDeleted(d, err, endpoint))
 	}
@@ -76,8 +77,7 @@ func resourceMeIdentityGroupRead(ctx context.Context, d *schema.ResourceData, me
 	d.Set("creation", identityGroup.Creation)
 	d.Set("description", identityGroup.Description)
 	d.Set("role", identityGroup.Role)
-
-	d.Set("urn", fmt.Sprintf("urn:v1:%s:identity:group:%s/%s", config.Plate, config.Account, identityGroup.Name))
+	d.Set("urn", identityGroup.URN)
 
 	return nil
 }
@@ -118,7 +118,7 @@ func resourceMeIdentityGroupUpdate(ctx context.Context, d *schema.ResourceData,
 		Role:        role,
 	}
 	err := config.OVHClient.PutWithContext(ctx,
-		fmt.Sprintf("/me/identity/group/%s", d.Id()),
+		fmt.Sprintf("/me/identity/group/%s", url.PathEscape(d.Id())),
 		params,
 		nil,
 	)
@@ -134,7 +134,7 @@ func resourceMeIdentityGroupDelete(ctx context.Context, d *schema.ResourceData,
 	config := meta.(*Config)
 
 	err := config.OVHClient.DeleteWithContext(ctx,
-		fmt.Sprintf("/me/identity/group/%s", d.Id()),
+		fmt.Sprintf("/me/identity/group/%s", url.PathEscape(d.Id())),
 		nil,
 	)
 	if err != nil {
diff --git a/ovh/types_me.go b/ovh/types_me.go
index cbd15a4d8..340ad95fd 100644
--- a/ovh/types_me.go
+++ b/ovh/types_me.go
@@ -139,6 +139,7 @@ type MeIdentityGroupResponse struct {
 	Creation     string `json:"creation"`
 	Description  string `json:"description"`
 	LastUpdate   string `json:"lastUpdate"`
+	URN          string `json:"urn"`
 }
 
 type MeIdentityGroupCreateOpts struct {