Merge remote-tracking branch 'origin/main' into feature/rate-limiting-provider

robertolosanno-e2x · robertolosanno-e2x · commit f0f8be6cccda · 2026-05-19T09:43:51.000+01:00
diff --git a/.changes/unreleased/fix-import-state-uid.yaml b/.changes/unreleased/fix-import-state-uid.yaml
@@ -0,0 +1,2 @@
+kind: Fixed
+body: Fix ImportState using non-existent "id" attribute path — all resources use "uid" as their identifier, causing a State Write Error on any import operation
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/terraform-plugin-docs v0.9.0
 	github.com/hashicorp/terraform-plugin-framework v0.8.1-0.20220531184835-f0051665855e
 	github.com/hashicorp/terraform-plugin-go v0.9.1
-	github.com/labd/contentstack-go-sdk v0.1.0
+	github.com/labd/contentstack-go-sdk v0.1.1
 	github.com/stretchr/testify v1.7.2
 )
 
diff --git a/go.sum b/go.sum
@@ -166,8 +166,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
-github.com/labd/contentstack-go-sdk v0.1.0 h1:lxBbGBkIlileNn2+VrVG6XP776Llxy9i4THPBA01xTU=
-github.com/labd/contentstack-go-sdk v0.1.0/go.mod h1:J17aqV8NOcmFfkkotnAljlt6Ctwlu21Ieeo/0BPLNtg=
+github.com/labd/contentstack-go-sdk v0.1.1 h1:iTPzeyFxax4+cnBf3PKBeUPoxrIIsuV59WiWG5TmdXI=
+github.com/labd/contentstack-go-sdk v0.1.1/go.mod h1:J17aqV8NOcmFfkkotnAljlt6Ctwlu21Ieeo/0BPLNtg=
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
diff --git a/internal/provider/resource_content_type.go b/internal/provider/resource_content_type.go
@@ -181,7 +181,7 @@ func (r resourceContentType) Update(ctx context.Context, req tfsdk.UpdateResourc
 }
 
 func (r resourceContentType) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {
-	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)
+	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)
 }
 
 func NewContentTypeData(field *management.ContentType) *ContentTypeData {
diff --git a/internal/provider/resource_environment.go b/internal/provider/resource_environment.go
@@ -186,7 +186,7 @@ func (r resourceEnvironment) Update(ctx context.Context, req tfsdk.UpdateResourc
 }
 
 func (r resourceEnvironment) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {
-	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)
+	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)
 }
 
 func NewEnvironmentData(environment *management.Environment) *EnvironmentData {
diff --git a/internal/provider/resource_global_field.go b/internal/provider/resource_global_field.go
@@ -182,7 +182,7 @@ func (r resourceGlobalField) Update(ctx context.Context, req tfsdk.UpdateResourc
 }
 
 func (r resourceGlobalField) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {
-	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)
+	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)
 }
 
 func NewGlobalFieldData(field *management.GlobalField) *GlobalFieldData {
diff --git a/internal/provider/resource_locale.go b/internal/provider/resource_locale.go
@@ -179,7 +179,7 @@ func (r resourceLocale) Update(ctx context.Context, req tfsdk.UpdateResourceRequ
 }
 
 func (r resourceLocale) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {
-	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)
+	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)
 }
 
 func NewLocaleData(field *management.Locale) *LocaleData {
diff --git a/internal/provider/resource_webhook.go b/internal/provider/resource_webhook.go
@@ -270,7 +270,7 @@ func (r resourceWebhook) Update(ctx context.Context, req tfsdk.UpdateResourceReq
 }
 
 func (r resourceWebhook) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {
-	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)
+	tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)
 }
 
 func NewWebhookData(webhook *management.WebHook) *WebhookData {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+kind: Fixed`
	`2`	`+body: Fix ImportState using non-existent "id" attribute path — all resources use "uid" as their identifier, causing a State Write Error on any import operation`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ require (`
`9`	`9`	`github.com/hashicorp/terraform-plugin-docs v0.9.0`
`10`	`10`	`github.com/hashicorp/terraform-plugin-framework v0.8.1-0.20220531184835-f0051665855e`
`11`	`11`	`github.com/hashicorp/terraform-plugin-go v0.9.1`
`12`		`- github.com/labd/contentstack-go-sdk v0.1.0`
	`12`	`+ github.com/labd/contentstack-go-sdk v0.1.1`
`13`	`13`	`github.com/stretchr/testify v1.7.2`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ func (r resourceContentType) Update(ctx context.Context, req tfsdk.UpdateResourc`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`func (r resourceContentType) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {`
`184`		`- tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)`
	`184`	`+ tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`func NewContentTypeData(field management.ContentType) ContentTypeData {`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ func (r resourceEnvironment) Update(ctx context.Context, req tfsdk.UpdateResourc`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`func (r resourceEnvironment) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {`
`189`		`- tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)`
	`189`	`+ tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`func NewEnvironmentData(environment management.Environment) EnvironmentData {`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ func (r resourceGlobalField) Update(ctx context.Context, req tfsdk.UpdateResourc`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`func (r resourceGlobalField) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {`
`185`		`- tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)`
	`185`	`+ tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`func NewGlobalFieldData(field management.GlobalField) GlobalFieldData {`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (r resourceLocale) Update(ctx context.Context, req tfsdk.UpdateResourceRequ`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`func (r resourceLocale) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {`
`182`		`- tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)`
	`182`	`+ tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`func NewLocaleData(field management.Locale) LocaleData {`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ func (r resourceWebhook) Update(ctx context.Context, req tfsdk.UpdateResourceReq`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`func (r resourceWebhook) ImportState(ctx context.Context, req tfsdk.ImportResourceStateRequest, resp *tfsdk.ImportResourceStateResponse) {`
`273`		`- tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("id"), req, resp)`
	`273`	`+ tfsdk.ResourceImportStatePassthroughID(ctx, tftypes.NewAttributePath().WithAttributeName("uid"), req, resp)`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`func NewWebhookData(webhook management.WebHook) WebhookData {`