Merge pull request #33918 from hashicorp/b-aws_opensearchserverless_c…

…ollection_crash r/aws_opensearchserverless_collection: return error on read
hashicorp · Oct 12, 2023 · 2bd489f · 2bd489f
2 parents 55b8975 + d8e8073
commit 2bd489f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.changelog/33918.txt b/.changelog/33918.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_opensearchserverless_collection: Fix crash when error is returned
+```
diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go
@@ -208,6 +208,14 @@ func (r *resourceCollection) Read(ctx context.Context, req resource.ReadRequest,
 		return
 	}
 
+	if err != nil {
+		resp.Diagnostics.AddError(
+			create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionReading, ResNameCollection, state.ID.ValueString(), nil),
+			err.Error(),
+		)
+		return
+	}
+
 	state.ARN = flex.StringToFramework(ctx, out.Arn)
 	state.CollectionEndpoint = flex.StringToFramework(ctx, out.CollectionEndpoint)
 	state.DashboardEndpoint = flex.StringToFramework(ctx, out.DashboardEndpoint)