use errors.Is

Signed-off-by: sivchari <[email protected]>

Author: sivchari

cmd/clusterctl/client/cluster/template.go

@@ -305,8 +305,7 @@ func getGitHubClient(ctx context.Context, configVariablesClient config.Variables
 
 // handleGithubErr wraps error messages.
 func handleGithubErr(err error, message string, args ...interface{}) error {
-	var rateLimitErr *github.RateLimitError
-	if errors.As(err, &rateLimitErr) {
+	if errors.Is(err, &github.RateLimitError{}) {
 		return errors.New("rate limit for github api has been reached. Please wait one hour or get a personal API token and assign it to the GITHUB_TOKEN environment variable")
 	}
 	return errors.Wrapf(err, message, args...)

cmd/clusterctl/client/repository/repository_github.go

@@ -319,7 +319,7 @@ func (g *gitHubRepository) getVersions(ctx context.Context) ([]string, error) {
 		if listReleasesErr != nil {
 			retryError = g.handleGithubErr(listReleasesErr, "failed to get the list of releases")
 			// Return immediately if we are rate limited.
-			if _, ok := listReleasesErr.(*github.RateLimitError); ok {
+			if errors.Is(listReleasesErr, &github.RateLimitError{}) {
 				return false, retryError
 			}
 			return false, nil
@@ -334,7 +334,7 @@ func (g *gitHubRepository) getVersions(ctx context.Context) ([]string, error) {
 			if listReleasesErr != nil {
 				retryError = g.handleGithubErr(listReleasesErr, "failed to get the list of releases")
 				// Return immediately if we are rate limited.
-				if _, ok := listReleasesErr.(*github.RateLimitError); ok {
+				if errors.Is(listReleasesErr, &github.RateLimitError{}) {
 					return false, retryError
 				}
 				return false, nil
@@ -384,7 +384,7 @@ func (g *gitHubRepository) getReleaseByTag(ctx context.Context, tag string) (*gi
 				return false, retryError
 			}
 			// Return immediately if we are rate limited.
-			if _, ok := getReleasesErr.(*github.RateLimitError); ok {
+			if errors.Is(getReleasesErr, &github.RateLimitError{}) {
 				return false, retryError
 			}
 			return false, nil
@@ -466,8 +466,7 @@ func (g *gitHubRepository) downloadFilesFromRelease(ctx context.Context, release
 		if downloadReleaseError != nil {
 			retryError = g.handleGithubErr(downloadReleaseError, "failed to download file %q from %q release", *release.TagName, fileName)
 			// Return immediately if we are rate limited.
-			var rateLimitError *github.RateLimitError
-			if errors.As(downloadReleaseError, &rateLimitError) {
+			if errors.Is(downloadReleaseError, &github.RateLimitError{}) {
 				return false, retryError
 			}
 			return false, nil
@@ -500,7 +499,7 @@ func (g *gitHubRepository) downloadFilesFromRelease(ctx context.Context, release
 
 // handleGithubErr wraps error messages.
 func (g *gitHubRepository) handleGithubErr(err error, message string, args ...interface{}) error {
-	if _, ok := err.(*github.RateLimitError); ok {
+	if errors.Is(err, &github.RateLimitError{}) {
 		return errors.New("rate limit for github api has been reached. Please wait one hour or get a personal API token and assign it to the GITHUB_TOKEN environment variable")
 	}
 

controlplane/kubeadm/internal/controllers/controller.go

@@ -212,8 +212,7 @@ func (r *KubeadmControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.
 	defer func() {
 		// Always attempt to update status.
 		if err := r.updateStatus(ctx, controlPlane); err != nil {
-			var connFailure *internal.RemoteClusterConnectionError
-			if errors.As(err, &connFailure) {
+			if errors.Is(err, &internal.RemoteClusterConnectionError{}) {
 				log.Error(err, "Could not connect to workload cluster to fetch status")
 			} else {
 				log.Error(err, "Failed to update KubeadmControlPlane status")

internal/controllers/machine/drain/drain.go

@@ -374,7 +374,7 @@ evictionLoop:
 			// Ensure the causes are also included in the error message.
 			// Before: "Cannot evict pod as it would violate the pod's disruption budget."
 			// After: "Cannot evict pod as it would violate the pod's disruption budget. The disruption budget nginx needs 20 healthy pods and has 20 currently"
-			if ok := errors.As(err, &statusError); ok {
+			if errors.As(err, &statusError) {
 				errorMessage := statusError.Status().Message
 				if statusError.Status().Details != nil {
 					var causes []string

internal/runtime/client/client.go

@@ -341,8 +341,7 @@ func (c *client) CallExtension(ctx context.Context, hook runtimecatalog.Hook, fo
 		// If the error is errCallingExtensionHandler then apply failure policy to calculate
 		// the effective result of the operation.
 		ignore := *registration.FailurePolicy == runtimev1.FailurePolicyIgnore
-		var errTyp errCallingExtensionHandler
-		if errors.As(err, &errTyp) && ignore {
+		if _, ok := err.(errCallingExtensionHandler); ok && ignore {
 			// Update the response to a default success response and return.
 			log.Error(err, fmt.Sprintf("Ignoring error calling extension handler because of FailurePolicy %q", *registration.FailurePolicy))
 			response.SetStatus(runtimehooksv1.ResponseStatusSuccess)