Fix lint

hashicorp · Dec 7, 2023 · 6457ae4 · 6457ae4
1 parent 952df23
commit 6457ae4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/internal/framework/flex/autoflex.go b/internal/framework/flex/autoflex.go
@@ -201,7 +201,8 @@ func findFieldFuzzy(ctx context.Context, fieldNameFrom string, valTo reflect.Val
 	// fourth precedence is using resource prefix
 	if v, ok := ctx.Value(ResourcePrefix).(string); ok && v != "" {
 		if ctx.Value(ResourcePrefixRecurse) == nil {
-			ctx = context.WithValue(ctx, ResourcePrefixRecurse, true) // so it will only recurse once
+			// so it will only recurse once
+			ctx = context.WithValue(ctx, ResourcePrefixRecurse, true)
 			if strings.HasPrefix(fieldNameFrom, v) {
 				return findFieldFuzzy(ctx, strings.TrimPrefix(fieldNameFrom, v), valTo)
 			}

diff --git a/internal/framework/flex/autoflex_test.go b/internal/framework/flex/autoflex_test.go
@@ -174,7 +174,7 @@ func TestGenericExpand(t *testing.T) {
 	testString := "test"
 	testStringResult := "a"
 	testCases := []struct {
-		Context    context.Context //nolint:containedctx
+		Context    context.Context //nolint:containedctx // testing context use
 		TestName   string
 		Source     any
 		Target     any
@@ -531,7 +531,7 @@ func TestGenericExpand(t *testing.T) {
 			},
 		},
 		{
-			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"),
+			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"), //nolint:contextcheck // false positive
 			TestName: "resource name prefix",
 			Source: &TestFlexTF16{
 				Name: types.StringValue("Ovodoghen"),
@@ -768,7 +768,7 @@ func TestGenericFlatten(t *testing.T) {
 	ctx := context.Background()
 	testString := "test"
 	testCases := []struct {
-		Context    context.Context //nolint:containedctx
+		Context    context.Context //nolint:containedctx // testing context use
 		TestName   string
 		Source     any
 		Target     any
@@ -1182,7 +1182,7 @@ func TestGenericFlatten(t *testing.T) {
 			},
 		},
 		{
-			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"),
+			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"), //nolint:contextcheck // false positive
 			TestName: "resource name prefix",
 			Source: &TestFlexAWS18{
 				IntentName: aws.String("Ovodoghen"),