[issuegenerator] remove pr section from issue body (#1244)

* remove pr section from issue body

* fix lint

Author: jelly-afk

.chloggen/remove-pr-autogenerated-issue.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. crosslink)
+component: issuegenerator
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: removed pr section from autogenerated issue body.
+
+# One or more tracking issues related to the change
+issues: [1243]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

issuegenerator/internal/github/client.go

@@ -38,7 +38,6 @@ const (
 	githubWorkflow           = "GITHUB_ACTION"
 	githubAPITokenKey        = "GITHUB_TOKEN" // #nosec G101
 	githubSHAKey             = "GITHUB_SHA"
-	githubRefKey             = "GITHUB_REF"
 
 	githubOwner      = "githubOwner"
 	githubRepository = "githubRepository"
@@ -53,7 +52,6 @@ Auto-generated report for ${jobName} job build.
 
 Link to failed build: ${linkToBuild}
 Commit: ${commit}
-PR: ${pr}
 
 ### Component(s)
 ${component}
@@ -66,7 +64,6 @@ this issue is open, will be added as comments with more information to this issu
 	issueCommentTemplate = `
 Link to latest failed build: ${linkToBuild}
 Commit: ${commit}
-PR: ${pr}
 
 ${failedTests}
 `
@@ -150,7 +147,6 @@ func getRequiredEnv() (map[string]string, error) {
 	env[githubRunID] = os.Getenv(githubRunID)
 	env[githubAPITokenKey] = os.Getenv(githubAPITokenKey)
 	env[githubSHAKey] = os.Getenv(githubSHAKey)
-	env[githubRefKey] = os.Getenv(githubRefKey)
 
 	for k, v := range env {
 		if v == "" {
@@ -252,20 +248,21 @@ func templateHelper(env map[string]string, r report.Report) func(string) string
 			trimmedModule := trimModule(env[githubOwner], env[githubRepository], r.Module)
 			return getComponent(trimmedModule)
 		case "commit":
-			return env[githubSHAKey]
-		case "pr":
-			ref := env[githubRefKey]
-			parts := strings.Split(ref, "/")
-			if len(parts) == 4 && parts[1] == "pull" {
-				return "#" + parts[2]
-			}
-			return fmt.Sprintf("N/A (github_ref: %q)", ref)
+			return shortSha(env[githubSHAKey])
 		default:
 			return ""
 		}
 	}
 }
 
+// shortSha returns the first 7 characters of a full Git commit SHA
+func shortSha(sha string) string {
+	if len(sha) >= 7 {
+		return sha[:7]
+	}
+	return sha
+}
+
 // CreateIssue creates a new GitHub Issue corresponding to a build failure.
 func (c *Client) CreateIssue(ctx context.Context, r report.Report) *github.Issue {
 	trimmedModule := trimModule(c.envVariables[githubOwner], c.envVariables[githubRepository], r.Module)

issuegenerator/internal/github/client_test.go

@@ -40,7 +40,6 @@ func TestTemplateExpansion(t *testing.T) {
 		githubRepository: "test-repo",
 		githubRunID:      "555555",
 		githubSHAKey:     "abcde12345",
-		githubRefKey:     "refs/pull/1234/merge",
 	}
 
 	// Sort the reports by module name to ensure deterministic order
@@ -59,8 +58,7 @@ func TestTemplateExpansion(t *testing.T) {
 Auto-generated report for ` + "`test-ci`" + ` job build.
 
 Link to failed build: https://github.com/test-org/test-repo/actions/runs/555555
-Commit: abcde12345
-PR: #1234
+Commit: abcde12
 
 ### Component(s)
 ` + "package1" + `
@@ -83,8 +81,7 @@ this issue is open, will be added as comments with more information to this issu
 			template: issueCommentTemplate,
 			expected: `
 Link to latest failed build: https://github.com/test-org/test-repo/actions/runs/555555
-Commit: abcde12345
-PR: #1234
+Commit: abcde12
 
 #### Test Failures
 -  ` + "`TestFailure`" + `