refactor: split out error func

Parkreiner · Parkreiner · commit a2c246ea06da · 2025-04-14T13:52:40.000Z
diff --git a/scripts/contributors/contributors.go b/scripts/contributors/contributors.go
@@ -260,36 +260,37 @@ func validateContributorAvatarURL(avatarURL *string) []error {
 	return problems
 }
 
+func addFilePathToError(filePath string, err error) error {
+	return fmt.Errorf("%q: %v", filePath, err)
+}
+
 func validateContributorYaml(yml contributorProfile) []error {
 	allProblems := []error{}
-	addFilePath := func(err error) error {
-		return fmt.Errorf("%q: %v", yml.filePath, err)
-	}
 
 	if err := validateContributorGithubUsername(yml.frontmatter.GithubUsername); err != nil {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 	if err := validateContributorDisplayName(yml.frontmatter.DisplayName); err != nil {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 	if err := validateContributorLinkedinURL(yml.frontmatter.LinkedinURL); err != nil {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 	if err := validateContributorWebsite(yml.frontmatter.WebsiteURL); err != nil {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 	if err := validateContributorStatus(yml.frontmatter.ContributorStatus); err != nil {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 
 	for _, err := range validateContributorEmployerGithubUsername(yml.frontmatter.EmployerGithubUsername, yml.frontmatter.GithubUsername) {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 	for _, err := range validateContributorSupportEmail(yml.frontmatter.SupportEmail) {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 	for _, err := range validateContributorAvatarURL(yml.frontmatter.AvatarURL) {
-		allProblems = append(allProblems, addFilePath(err))
+		allProblems = append(allProblems, addFilePathToError(yml.filePath, err))
 	}
 
 	return allProblems

Original file line number	Diff line number	Diff line change
`@@ -260,36 +260,37 @@ func validateContributorAvatarURL(avatarURL *string) []error {`
`260`	`260`	`return problems`
`261`	`261`	`}`
`262`	`262`
	`263`	`+func addFilePathToError(filePath string, err error) error {`
	`264`	`+ return fmt.Errorf("%q: %v", filePath, err)`
	`265`	`+}`
	`266`	`+`
`263`	`267`	`func validateContributorYaml(yml contributorProfile) []error {`
`264`	`268`	`allProblems := []error{}`
`265`		`- addFilePath := func(err error) error {`
`266`		`- return fmt.Errorf("%q: %v", yml.filePath, err)`
`267`		`- }`
`268`	`269`
`269`	`270`	`if err := validateContributorGithubUsername(yml.frontmatter.GithubUsername); err != nil {`
`270`		`- allProblems = append(allProblems, addFilePath(err))`
	`271`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`271`	`272`	`}`
`272`	`273`	`if err := validateContributorDisplayName(yml.frontmatter.DisplayName); err != nil {`
`273`		`- allProblems = append(allProblems, addFilePath(err))`
	`274`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`274`	`275`	`}`
`275`	`276`	`if err := validateContributorLinkedinURL(yml.frontmatter.LinkedinURL); err != nil {`
`276`		`- allProblems = append(allProblems, addFilePath(err))`
	`277`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`277`	`278`	`}`
`278`	`279`	`if err := validateContributorWebsite(yml.frontmatter.WebsiteURL); err != nil {`
`279`		`- allProblems = append(allProblems, addFilePath(err))`
	`280`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`280`	`281`	`}`
`281`	`282`	`if err := validateContributorStatus(yml.frontmatter.ContributorStatus); err != nil {`
`282`		`- allProblems = append(allProblems, addFilePath(err))`
	`283`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`283`	`284`	`}`
`284`	`285`
`285`	`286`	`for _, err := range validateContributorEmployerGithubUsername(yml.frontmatter.EmployerGithubUsername, yml.frontmatter.GithubUsername) {`
`286`		`- allProblems = append(allProblems, addFilePath(err))`
	`287`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`287`	`288`	`}`
`288`	`289`	`for _, err := range validateContributorSupportEmail(yml.frontmatter.SupportEmail) {`
`289`		`- allProblems = append(allProblems, addFilePath(err))`
	`290`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`290`	`291`	`}`
`291`	`292`	`for _, err := range validateContributorAvatarURL(yml.frontmatter.AvatarURL) {`
`292`		`- allProblems = append(allProblems, addFilePath(err))`
	`293`	`+ allProblems = append(allProblems, addFilePathToError(yml.filePath, err))`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`return allProblems`