Fix lint issues after using golangci-lint-1.52.2 (#296)

cmd/flags.go

@@ -151,7 +151,7 @@ func (ae alwaysError) Write([]byte) (int, error) {
 	return 0, ae.error
 }
 
-func (ae alwaysError) Read(p []byte) (n int, err error) {
+func (ae alwaysError) Read(_ []byte) (n int, err error) {
 	return 0, ae.error
 }
 

cmd/pubkey.go

@@ -69,7 +69,7 @@ func init() {
 	addPublicKeyAlgoFlag(pubkeyCmd)
 }
 
-func getKey(rw io.ReadWriter, hierarchy tpmutil.Handle, algo tpm2.Algorithm) (*client.Key, error) {
+func getKey(rw io.ReadWriter, hierarchy tpmutil.Handle, _ tpm2.Algorithm) (*client.Key, error) {
 	fmt.Fprintf(debugOutput(), "Using hierarchy 0x%x\n", hierarchy)
 	if nvIndex != 0 {
 		fmt.Fprintf(debugOutput(), "Reading from NVDATA index %d\n", nvIndex)

launcher/agent/agent_test.go

@@ -55,6 +55,6 @@ func TestAttest(t *testing.T) {
 	fmt.Printf("token.Claims: %v\n", token.Claims)
 }
 
-func placeholderFetcher(audience string) ([][]byte, error) {
+func placeholderFetcher(_ string) ([][]byte, error) {
 	return [][]byte{}, nil
 }

launcher/container_runner.go

@@ -91,7 +91,7 @@ func fetchImpersonatedToken(ctx context.Context, serviceAccount string, audience
 
 // NewRunner returns a runner.
 func NewRunner(ctx context.Context, cdClient *containerd.Client, token oauth2.Token, launchSpec spec.LaunchSpec, mdsClient *metadata.Client, tpm io.ReadWriteCloser, logger *log.Logger) (*ContainerRunner, error) {
-	image, err := initImage(ctx, cdClient, launchSpec, token, logger)
+	image, err := initImage(ctx, cdClient, launchSpec, token)
 	if err != nil {
 		return nil, err
 	}
@@ -515,7 +515,7 @@ func (r *ContainerRunner) Run(ctx context.Context) error {
 	return nil
 }
 
-func initImage(ctx context.Context, cdClient *containerd.Client, launchSpec spec.LaunchSpec, token oauth2.Token, logger *log.Logger) (containerd.Image, error) {
+func initImage(ctx context.Context, cdClient *containerd.Client, launchSpec spec.LaunchSpec, token oauth2.Token) (containerd.Image, error) {
 	if token.Valid() {
 		remoteOpt := containerd.WithResolver(Resolver(token.AccessToken))
 

launcher/container_runner_test.go

@@ -480,7 +480,7 @@ func TestInitImageDockerPublic(t *testing.T) {
 	ctx := namespaces.WithNamespace(context.Background(), "test")
 	// This is a "valid" token (formatwise)
 	validToken := oauth2.Token{AccessToken: "000000", Expiry: time.Now().Add(time.Hour)}
-	if _, err := initImage(ctx, containerdClient, spec.LaunchSpec{ImageRef: "docker.io/library/hello-world:latest"}, validToken, log.Default()); err != nil {
+	if _, err := initImage(ctx, containerdClient, spec.LaunchSpec{ImageRef: "docker.io/library/hello-world:latest"}, validToken); err != nil {
 		t.Error(err)
 	} else {
 		if err := containerdClient.ImageService().Delete(ctx, "docker.io/library/hello-world:latest"); err != nil {
@@ -489,7 +489,7 @@ func TestInitImageDockerPublic(t *testing.T) {
 	}
 
 	invalidToken := oauth2.Token{}
-	if _, err := initImage(ctx, containerdClient, spec.LaunchSpec{ImageRef: "docker.io/library/hello-world:latest"}, invalidToken, log.Default()); err != nil {
+	if _, err := initImage(ctx, containerdClient, spec.LaunchSpec{ImageRef: "docker.io/library/hello-world:latest"}, invalidToken); err != nil {
 		t.Error(err)
 	} else {
 		if err := containerdClient.ImageService().Delete(ctx, "docker.io/library/hello-world:latest"); err != nil {

launcher/verifier/fake/fakeverifier.go

@@ -24,7 +24,7 @@ func NewClient(signer crypto.Signer) verifier.Client {
 //
 // If you have found this method is insufficient for your tests, this class must be updated to
 // allow for better testing.
-func (fc *fakeClient) CreateChallenge(ctx context.Context) (*verifier.Challenge, error) {
+func (fc *fakeClient) CreateChallenge(_ context.Context) (*verifier.Challenge, error) {
 	bs := make([]byte, 2)
 	binary.LittleEndian.PutUint16(bs, 15)
 	return &verifier.Challenge{
@@ -37,7 +37,7 @@ func (fc *fakeClient) CreateChallenge(ctx context.Context) (*verifier.Challenge,
 //
 // If you have found this method is insufficient for your tests, this class must be updated to
 // allow for better testing.
-func (fc *fakeClient) VerifyAttestation(ctx context.Context, request verifier.VerifyAttestationRequest) (*verifier.VerifyAttestationResponse, error) {
+func (fc *fakeClient) VerifyAttestation(_ context.Context, _ verifier.VerifyAttestationRequest) (*verifier.VerifyAttestationResponse, error) {
 	// Determine signing algorithm.
 	signingMethod := jwt.SigningMethodRS256
 	now := jwt.TimeFunc()

launcher/verifier/rest/rest.go

@@ -76,7 +76,7 @@ type restClient struct {
 }
 
 // CreateChallenge implements verifier.Client
-func (c *restClient) CreateChallenge(ctx context.Context) (*verifier.Challenge, error) {
+func (c *restClient) CreateChallenge(_ context.Context) (*verifier.Challenge, error) {
 	// Pass an empty Challenge for the input (all params are output-only)
 	chal, err := c.service.Projects.Locations.Challenges.Create(
 		c.location.Name,
@@ -89,7 +89,7 @@ func (c *restClient) CreateChallenge(ctx context.Context) (*verifier.Challenge,
 }
 
 // VerifyAttestation implements verifier.Client
-func (c *restClient) VerifyAttestation(ctx context.Context, request verifier.VerifyAttestationRequest) (*verifier.VerifyAttestationResponse, error) {
+func (c *restClient) VerifyAttestation(_ context.Context, request verifier.VerifyAttestationRequest) (*verifier.VerifyAttestationResponse, error) {
 	if request.Challenge == nil || request.Attestation == nil {
 		return nil, fmt.Errorf("nil value provided in challenge")
 	}

launcher/verifier/rest/rest_network_test.go

@@ -36,7 +36,7 @@ func testClient(t *testing.T) verifier.Client {
 	return vClient
 }
 
-func testFetcher(audience string) ([][]byte, error) {
+func testFetcher(_ string) ([][]byte, error) {
 	return [][]byte{}, nil
 }
 

server/eventlog.go

@@ -98,7 +98,7 @@ func parseCanonicalEventLog(rawCanonicalEventLog []byte, pcrs *tpmpb.PCRs) (*pb.
 		return nil, err
 	}
 
-	cosState, err := getVerifiedCosState(decodedCEL, pcrs)
+	cosState, err := getVerifiedCosState(decodedCEL)
 	if err != nil {
 		return nil, err
 	}
@@ -117,7 +117,7 @@ func contains(set [][]byte, value []byte) bool {
 	return false
 }
 
-func getVerifiedCosState(coscel cel.CEL, pcrs *tpmpb.PCRs) (*pb.AttestedCosState, error) {
+func getVerifiedCosState(coscel cel.CEL) (*pb.AttestedCosState, error) {
 	cosState := &pb.AttestedCosState{}
 	cosState.Container = &pb.ContainerState{}
 	cosState.Container.Args = make([]string, 0)

server/policy.go

@@ -13,10 +13,7 @@ import (
 // will describe in what way the state failed. See the Policy documentation for
 // more information about the specifics of different policies.
 func EvaluatePolicy(state *pb.MachineState, policy *pb.Policy) error {
-	if err := evaluatePlatformPolicy(state.GetPlatform(), policy.GetPlatform()); err != nil {
-		return err
-	}
-	return nil
+	return evaluatePlatformPolicy(state.GetPlatform(), policy.GetPlatform())
 }
 
 func evaluatePlatformPolicy(state *pb.PlatformState, policy *pb.PlatformPolicy) error {

simulator/simulator.go

@@ -139,7 +139,7 @@ func (s *Simulator) IsClosed() bool {
 	return s.closed
 }
 
-func (s *Simulator) on(manufactureReset bool) error {
+func (s *Simulator) on(_ bool) error {
 	// TPM2_Startup must be the first command the TPM receives.
 	if err := tpm2.Startup(s, tpm2.StartupClear); err != nil {
 		return fmt.Errorf("startup: %w", err)