refactor(test): encapsulate expected values in want struct

Refactor TestExtractBuilderIDFromOIDC to use a nested 'want' struct for
expected values, separating test inputs from expected outputs.

Before:
  expectError bool
  expectedID  string
  errorMsg    string

After:
  want struct {
    id  string
    err string
  }

Benefits:
- Clear separation between inputs and expected outputs
- More idiomatic Go testing pattern
- Easier to understand test intent at a glance
- Follows go.mdc testing conventions

Co-authored-by: Ona <[email protected]>

Author: leodido

pkg/leeway/signing/attestation_test.go

@@ -1221,9 +1221,10 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 		name        string
 		setupServer func() *httptest.Server
 		githubCtx   *GitHubContext
-		expectError bool
-		expectedID  string
-		errorMsg    string
+		want        struct {
+			id  string
+			err string
+		}
 	}{
 		{
 			name: "valid OIDC token with reusable workflow",
@@ -1249,8 +1250,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				Repository:  "example-org/example-repo",
 				WorkflowRef: "example-org/example-repo/.github/workflows/calling-workflow.yml@refs/heads/main",
 			},
-			expectError: false,
-			expectedID:  "https://github.com/example-org/example-repo/.github/workflows/_build.yml@refs/heads/leo/slsa/b",
+			want: struct {
+				id  string
+				err string
+			}{
+				id: "https://github.com/example-org/example-repo/.github/workflows/_build.yml@refs/heads/leo/slsa/b",
+			},
 		},
 		{
 			name: "valid OIDC token with direct workflow",
@@ -1275,8 +1280,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				Repository:  "gitpod-io/leeway",
 				WorkflowRef: "gitpod-io/leeway/.github/workflows/build.yml@refs/heads/main",
 			},
-			expectError: false,
-			expectedID:  "https://github.com/gitpod-io/leeway/.github/workflows/build.yml@refs/heads/main",
+			want: struct {
+				id  string
+				err string
+			}{
+				id: "https://github.com/gitpod-io/leeway/.github/workflows/build.yml@refs/heads/main",
+			},
 		},
 		{
 			name: "invalid JWT format - only 2 parts",
@@ -1293,8 +1302,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				ServerURL:  "https://github.com",
 				Repository: "org/repo",
 			},
-			expectError: true,
-			errorMsg:    "invalid JWT token format",
+			want: struct {
+				id  string
+				err string
+			}{
+				err: "invalid JWT token format",
+			},
 		},
 		{
 			name: "missing sub claim",
@@ -1315,8 +1328,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				ServerURL:  "https://github.com",
 				Repository: "org/repo",
 			},
-			expectError: true,
-			errorMsg:    "sub claim not found",
+			want: struct {
+				id  string
+				err string
+			}{
+				err: "sub claim not found",
+			},
 		},
 		{
 			name: "whitespace-only sub claim",
@@ -1337,8 +1354,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				ServerURL:  "https://github.com",
 				Repository: "org/repo",
 			},
-			expectError: true,
-			errorMsg:    "sub claim not found or empty",
+			want: struct {
+				id  string
+				err string
+			}{
+				err: "sub claim not found or empty",
+			},
 		},
 		{
 			name: "job_workflow_ref in top-level claim (not in sub)",
@@ -1363,8 +1384,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				ServerURL:  "https://github.com",
 				Repository: "org/repo",
 			},
-			expectError: false,
-			expectedID:  "https://github.com/org/repo/.github/workflows/deploy.yml@refs/heads/main",
+			want: struct {
+				id  string
+				err string
+			}{
+				id: "https://github.com/org/repo/.github/workflows/deploy.yml@refs/heads/main",
+			},
 		},
 		{
 			name: "missing job_workflow_ref in sub claim and top-level",
@@ -1388,8 +1413,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				ServerURL:  "https://github.com",
 				Repository: "org/repo",
 			},
-			expectError: true,
-			errorMsg:    "job_workflow_ref not found",
+			want: struct {
+				id  string
+				err string
+			}{
+				err: "job_workflow_ref not found",
+			},
 		},
 		{
 			name: "OIDC token fetch failure",
@@ -1402,8 +1431,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 				ServerURL:  "https://github.com",
 				Repository: "org/repo",
 			},
-			expectError: true,
-			errorMsg:    "failed to fetch OIDC token",
+			want: struct {
+				id  string
+				err string
+			}{
+				err: "failed to fetch OIDC token",
+			},
 		},
 	}
 
@@ -1417,14 +1450,12 @@ func TestExtractBuilderIDFromOIDC(t *testing.T) {
 
 			builderID, err := extractBuilderIDFromOIDC(context.Background(), tt.githubCtx)
 
-			if tt.expectError {
+			if tt.want.err != "" {
 				assert.Error(t, err)
-				if tt.errorMsg != "" {
-					assert.Contains(t, err.Error(), tt.errorMsg)
-				}
+				assert.Contains(t, err.Error(), tt.want.err)
 			} else {
 				assert.NoError(t, err)
-				assert.Equal(t, tt.expectedID, builderID)
+				assert.Equal(t, tt.want.id, builderID)
 			}
 		})
 	}