diff --git a/cli/slsa-verifier/main_regression_test.go b/cli/slsa-verifier/main_regression_test.go index 649762d..f0fb597 100644 --- a/cli/slsa-verifier/main_regression_test.go +++ b/cli/slsa-verifier/main_regression_test.go @@ -1802,7 +1802,7 @@ func Test_runVerifyVSA(t *testing.T) { tests := []struct { name string - AttestationPath *string + attestationPath *string subjectDigests *[]string verifierID *string resourceURI *string @@ -1814,7 +1814,7 @@ func Test_runVerifyVSA(t *testing.T) { }{ { name: "success: gke", - AttestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), + attestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), subjectDigests: PointerTo([]string{"gce_image_id:8970095005306000053"}), verifierID: PointerTo("https://bcid.corp.google.com/verifier/bcid_package_enforcer/v0.1"), resourceURI: PointerTo("gce_image://gke-node-images:gke-12615-gke1418000-cos-101-17162-463-29-c-cgpv1-pre"), @@ -1825,7 +1825,7 @@ func Test_runVerifyVSA(t *testing.T) { }, { name: "success: gke, default public key hash algo", - AttestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), + attestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), subjectDigests: PointerTo([]string{"gce_image_id:8970095005306000053"}), verifierID: PointerTo("https://bcid.corp.google.com/verifier/bcid_package_enforcer/v0.1"), resourceURI: PointerTo("gce_image://gke-node-images:gke-12615-gke1418000-cos-101-17162-463-29-c-cgpv1-pre"), @@ -1836,14 +1836,14 @@ func Test_runVerifyVSA(t *testing.T) { }, { name: "fail: gke, unsupported public key hash algo", - AttestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), + attestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), publicKeyPath: PointerTo("gce/v1/vsa_signing_public_key.pem"), publicKeyHashAlgo: PointerTo("SHA123"), err: serrors.ErrorInvalidHashAlgo, }, { name: "fail: gke, wrong public key hash algo", - AttestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), + attestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), publicKeyPath: PointerTo("gce/v1/vsa_signing_public_key.pem"), publicKeyID: PointerTo(""), publicKeyHashAlgo: PointerTo("SHA512"), @@ -1851,7 +1851,7 @@ func Test_runVerifyVSA(t *testing.T) { }, { name: "fail: gke, wrong key id", - AttestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), + attestationPath: PointerTo("gce/v1/gke-gce-pre.bcid-vsa.jsonl"), publicKeyPath: PointerTo("gce/v1/vsa_signing_public_key.pem"), publicKeyID: PointerTo("my_key_id"), publicKeyHashAlgo: PointerTo("SHA256"), @@ -1865,11 +1865,11 @@ func Test_runVerifyVSA(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - AttestationPath := filepath.Clean(filepath.Join(TEST_DIR, "vsa", *tt.AttestationPath)) + attestationPath := filepath.Clean(filepath.Join(TEST_DIR, "vsa", *tt.attestationPath)) publicKeyPath := filepath.Clean(filepath.Join(TEST_DIR, "vsa", *tt.publicKeyPath)) cmd := verify.VerifyVSACommand{ - AttestationPath: &AttestationPath, + attestationPath: &attestationPath, SubjectDigests: tt.subjectDigests, VerifierID: tt.verifierID, ResourceURI: tt.resourceURI, diff --git a/verifiers/internal/vsa/vsa_test.go b/verifiers/internal/vsa/vsa_test.go index 00331bd..919dbca 100644 --- a/verifiers/internal/vsa/vsa_test.go +++ b/verifiers/internal/vsa/vsa_test.go @@ -24,7 +24,7 @@ func Test_VerifyVSA(t *testing.T) { tests := []struct { name string - AttestationPath string + attestationPath string vsaOpts *options.VSAOpts verificationOpts *options.VerificationOpts err error @@ -147,8 +147,8 @@ func Test_VerifyVSA(t *testing.T) { for _, tt := range tests { // t.Parallel() - AttestationPath := filepath.Clean(filepath.Join(testDir, tt.AttestationPath)) - attestations, err := os.ReadFile(AttestationPath) + attestationPath := filepath.Clean(filepath.Join(testDir, tt.attestationPath)) + attestations, err := os.ReadFile(attestationPath) if err != nil { t.Errorf("failed to read attestations file: %v", err) }