Skip to content

fix[ec2_instance]: Handle invalid utf8 in Read #44519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

fix[ec2_instance]: Handle invalid utf8 in Read #44519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/44506.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_instance: Don't store invalid string in user_data attribute
```
8 changes: 7 additions & 1 deletion internal/service/ec2/ec2_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"strconv"
"strings"
"time"
"unicode/utf8"

"github.com/YakDriver/regexache"
"github.com/aws/aws-sdk-go-v2/aws"
Expand Down Expand Up @@ -3382,7 +3383,12 @@ func resourceInstanceFlatten(ctx context.Context, client *conns.AWSClient, insta
if err != nil {
return sdkdiag.AppendErrorf(diags, "decoding user_data: %s", err)
}
rd.Set("user_data", string(data))
if utf8.Valid(data) {
rd.Set("user_data", string(data))
} else {
// The user_data wasn't valid UTF-8, so we need to store it as base64 instead of as the raw string.
rd.Set("user_data_base64", attr.UserData.Value)
}
}
}
}
Expand Down
Loading