Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions internal/reflect/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type ExampleStruct struct {
BoolField bool `tfsdk:"bool_field"`
IgnoreMe string `tfsdk:"-"`

unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
}

Expand Down Expand Up @@ -136,7 +136,7 @@ func TestGetStructTags(t *testing.T) {
ExampleStruct
Field5 string `tfsdk:"field5"`

unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
}{},
expectedTags: map[string][]int{
Expand Down Expand Up @@ -193,7 +193,7 @@ func TestGetStructTags(t *testing.T) {
*ExampleStruct
Field5 string `tfsdk:"field5"`

unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
}{},
expectedTags: map[string][]int{
Expand Down
12 changes: 6 additions & 6 deletions internal/reflect/struct_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ func TestNewStruct_structtags_ignores(t *testing.T) {

var s struct {
ExportedAndTagged string `tfsdk:"exported_and_tagged"`
unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
ExportedAndExcluded string `tfsdk:"-"`
}
Expand Down Expand Up @@ -850,13 +850,13 @@ func TestNewStruct_embedded_structtags_ignores(t *testing.T) {

type s1 struct {
ExportedAndTagged string `tfsdk:"exported_and_tagged"`
unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
ExportedAndExcluded string `tfsdk:"-"`
}

type s2 struct {
unexportedField string //nolint:structcheck,unused
unexportedField string //nolint:unused
}

var s struct {
Expand Down Expand Up @@ -2149,7 +2149,7 @@ func TestFromStruct_structtags_ignores(t *testing.T) {

type s struct {
ExportedAndTagged string `tfsdk:"exported_and_tagged"`
unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
ExportedAndExcluded string `tfsdk:"-"`
}
Expand Down Expand Up @@ -2188,13 +2188,13 @@ func TestFromStruct_embedded_structtags_ignores(t *testing.T) {

type s1 struct {
ExportedAndTagged string `tfsdk:"exported_and_tagged"`
unexported string //nolint:structcheck,unused
unexported string //nolint:unused
unexportedAndTagged string `tfsdk:"unexported_and_tagged"`
ExportedAndExcluded string `tfsdk:"-"`
}

type s2 struct {
unexportedField string //nolint:structcheck,unused
unexportedField string //nolint:unused
}

type s struct {
Expand Down