Skip to content
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.

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

command/hook_ui: Truncate the ID considering multibyte characters #18823

Merged
merged 1 commit into from
Aug 6, 2019

Conversation

minamijoyo
Copy link
Contributor

Fixes #18822

The tuncatedId function had been introduced in #12261 and increased the maxIdLen to 80 in #13317.

Since the number of bytes itself seems to be unimportant, the ID should be truncated to 80 characters, not 80 bytes.

Please let me know if we need to truncate it to 80 bytes considering multibyte character boundaries. This will require more complex logic.

[terraform@fix-multibyte-trucate|✔]$ go test -v ./command -run TestTruncateId
=== RUN   TestTruncateId
=== RUN   TestTruncateId/0
=== RUN   TestTruncateId/1
=== RUN   TestTruncateId/2
=== RUN   TestTruncateId/3
=== RUN   TestTruncateId/4
=== RUN   TestTruncateId/5
=== RUN   TestTruncateId/6
=== RUN   TestTruncateId/7
=== RUN   TestTruncateId/8
=== RUN   TestTruncateId/9
=== RUN   TestTruncateId/10
=== RUN   TestTruncateId/11
=== RUN   TestTruncateId/12
=== RUN   TestTruncateId/13
=== RUN   TestTruncateId/14
=== RUN   TestTruncateId/15
=== RUN   TestTruncateId/16
=== RUN   TestTruncateId/17
--- PASS: TestTruncateId (0.00s)
    --- PASS: TestTruncateId/0 (0.00s)
    --- PASS: TestTruncateId/1 (0.00s)
    --- PASS: TestTruncateId/2 (0.00s)
    --- PASS: TestTruncateId/3 (0.00s)
    --- PASS: TestTruncateId/4 (0.00s)
    --- PASS: TestTruncateId/5 (0.00s)
    --- PASS: TestTruncateId/6 (0.00s)
    --- PASS: TestTruncateId/7 (0.00s)
    --- PASS: TestTruncateId/8 (0.00s)
    --- PASS: TestTruncateId/9 (0.00s)
    --- PASS: TestTruncateId/10 (0.00s)
    --- PASS: TestTruncateId/11 (0.00s)
    --- PASS: TestTruncateId/12 (0.00s)
    --- PASS: TestTruncateId/13 (0.00s)
    --- PASS: TestTruncateId/14 (0.00s)
    --- PASS: TestTruncateId/15 (0.00s)
    --- PASS: TestTruncateId/16 (0.00s)
    --- PASS: TestTruncateId/17 (0.00s)
PASS
ok      github.com/hashicorp/terraform/command  0.038s

@mildwonkey
Copy link
Contributor

Hi @minamijoyo,
Thank you for reporting this bug (in #18822) and working on this fix.

This commit touches a section of terraform that is being reworked as part of terraform 0.12, so if it's okay with you I'd prefer to wait and fix this in that release, mainly to avoid accidentally losing the work you've done when we merge in the 0.12 development branch.

Thanks again for investigating and proposing a fix for this, especially with tests!

@minamijoyo
Copy link
Contributor Author

@mildwonkey No problem. I'm looking forward to v0.12!

@minamijoyo
Copy link
Contributor Author

@mildwonkey
I noticed that the v0.12-dev branch had been finally merged into the master!
It's a great work 🎉 🎉 🎉

Now, this bug fix branch seems not to conflict with the latest master.

Please review and merge when you can. Thanks!

Fixes hashicorp#18822

The `tuncatedId` function had been introduced in hashicorp#12261 and increased the
`maxIdLen` to 80 in hashicorp#13317. Since the number of bytes itself seems to be
unimportant, the ID should be truncated to 80 characters, not 80 bytes.
@minamijoyo minamijoyo force-pushed the fix-multibyte-trucate branch from b0a26da to 33e1839 Compare December 13, 2018 02:40
@minamijoyo
Copy link
Contributor Author

@mildwonkey I rebased this PR on the master branch and confirmed that the test passed, but when I tried to reproduce the original issue reported in #18822 with terraform plan, I found that it can no longer be reproduced.

With the change of v0.12, it seems that the truncateId function is not called from plan already, but it still has been called from apply.

idSuffix = fmt.Sprintf("%s=%s, ", state.IDKey, truncateId(state.IDValue, maxIdLen))

I think there is still meaning to fix this bug at the moment. However, the current code base seems to be a somewhat inconsistent behavior in plan and apply.

@apparentlymart apparentlymart added this to the v0.12.1 milestone May 16, 2019
@pselle pselle modified the milestones: v0.12.1, TBD Jun 4, 2019
Copy link
Contributor

@pselle pselle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@minamijoyo 👋 It does seem that this code is still touched when stillApplying runs, and that is the only case where truncateId is used. I've opened a separate PR #22357 investigating that I'm not seeing the section populated consistently, and am still digging into it, but once I was able to get them displaying (...mostly) I was able to test your fix. Thank you for helping make Terraform more inclusive of other languages!

@pselle pselle merged commit ce8e781 into hashicorp:master Aug 6, 2019
@minamijoyo
Copy link
Contributor Author

@pselle Thanks!

@ghost
Copy link

ghost commented Sep 6, 2019

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked and limited conversation to collaborators Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The plan output contains an invalid byte sequence in UTF-8 when ID is multibyte characters
4 participants