Fixed lintier

Author: rainkwan

helper/resource/query/query_checks.go

@@ -20,7 +20,7 @@ func RunQueryChecks(ctx context.Context, t testing.T, query *[]tfjson.LogMsg, qu
 	var result []error
 
 	if query == nil || len(*query) == 0 {
-		// TODO return error
+		result = append(result, fmt.Errorf("No query results found"))
 	}
 
 	found := make([]tfjson.ListResourceFoundData, 0)
@@ -33,6 +33,8 @@ func RunQueryChecks(ctx context.Context, t testing.T, query *[]tfjson.LogMsg, qu
 		case tfjson.ListCompleteMessage:
 			complete = v.ListComplete
 			// TODO diagnostics and errors?
+		default:
+			// ignore other message types
 		}
 	}
 

internal/plugintest/working_dir.go

@@ -544,7 +544,7 @@ func (wd *WorkingDir) Query(ctx context.Context) ([]tfjson.LogMsg, error) {
 
 	message, related, err = logEmit.NextMessage()
 
-	if related == false && err != nil {
+	if !related && err != nil {
 		return nil, fmt.Errorf("Error no messages found from terraform query command: %w", err)
 	}
 
@@ -557,7 +557,7 @@ func (wd *WorkingDir) Query(ctx context.Context) ([]tfjson.LogMsg, error) {
 		}
 	}
 
-	if related == true {
+	if related {
 		return nil, fmt.Errorf("Error running terraform query command: %w", err)
 	}
 

internal/testing/testsdk/providerserver/providerserver.go

@@ -1053,7 +1053,7 @@ func (s ProviderServer) ListResource(ctx context.Context, req *tfprotov6.ListRes
 		return nil, fmt.Errorf("failed to retrieve resource: %v", err)
 	}
 	r.IdentitySchema(ctx, identitySchemaReq, identitySchemaResp)
-	if identitySchemaResp.Diagnostics != nil && len(identitySchemaResp.Diagnostics) > 0 {
+	if len(identitySchemaResp.Diagnostics) > 0 {
 		return nil, fmt.Errorf("failed to retrieve resource schema: %v", identitySchemaResp.Diagnostics)
 	}
 
@@ -1066,7 +1066,7 @@ func (s ProviderServer) ListResource(ctx context.Context, req *tfprotov6.ListRes
 	schemaResp := &list.SchemaResponse{}
 
 	listresource.Schema(ctx, schemaReq, schemaResp)
-	if schemaResp.Diagnostics != nil && len(schemaResp.Diagnostics) > 0 {
+	if len(schemaResp.Diagnostics) > 0 {
 		return nil, fmt.Errorf("failed to retrieve resource schema: %v", schemaResp.Diagnostics)
 	}
 

querycheck/contains.go

@@ -21,12 +21,10 @@ func (c contains) CheckQuery(_ context.Context, req CheckQueryRequest, resp *Che
 		if strings.EqualFold(c.check, res.DisplayName) {
 			return
 		}
-
 	}
 
 	resp.Error = fmt.Errorf("expected to find resource with display name %q in results but resource was not found", c.check)
 
-	return
 }
 
 // Contains returns a query check that asserts that a resource with a given display name exists within the returned results of the query.

querycheck/expect_identity.go

@@ -66,8 +66,6 @@ func (e expectIdentity) CheckQuery(ctx context.Context, req CheckQueryRequest, r
 	errCollection = append(errCollection, fmt.Errorf("Address: %s\n", e.resourceAddress))
 
 	resp.Error = errors.Join(errCollection...)
-
-	return
 }
 
 // ExpectIdentity returns a query check that asserts that the identity at the given resource matches a known object, where each

querycheck/expect_known_value.go

@@ -7,9 +7,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/hashicorp/terraform-plugin-testing/knownvalue"
 	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
-	"strings"
 )
 
 var _ QueryResultCheck = expectKnownValue{}
@@ -63,11 +64,18 @@ func (e expectKnownValue) CheckQuery(_ context.Context, req CheckQueryRequest, r
 				}
 			}
 		}
+
+		if diags != nil {
+			var diagsStr string
+			for _, diag := range diags {
+				diagsStr += diag.Error() + "; "
+			}
+			resp.Error = fmt.Errorf(diagsStr)
+			return
+		}
 	}
 
 	resp.Error = fmt.Errorf("%s - the resource %s was not found", e.listResourceAddress, e.resourceName)
-
-	return
 }
 
 func ExpectKnownValue(listResourceAddress string, resourceName string, attributePath tfjsonpath.Path, knownValue knownvalue.Check) QueryResultCheck {

querycheck/expect_result_length_atleast.go

@@ -26,8 +26,6 @@ func (e expectLengthAtLeast) CheckQuery(_ context.Context, req CheckQueryRequest
 		resp.Error = fmt.Errorf("Query result of at least length %v - expected but got %v.", e.check, req.CompletedQuery.Total)
 		return
 	}
-
-	return
 }
 
 // ExpectLengthAtLeast returns a query check that asserts that the length of the query result is at least the given value.

querycheck/expect_result_length_exact.go

@@ -32,8 +32,6 @@ func (e expectLength) CheckQuery(_ context.Context, req CheckQueryRequest, resp
 		resp.Error = fmt.Errorf("Query result of length %v - expected but got %v.", e.check, req.CompletedQuery.Total)
 		return
 	}
-
-	return
 }
 
 // ExpectLength returns a query check that asserts that the length of the query result is exactly the given value.