Don't error out when checking for token expiration on 404

When checking for token expiration the rate_limit api may not enabled on that
token. Don't error out and just print a log message.

Fixes #1107

Signed-off-by: Chmouel Boudjnah <[email protected]>

Author: chmouel

pkg/provider/github/github.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+	"net/http"
 	"net/url"
 	"strings"
 	"sync"
@@ -180,20 +181,25 @@ func makeClient(ctx context.Context, apiURL, token string) (*github.Client, stri
 func (v *Provider) checkWebhookSecretValidity(ctx context.Context, cw clockwork.Clock) error {
 	rl, resp, err := v.Client.RateLimits(ctx)
 	if resp.Header.Get("GitHub-Authentication-Token-Expiration") != "" && cw.Now().After(resp.TokenExpiration.Time) {
-		errm := fmt.Sprintf("token has expired at %s", resp.TokenExpiration.Time.Format(time.RFC1123))
+		errm := fmt.Sprintf("token has expired at %s", resp.TokenExpiration.Format(time.RFC1123))
 		if err != nil {
 			errm += fmt.Sprintf(" err: %s", err.Error())
 		}
 		return fmt.Errorf(errm)
 	}
 
+	if resp.StatusCode == http.StatusNotFound {
+		v.Logger.Info("skipping checking if token has expired, rate_limit api is not enabled on token")
+		return nil
+	}
+
 	// some other error happened that is not rate limited related
 	if err != nil {
 		return fmt.Errorf("error using token to access API: %w", err)
 	}
 
 	if rl.SCIM.Remaining == 0 {
-		return fmt.Errorf("token is ratelimited, it will be available again at %s", rl.SCIM.Reset.Time.Format(time.RFC1123))
+		return fmt.Errorf("token is ratelimited, it will be available again at %s", rl.SCIM.Reset.Format(time.RFC1123))
 	}
 	return nil
 }

pkg/provider/github/github_test.go

@@ -623,11 +623,13 @@ func TestGetFiles(t *testing.T) {
 func TestProvider_checkWebhookSecretValidity(t *testing.T) {
 	cw := clockwork.NewFakeClock()
 	tests := []struct {
-		name         string
-		wantSubErr   string
-		remaining    int
-		expTime      time.Time
-		expHeaderSet bool
+		name           string
+		wantSubErr     string
+		remaining      int
+		expTime        time.Time
+		expHeaderSet   bool
+		apiNotEnabled  bool
+		wantLogSnippet string
 	}{
 		{
 			name:         "remaining scim calls",
@@ -657,39 +659,52 @@ func TestProvider_checkWebhookSecretValidity(t *testing.T) {
 			remaining:  0,
 			wantSubErr: "token is ratelimited",
 		},
+		{
+			name:           "not enabled",
+			apiNotEnabled:  true,
+			wantLogSnippet: "skipping checking",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx, _ := rtesting.SetupFakeContext(t)
 			fakeclient, mux, _, teardown := ghtesthelper.SetupGH()
+			logger, observer := logger.GetLogger()
 
-			mux.HandleFunc("/rate_limit", func(rw http.ResponseWriter, r *http.Request) {
-				s := &github.RateLimits{
-					SCIM: &github.Rate{
-						Remaining: tt.remaining,
-					},
-				}
-				st := new(struct {
-					Resources *github.RateLimits `json:"resources"`
+			if !tt.apiNotEnabled {
+				mux.HandleFunc("/rate_limit", func(rw http.ResponseWriter, r *http.Request) {
+					s := &github.RateLimits{
+						SCIM: &github.Rate{
+							Remaining: tt.remaining,
+						},
+					}
+					st := new(struct {
+						Resources *github.RateLimits `json:"resources"`
+					})
+					st.Resources = s
+					b, _ := json.Marshal(st)
+					rw.Header().Set("Content-Type", "application/json")
+					if tt.expHeaderSet {
+						rw.Header().Set("GitHub-Authentication-Token-Expiration", tt.expTime.Format("2006-01-02 03:04:05 MST"))
+					}
+					fmt.Fprint(rw, string(b))
 				})
-				st.Resources = s
-				b, _ := json.Marshal(st)
-				rw.Header().Set("Content-Type", "application/json")
-				if tt.expHeaderSet {
-					rw.Header().Set("GitHub-Authentication-Token-Expiration", tt.expTime.Format("2006-01-02 03:04:05 MST"))
-				}
-				fmt.Fprint(rw, string(b))
-			})
+			}
 			defer teardown()
 			v := &Provider{
 				Client: fakeclient,
+				Logger: logger,
 			}
 			err := v.checkWebhookSecretValidity(ctx, cw)
 			if tt.wantSubErr != "" {
 				assert.ErrorContains(t, err, tt.wantSubErr)
 			} else {
 				assert.NilError(t, err)
 			}
+
+			if tt.wantLogSnippet != "" {
+				assert.Assert(t, observer.FilterMessageSnippet(tt.wantLogSnippet).Len() > 0)
+			}
 		})
 	}
 }