Enable gosimple linter and fix issues #880
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reference: #865 Previously: ```text helper/validation/float_test.go:66:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at least \\(2\\.5\\d*\\), got 1\\.5\\d*"), ^ helper/validation/float_test.go:71:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be float"), ^ helper/validation/float_test.go:89:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at most \\(1\\.5\\d*\\), got 2\\.5\\d*"), ^ helper/validation/float_test.go:94:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be float"), ^ helper/validation/int_test.go:21:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be in the range \\(2 - 3\\), got 1"), ^ helper/validation/int_test.go:26:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be integer"), ^ helper/validation/int_test.go:44:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at least \\(2\\), got 1"), ^ helper/validation/int_test.go:49:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be integer"), ^ helper/validation/int_test.go:67:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at most \\(0\\), got 1"), ^ helper/validation/int_test.go:72:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be integer"), ^ helper/validation/int_test.go:122:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be one of \\[10 20\\], got 42"), ^ helper/validation/int_test.go:127:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be integer"), ^ helper/validation/meta_test.go:55:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected length of [\\w]+ to be in the range \\(5 - 42\\), got foo"), ^ helper/validation/meta_test.go:90:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at least \\(42\\), got 7"), ^ helper/validation/meta_test.go:98:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at most \\(5\\), got 7"), ^ helper/validation/meta_test.go:125:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at least \\(42\\), got 7"), ^ helper/validation/meta_test.go:133:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be at most \\(5\\), got 7"), ^ helper/validation/strings_test.go:293:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be one of \\[ValidValue AnotherValidValue\\], got VALIDVALUE"), ^ helper/validation/strings_test.go:298:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to be one of \\[ValidValue AnotherValidValue\\], got InvalidValue"), ^ helper/validation/strings_test.go:303:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be string"), ^ helper/validation/strings_test.go:322:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to not be any of \\[InvalidValue AnotherInvalidValue\\], got AnotherInvalidValue"), ^ helper/validation/strings_test.go:328:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected [\\w]+ to not be any of \\[InvalidValue AnotherInvalidValue\\], got INVALIDVALUE"), ^ helper/validation/strings_test.go:333:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("expected type of [\\w]+ to be string"), ^ helper/validation/strings_test.go:352:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("invalid value for [\\w]+ \\(value must contain foo\\)"), ^ helper/validation/strings_test.go:371:17: S1007: should use raw string (`...`) with regexp.MustCompile to avoid having to escape twice (gosimple) expectedErr: regexp.MustCompile("invalid value for [\\w]+ \\(value must not contain foo\\)"), ^ internal/plugin/convert/diagnostics.go:96:10: S1034: assigning the result of this type assertion to a variable (switch step := step.(type)) could eliminate type assertions in switch cases (gosimple) switch step.(type) { ^ internal/plugin/convert/diagnostics.go:98:25: S1034(related information): could eliminate this type assertion (gosimple) p = p.GetAttr(string(step.(tftypes.AttributeName))) ^ internal/plugin/convert/diagnostics.go:100:37: S1034(related information): could eliminate this type assertion (gosimple) p = p.Index(cty.StringVal(string(step.(tftypes.ElementKeyString)))) ^ internal/plugin/convert/diagnostics.go:102:39: S1034(related information): could eliminate this type assertion (gosimple) p = p.Index(cty.NumberIntVal(int64(step.(tftypes.ElementKeyInt)))) ^ internal/addrs/module_instance.go:95:4: S1023: redundant break statement (gosimple) break ^ internal/addrs/module_instance.go:125:4: S1023: redundant break statement (gosimple) break ^ helper/resource/testing.go:129:14: S1012: should use `time.Since` instead of `time.Now().Sub` (gosimple) elapsed := time.Now().Sub(start) ^ helper/resource/testing.go:242:13: S1012: should use `time.Since` instead of `time.Now().Sub` (gosimple) elapsed := time.Now().Sub(start) ^ helper/schema/set.go:241:2: S1032: should use sort.Strings(...) instead of sort.Sort(sort.StringSlice(...)) (gosimple) sort.Sort(sort.StringSlice(keys)) ^ helper/schema/resource.go:847:5: S1002: should omit comparison to bool constant, can be simplified to `!s.Computed` (gosimple) if s.Computed != true { ^ helper/schema/field_reader_map.go:162:3: S1008: should use 'return len(countActual) < countExpected' instead of 'if len(countActual) >= countExpected { return false }; return true' (gosimple) if len(countActual) >= countExpected { ^ terraform/state.go:1026:20: S1039: unnecessary use of fmt.Sprintf (gosimple) buf.WriteString(fmt.Sprintf("\n Dependencies:\n")) ^ terraform/state.go:1240:2: S1008: should use 'return s.Primary.Equal(other.Primary)' instead of 'if !s.Primary.Equal(other.Primary) { return false }; return true' (gosimple) if !s.Primary.Equal(other.Primary) { ```
detro
approved these changes
Feb 4, 2022
Comment on lines
-162
to
-166
| if len(countActual) >= countExpected { | ||
| return false | ||
| } | ||
|
|
||
| return true |
Comment on lines
-1240
to
-1244
| if !s.Primary.Equal(other.Primary) { | ||
| return false | ||
| } | ||
|
|
||
| return true |
Comment on lines
-96
to
-102
| switch step.(type) { | ||
| switch step := step.(type) { | ||
| case tftypes.AttributeName: | ||
| p = p.GetAttr(string(step.(tftypes.AttributeName))) | ||
| p = p.GetAttr(string(step)) | ||
| case tftypes.ElementKeyString: | ||
| p = p.Index(cty.StringVal(string(step.(tftypes.ElementKeyString)))) | ||
| p = p.Index(cty.StringVal(string(step))) | ||
| case tftypes.ElementKeyInt: | ||
| p = p.Index(cty.NumberIntVal(int64(step.(tftypes.ElementKeyInt)))) |
Contributor
There was a problem hiding this comment.
So, to understand: here we are getting rid of a "double casting". Before it was going (for example) from interface{} to tftypes.AttributeName to string. Now, just interface{} to string. Correct?
Contributor
There was a problem hiding this comment.
Correction: it's not casting. You are removing the type assertion because the assertion was already done by the switch step.(type). So, it's safe to then do just the type conversion.
Contributor
Author
There was a problem hiding this comment.
Here's the original issue reported in the linter:
internal/plugin/convert/diagnostics.go:96:10: S1034: assigning the result of this type assertion to a variable (switch step := step.(type)) could eliminate type assertions in switch cases (gosimple)
switch step.(type) {
^
internal/plugin/convert/diagnostics.go:98:25: S1034(related information): could eliminate this type assertion (gosimple)
p = p.GetAttr(string(step.(tftypes.AttributeName)))
^
internal/plugin/convert/diagnostics.go:100:37: S1034(related information): could eliminate this type assertion (gosimple)
p = p.Index(cty.StringVal(string(step.(tftypes.ElementKeyString))))
^
internal/plugin/convert/diagnostics.go:102:39: S1034(related information): could eliminate this type assertion (gosimple)
p = p.Index(cty.NumberIntVal(int64(step.(tftypes.ElementKeyInt))))
^
There is a fun feature in the Go specification that allows switch statements to automatically handle type assertions when using the .(type) syntax with assignment. It's really handy for simplifying code that needs to handle multiple types, if you haven't run across it before to avoid the duplicate type handling within a case.
Contributor
There was a problem hiding this comment.
yep yep: essentially, by the time we are in any of the specific cases of the switch, the assertion has already happened and we can avoid doing it again. Makes sense.
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference: #865
Previously: