Removes all redundant returns

nickfloyd · nickfloyd · commit 15b86253b275 · 2025-12-03T18:34:01.000-06:00
diff --git a/github/resource_github_actions_environment_secret.go b/github/resource_github_actions_environment_secret.go
@@ -139,7 +139,6 @@ func resourceGithubActionsEnvironmentSecretRead(d *schema.ResourceData, meta any
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
@@ -154,7 +153,6 @@ func resourceGithubActionsEnvironmentSecretRead(d *schema.ResourceData, meta any
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_actions_environment_variable.go b/github/resource_github_actions_environment_variable.go
@@ -118,7 +118,6 @@ func resourceGithubActionsEnvironmentVariableRead(d *schema.ResourceData, meta a
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_actions_variable.go b/github/resource_github_actions_variable.go
@@ -112,7 +112,6 @@ func resourceGithubActionsVariableRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_branch_default.go b/github/resource_github_branch_default.go
@@ -109,7 +109,6 @@ func resourceGithubBranchDefaultRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_codespaces_organization_secret.go b/github/resource_github_codespaces_organization_secret.go
@@ -157,7 +157,6 @@ func resourceGithubCodespacesOrganizationSecretRead(d *schema.ResourceData, meta
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_codespaces_secret.go b/github/resource_github_codespaces_secret.go
@@ -127,7 +127,6 @@ func resourceGithubCodespacesSecretRead(d *schema.ResourceData, meta any) error
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_codespaces_user_secret.go b/github/resource_github_codespaces_user_secret.go
@@ -141,7 +141,6 @@ func resourceGithubCodespacesUserSecretRead(d *schema.ResourceData, meta any) er
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_issue.go b/github/resource_github_issue.go
@@ -164,7 +164,6 @@ func resourceGithubIssueRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_issue_label.go b/github/resource_github_issue_label.go
@@ -170,7 +170,6 @@ func resourceGithubIssueLabelRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_membership.go b/github/resource_github_membership.go
@@ -113,7 +113,6 @@ func resourceGithubMembershipRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
@@ -159,7 +158,6 @@ func resourceGithubMembershipDelete(d *schema.ResourceData, meta any) error {
 					log.Printf("[INFO] Not downgrading '%s' membership for '%s' because they are not a member of the org anymore", orgName, username)
 					return nil
 				}
-				return err
 			}
 
 			return err
diff --git a/github/resource_github_organization_ruleset.go b/github/resource_github_organization_ruleset.go
@@ -636,7 +636,6 @@ func resourceGithubOrganizationRulesetRead(d *schema.ResourceData, meta any) err
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_organization_webhook.go b/github/resource_github_organization_webhook.go
@@ -136,7 +136,6 @@ func resourceGithubOrganizationWebhookRead(d *schema.ResourceData, meta any) err
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository.go b/github/resource_github_repository.go
@@ -782,7 +782,6 @@ func resourceGithubRepositoryRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository_collaborator.go b/github/resource_github_repository_collaborator.go
@@ -116,7 +116,6 @@ func resourceGithubRepositoryCollaboratorRead(d *schema.ResourceData, meta any)
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository_deploy_key.go b/github/resource_github_repository_deploy_key.go
@@ -115,7 +115,6 @@ func resourceGithubRepositoryDeployKeyRead(d *schema.ResourceData, meta any) err
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository_deployment_branch_policy.go b/github/resource_github_repository_deployment_branch_policy.go
@@ -127,7 +127,6 @@ func resourceGithubRepositoryDeploymentBranchPolicyRead(d *schema.ResourceData,
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository_environment_deployment_policy.go b/github/resource_github_repository_environment_deployment_policy.go
@@ -115,7 +115,6 @@ func resourceGithubRepositoryEnvironmentDeploymentPolicyRead(d *schema.ResourceD
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository_project.go b/github/resource_github_repository_project.go
@@ -120,7 +120,6 @@ func resourceGithubRepositoryProjectRead(d *schema.ResourceData, meta any) error
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_repository_topics.go b/github/resource_github_repository_topics.go
@@ -83,7 +83,6 @@ func resourceGithubRepositoryTopicsRead(d *schema.ResourceData, meta any) error
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_team.go b/github/resource_github_team.go
@@ -207,7 +207,6 @@ func resourceGithubTeamRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_team_membership.go b/github/resource_github_team_membership.go
@@ -136,7 +136,6 @@ func resourceGithubTeamMembershipRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}
diff --git a/github/resource_github_user_ssh_key.go b/github/resource_github_user_ssh_key.go
@@ -96,7 +96,6 @@ func resourceGithubUserSshKeyRead(d *schema.ResourceData, meta any) error {
 				d.SetId("")
 				return nil
 			}
-			return err
 		}
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ func resourceGithubActionsEnvironmentSecretRead(d *schema.ResourceData, meta any`
`139`	`139`	`d.SetId("")`
`140`	`140`	`return nil`
`141`	`141`	`}`
`142`		`- return err`
`143`	`142`	`}`
`144`	`143`	`return err`
`145`	`144`	`}`
`@@ -154,7 +153,6 @@ func resourceGithubActionsEnvironmentSecretRead(d *schema.ResourceData, meta any`
`154`	`153`	`d.SetId("")`
`155`	`154`	`return nil`
`156`	`155`	`}`
`157`		`- return err`
`158`	`156`	`}`
`159`	`157`	`return err`
`160`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ func resourceGithubActionsEnvironmentVariableRead(d *schema.ResourceData, meta a`
`118`	`118`	`d.SetId("")`
`119`	`119`	`return nil`
`120`	`120`	`}`
`121`		`- return err`
`122`	`121`	`}`
`123`	`122`	`return err`
`124`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ func resourceGithubActionsVariableRead(d *schema.ResourceData, meta any) error {`
`112`	`112`	`d.SetId("")`
`113`	`113`	`return nil`
`114`	`114`	`}`
`115`		`- return err`
`116`	`115`	`}`
`117`	`116`	`return err`
`118`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ func resourceGithubBranchDefaultRead(d *schema.ResourceData, meta any) error {`
`109`	`109`	`d.SetId("")`
`110`	`110`	`return nil`
`111`	`111`	`}`
`112`		`- return err`
`113`	`112`	`}`
`114`	`113`	`return err`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ func resourceGithubCodespacesOrganizationSecretRead(d *schema.ResourceData, meta`
`157`	`157`	`d.SetId("")`
`158`	`158`	`return nil`
`159`	`159`	`}`
`160`		`- return err`
`161`	`160`	`}`
`162`	`161`	`return err`
`163`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ func resourceGithubCodespacesSecretRead(d *schema.ResourceData, meta any) error`
`127`	`127`	`d.SetId("")`
`128`	`128`	`return nil`
`129`	`129`	`}`
`130`		`- return err`
`131`	`130`	`}`
`132`	`131`	`return err`
`133`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ func resourceGithubCodespacesUserSecretRead(d *schema.ResourceData, meta any) er`
`141`	`141`	`d.SetId("")`
`142`	`142`	`return nil`
`143`	`143`	`}`
`144`		`- return err`
`145`	`144`	`}`
`146`	`145`	`return err`
`147`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,6 @@ func resourceGithubIssueRead(d *schema.ResourceData, meta any) error {`
`164`	`164`	`d.SetId("")`
`165`	`165`	`return nil`
`166`	`166`	`}`
`167`		`- return err`
`168`	`167`	`}`
`169`	`168`	`return err`
`170`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ func resourceGithubIssueLabelRead(d *schema.ResourceData, meta any) error {`
`170`	`170`	`d.SetId("")`
`171`	`171`	`return nil`
`172`	`172`	`}`
`173`		`- return err`
`174`	`173`	`}`
`175`	`174`	`return err`
`176`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ func resourceGithubMembershipRead(d *schema.ResourceData, meta any) error {`
`113`	`113`	`d.SetId("")`
`114`	`114`	`return nil`
`115`	`115`	`}`
`116`		`- return err`
`117`	`116`	`}`
`118`	`117`	`return err`
`119`	`118`	`}`
`@@ -159,7 +158,6 @@ func resourceGithubMembershipDelete(d *schema.ResourceData, meta any) error {`
`159`	`158`	`log.Printf("[INFO] Not downgrading '%s' membership for '%s' because they are not a member of the org anymore", orgName, username)`
`160`	`159`	`return nil`
`161`	`160`	`}`
`162`		`- return err`
`163`	`161`	`}`
`164`	`162`
`165`	`163`	`return err`