feat(provider/webhook): respect identifiers in responses and synthesise a standard resource id attribute

Author: cysp

docs/resources/webhook.md

@@ -68,6 +68,7 @@ resource "contentful_webhook" "this" {
 
 ### Read-Only
 
+- `id` (String) The ID of this resource.
 - `webhook_id` (String)
 
 <a id="nestedatt--filters"></a>

internal/provider/webhook_model_response.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"strings"
 
 	cm "github.com/cysp/terraform-provider-contentful/internal/contentful-management-go"
 	"github.com/cysp/terraform-provider-contentful/internal/provider/util"
@@ -13,7 +14,12 @@ import (
 func (model *WebhookResourceModel) ReadFromResponse(ctx context.Context, webhookDefinition *cm.WebhookDefinition) diag.Diagnostics {
 	diags := diag.Diagnostics{}
 
-	model.WebhookID = types.StringValue(webhookDefinition.Sys.ID)
+	spaceID := webhookDefinition.Sys.Space.Sys.ID
+	webhookID := webhookDefinition.Sys.ID
+
+	model.ID = types.StringValue(strings.Join([]string{spaceID, webhookID}, "/"))
+	model.SpaceID = types.StringValue(spaceID)
+	model.WebhookID = types.StringValue(webhookID)
 
 	model.Name = types.StringValue(webhookDefinition.Name)
 

internal/provider/webhook_resource_model.go

@@ -11,58 +11,62 @@ import (
 )
 
 type WebhookResourceModel struct {
-	Active            types.Bool                 `tfsdk:"active"`
+	ID                types.String               `tfsdk:"id"`
+	SpaceID           types.String               `tfsdk:"space_id"`
+	WebhookID         types.String               `tfsdk:"webhook_id"`
+	Name              types.String               `tfsdk:"name"`
+	URL               types.String               `tfsdk:"url"`
+	Topics            types.List                 `tfsdk:"topics"`
 	Filters           types.List                 `tfsdk:"filters"`
-	Headers           types.Map                  `tfsdk:"headers"`
 	HTTPBasicPassword types.String               `tfsdk:"http_basic_password"`
 	HTTPBasicUsername types.String               `tfsdk:"http_basic_username"`
-	Name              types.String               `tfsdk:"name"`
-	SpaceID           types.String               `tfsdk:"space_id"`
-	Topics            types.List                 `tfsdk:"topics"`
+	Headers           types.Map                  `tfsdk:"headers"`
 	Transformation    WebhookTransformationValue `tfsdk:"transformation"`
-	URL               types.String               `tfsdk:"url"`
-	WebhookID         types.String               `tfsdk:"webhook_id"`
+	Active            types.Bool                 `tfsdk:"active"`
 }
 
 func WebhookResourceSchema(ctx context.Context) schema.Schema {
 	return schema.Schema{
 		Attributes: map[string]schema.Attribute{
-			"active": schema.BoolAttribute{
-				Optional: true,
+			"id": schema.StringAttribute{
 				Computed: true,
-				Default:  booldefault.StaticBool(true),
 			},
-			"filters": WebhookFiltersSchema(ctx, true),
-			"headers": WebhookHeadersSchema(ctx, true),
-			"http_basic_password": schema.StringAttribute{
-				Optional: true,
+			"space_id": schema.StringAttribute{
+				Required: true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
 			},
-			"http_basic_username": schema.StringAttribute{
+			"webhook_id": schema.StringAttribute{
+				Computed: true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
+			},
+			"active": schema.BoolAttribute{
 				Optional: true,
+				Computed: true,
+				Default:  booldefault.StaticBool(true),
 			},
 			"name": schema.StringAttribute{
 				Required: true,
 			},
-			"space_id": schema.StringAttribute{
+			"url": schema.StringAttribute{
 				Required: true,
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.RequiresReplace(),
-				},
 			},
 			"topics": schema.ListAttribute{
 				ElementType: types.StringType,
 				Optional:    true,
 			},
-			"transformation": WebhookTransformationSchema(ctx, true),
-			"url": schema.StringAttribute{
-				Required: true,
+			"filters": WebhookFiltersSchema(ctx, true),
+			"http_basic_password": schema.StringAttribute{
+				Optional: true,
 			},
-			"webhook_id": schema.StringAttribute{
-				Computed: true,
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.UseStateForUnknown(),
-				},
+			"http_basic_username": schema.StringAttribute{
+				Optional: true,
 			},
+			"headers":        WebhookHeadersSchema(ctx, true),
+			"transformation": WebhookTransformationSchema(ctx, true),
 		},
 	}
 }