now

Author: Bencheng21

pkg/connector/org_role_test.go

@@ -58,7 +58,7 @@ func TestOrgRole(t *testing.T) {
 			grants = append(grants, nextGrants...)
 
 			require.Nil(t, err)
-			test.AssertNoRatelimitAnnotations(t, grantsAnnotations)
+			test.AssertHasRatelimitAnnotations(t, grantsAnnotations)
 			if nextToken == "" {
 				break
 			}
@@ -98,7 +98,7 @@ func TestOrgRole(t *testing.T) {
 		require.Nil(t, err)
 		require.Empty(t, resources)
 		require.Empty(t, nextToken)
-		test.AssertNoRatelimitAnnotations(t, annotations)
+		test.AssertHasRatelimitAnnotations(t, annotations)
 
 		// Test Grants with permission error
 		role, _ := orgRoleResource(ctx, &OrganizationRole{
@@ -112,6 +112,6 @@ func TestOrgRole(t *testing.T) {
 		require.Empty(t, grants)
 		// The token should contain the initial state for users
 		require.NotEmpty(t, nextToken)
-		test.AssertNoRatelimitAnnotations(t, grantsAnnotations)
+		test.AssertHasRatelimitAnnotations(t, grantsAnnotations)
 	})
 }

pkg/connector/org_test.go

@@ -39,7 +39,7 @@ func TestOrganization(t *testing.T) {
 
 		grants, nextToken, grantsAnnotations, err := client.Grants(ctx, organization, &pagination.Token{})
 		require.Nil(t, err)
-		test.AssertNoRatelimitAnnotations(t, grantsAnnotations)
+		test.AssertHasRatelimitAnnotations(t, grantsAnnotations)
 		require.Equal(t, "", nextToken)
 		require.Len(t, grants, 2)
 

pkg/connector/repository_test.go

@@ -53,7 +53,7 @@ func TestRepository(t *testing.T) {
 			grants = append(grants, nextGrants...)
 
 			require.Nil(t, err)
-			test.AssertNoRatelimitAnnotations(t, grantsAnnotations)
+			test.AssertHasRatelimitAnnotations(t, grantsAnnotations)
 			if nextToken == "" {
 				break
 			}

pkg/connector/team_test.go

@@ -41,7 +41,7 @@ func TestTeam(t *testing.T) {
 
 		grants, nextToken, grantsAnnotations, err := client.Grants(ctx, team, &pagination.Token{})
 		require.Nil(t, err)
-		test.AssertNoRatelimitAnnotations(t, grantsAnnotations)
+		test.AssertHasRatelimitAnnotations(t, grantsAnnotations)
 		require.Equal(t, "", nextToken)
 		require.Len(t, grants, 1)
 

pkg/connector/user_test.go

@@ -58,7 +58,7 @@ func TestUsersList(t *testing.T) {
 				&pagination.Token{},
 			)
 			require.Nil(t, err)
-			test.AssertNoRatelimitAnnotations(t, annotations)
+			test.AssertHasRatelimitAnnotations(t, annotations)
 			require.Equal(t, "", nextToken)
 			require.Len(t, users, 1)
 			require.Equal(t, *githubUser.Login, users[0].Id.Resource)

test/testhelpers.go

@@ -1,14 +1,13 @@
 package test
 
 import (
-	"slices"
 	"testing"
 
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
 	"github.com/conductorone/baton-sdk/pkg/annotations"
 )
 
-func AssertNoRatelimitAnnotations(
+func AssertHasRatelimitAnnotations(
 	t *testing.T,
 	actualAnnotations annotations.Annotations,
 ) {
@@ -22,13 +21,7 @@ func AssertNoRatelimitAnnotations(
 		if err != nil {
 			continue
 		}
-		if slices.Contains(
-			[]v2.RateLimitDescription_Status{
-				v2.RateLimitDescription_STATUS_ERROR,
-				v2.RateLimitDescription_STATUS_OVERLIMIT,
-			},
-			ratelimitDescription.Status,
-		) {
+		if ratelimitDescription.Status != v2.RateLimitDescription_STATUS_OVERLIMIT {
 			t.Fatal("request was ratelimited, expected not to be ratelimited")
 		}
 	}