Skip to content

Commit 36fef6d

Browse files
authored
Merge pull request #2027 from thisdougb/b-issue-1480-unchecked-ptr
Fix for unchecked pointer read of resource Identifier
2 parents 95b075e + 3755f38 commit 36fef6d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## 1.17.0 (Unreleased)
2-
## 1.17.0 (September 27, 2024)
2+
3+
BUG FIXES:
4+
5+
* provider: Prevent crash when create waiter returns a nil progress event ([#2027](https://github.com/hashicorp/terraform-provider-awscc/pull/2027))
36

47
## 1.16.1 (September 27, 2024)
58

internal/generic/resource.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,10 @@ func (r *genericResource) Create(ctx context.Context, request resource.CreateReq
394394

395395
err = waiter.Wait(ctx, &cloudcontrol.GetResourceRequestStatusInput{RequestToken: output.ProgressEvent.RequestToken}, r.createTimeout)
396396

397-
id := aws.ToString(progressEvent.Identifier)
397+
var id string
398+
if progressEvent != nil {
399+
id = aws.ToString(progressEvent.Identifier)
400+
}
398401

399402
if err != nil {
400403
response.Diagnostics.Append(ServiceOperationWaiterErrorDiag("Cloud Control API", "CreateResource", err))

0 commit comments

Comments
 (0)