@@ -94,7 +94,7 @@ func TestRotatedETagOn304UpdatesCacheOnly(t *testing.T) {
9494 t .Fatal (err )
9595 }
9696 p := NewProvider (ProviderOptions {RESTBase : ts .URL , GraphQLURL : ts .URL + "/graphql" , Token : StaticTokenSource ("token" )})
97- changed , _ , err := p .checkOpenPullListChanged (ctx , st , scope , "o" , "r" , time .Now ())
97+ changed , _ , _ , err := p .checkOpenPullListChanged (ctx , st , scope , "o" , "r" , time .Now ())
9898 if err != nil || changed {
9999 t .Fatalf ("changed=%v err=%v" , changed , err )
100100 }
@@ -321,6 +321,9 @@ func TestTruncatedGraphQLCIContextsFetchFullCheckRuns(t *testing.T) {
321321 })
322322 _ = json .NewEncoder (w ).Encode (map [string ]any {"data" : map [string ]any {"repository" : map [string ]any {"pr5" : payload }}})
323323 case r .Method == http .MethodGet && strings .Contains (r .URL .Path , "/check-runs" ):
324+ if got := r .URL .Query ().Get ("per_page" ); got != "100" {
325+ t .Fatalf ("check-runs per_page=%q" , got )
326+ }
324327 checkRunsCalls .Add (1 )
325328 _ , _ = w .Write ([]byte (`{"check_runs":[{"name":"late-failure","status":"completed","conclusion":"failure","html_url":"https://checks/late"}]}` ))
326329 case strings .Contains (r .URL .Path , "/comments" ):
@@ -356,6 +359,9 @@ func TestFailingCIWithoutFailedContextFetchesFullCheckRuns(t *testing.T) {
356359 })
357360 _ = json .NewEncoder (w ).Encode (map [string ]any {"data" : map [string ]any {"repository" : map [string ]any {"pr5" : payload }}})
358361 case r .Method == http .MethodGet && strings .Contains (r .URL .Path , "/check-runs" ):
362+ if got := r .URL .Query ().Get ("per_page" ); got != "100" {
363+ t .Fatalf ("check-runs per_page=%q" , got )
364+ }
359365 checkRunsCalls .Add (1 )
360366 _ , _ = w .Write ([]byte (`{"check_runs":[{"name":"hidden-failure","status":"completed","conclusion":"failure","html_url":"https://checks/hidden"}]}` ))
361367 case strings .Contains (r .URL .Path , "/comments" ):
@@ -444,6 +450,185 @@ func TestETagGuardsReuseLatestSnapshotAndSkipGraphQL(t *testing.T) {
444450 }
445451}
446452
453+ func TestPRListGuardETagIsNotAdvancedWhenGraphQLFails (t * testing.T ) {
454+ ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
455+ switch {
456+ case r .Method == http .MethodGet && r .URL .Path == "/repos/o/r/pulls" :
457+ if got := r .Header .Get ("If-None-Match" ); got != `"old"` {
458+ t .Fatalf ("If-None-Match=%q" , got )
459+ }
460+ w .Header ().Set ("ETag" , `"new"` )
461+ _ , _ = w .Write ([]byte (`[{"number":5}]` ))
462+ case r .Method == http .MethodPost && r .URL .Path == "/graphql" :
463+ w .WriteHeader (http .StatusInternalServerError )
464+ _ , _ = w .Write ([]byte (`{"message":"boom"}` ))
465+ default :
466+ t .Fatalf ("unexpected %s %s" , r .Method , r .URL .Path )
467+ }
468+ }))
469+ defer ts .Close ()
470+ ctx := context .Background ()
471+ st := store .NewMemoryStore ()
472+ subj := domain.SCMSubject {SessionID : "s1" , ProjectID : "p1" , Provider : domain .SCMProviderGitHub , Host : "github.com" , Repo : "o/r" , Branch : "feat/27" , PRNumber : 5 , CredentialHash : "cred" }
473+ snap := domain.SCMSnapshot {SessionID : "s1" , Subject : subj , Freshness : domain .SCMFreshnessFresh , PR : & domain.SCMPullRequest {Number : 5 , State : domain .PROpen , HeadSHA : "sha" }, CI : domain.SCMCI {Summary : "passing" }}
474+ if _ , _ , err := st .SaveSnapshot (ctx , snap ); err != nil {
475+ t .Fatal (err )
476+ }
477+ key := domain.SCMProviderCacheKey {SCMProviderCacheScope : subj .CacheScope (), Namespace : cachePRList , Key : "open-guard" }
478+ if err := st .PutProviderCache (ctx , domain.SCMProviderCacheEntry {Key : key , ETag : `"old"` , Value : []byte (`[{"number":5}]` )}); err != nil {
479+ t .Fatal (err )
480+ }
481+ p := NewProvider (ProviderOptions {RESTBase : ts .URL , GraphQLURL : ts .URL + "/graphql" , Token : StaticTokenSource ("token" )})
482+ if _ , err := p .ObserveSessions (ctx , observeReq (subj ), st ); err == nil {
483+ t .Fatal ("expected GraphQL error" )
484+ }
485+ got , ok , err := st .GetProviderCache (ctx , key )
486+ if err != nil || ! ok {
487+ t .Fatalf ("cache ok=%v err=%v" , ok , err )
488+ }
489+ if got .ETag != `"old"` {
490+ t .Fatalf ("etag advanced on failed GraphQL: %q" , got .ETag )
491+ }
492+ }
493+
494+ func TestReviewGuardETagIsNotAdvancedWhenReviewThreadsFail (t * testing.T ) {
495+ ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
496+ switch {
497+ case r .Method == http .MethodGet && r .URL .Path == "/repos/o/r/pulls" :
498+ w .Header ().Set ("ETag" , `"pulls"` )
499+ w .WriteHeader (http .StatusNotModified )
500+ case r .Method == http .MethodGet && strings .Contains (r .URL .Path , "/check-runs" ):
501+ w .Header ().Set ("ETag" , `"checks"` )
502+ w .WriteHeader (http .StatusNotModified )
503+ case r .Method == http .MethodGet && strings .Contains (r .URL .Path , "/comments" ):
504+ w .Header ().Set ("ETag" , `"reviews-new"` )
505+ _ , _ = w .Write ([]byte (`[{"id":1}]` ))
506+ case r .Method == http .MethodPost && r .URL .Path == "/graphql" :
507+ var req struct {
508+ Query string `json:"query"`
509+ }
510+ if err := json .NewDecoder (r .Body ).Decode (& req ); err != nil {
511+ t .Fatal (err )
512+ }
513+ if strings .Contains (req .Query , "reviewThreads" ) {
514+ w .WriteHeader (http .StatusInternalServerError )
515+ _ , _ = w .Write ([]byte (`{"message":"review down"}` ))
516+ return
517+ }
518+ writeGraphQLPR (t , w , 5 , "feat/27" , "SUCCESS" , "APPROVED" , nil )
519+ default :
520+ t .Fatalf ("unexpected %s %s" , r .Method , r .URL .Path )
521+ }
522+ }))
523+ defer ts .Close ()
524+ ctx := context .Background ()
525+ st := store .NewMemoryStore ()
526+ subj := domain.SCMSubject {SessionID : "s1" , ProjectID : "p1" , Provider : domain .SCMProviderGitHub , Host : "github.com" , Repo : "o/r" , Branch : "feat/27" , PRNumber : 5 , CredentialHash : "cred" }
527+ snap := domain.SCMSnapshot {SessionID : "s1" , Subject : subj , Freshness : domain .SCMFreshnessFresh , PR : & domain.SCMPullRequest {Number : 5 , State : domain .PROpen , HeadSHA : "sha" }, CI : domain.SCMCI {Summary : "passing" }, Review : domain.SCMReview {UnresolvedThreads : []domain.SCMReviewThread {{ID : "old" }}}}
528+ if _ , _ , err := st .SaveSnapshot (ctx , snap ); err != nil {
529+ t .Fatal (err )
530+ }
531+ for _ , entry := range []domain.SCMProviderCacheEntry {
532+ {Key : domain.SCMProviderCacheKey {SCMProviderCacheScope : subj .CacheScope (), Namespace : cachePRList , Key : "open-guard" }, ETag : `"pulls"` , Value : []byte (`[{"number":5}]` )},
533+ {Key : domain.SCMProviderCacheKey {SCMProviderCacheScope : subj .CacheScope (), Namespace : cacheCheckGuard , Key : "sha" }, ETag : `"checks"` },
534+ {Key : domain.SCMProviderCacheKey {SCMProviderCacheScope : subj .CacheScope (), Namespace : cacheReviews , Key : "5" }, ETag : `"reviews-old"` , Value : []byte (`[{"id":0}]` )},
535+ } {
536+ if err := st .PutProviderCache (ctx , entry ); err != nil {
537+ t .Fatal (err )
538+ }
539+ }
540+ p := NewProvider (ProviderOptions {RESTBase : ts .URL , GraphQLURL : ts .URL + "/graphql" , Token : StaticTokenSource ("token" )})
541+ res , err := p .ObserveSessions (ctx , observeReq (subj ), st )
542+ if err != nil {
543+ t .Fatal (err )
544+ }
545+ if len (res .Snapshots ) != 1 || len (res .Snapshots [0 ].Review .UnresolvedThreads ) != 1 || res .Snapshots [0 ].Review .UnresolvedThreads [0 ].ID != "old" {
546+ t .Fatalf ("expected previous review threads, got %+v" , res .Snapshots )
547+ }
548+ key := domain.SCMProviderCacheKey {SCMProviderCacheScope : subj .CacheScope (), Namespace : cacheReviews , Key : "5" }
549+ got , ok , err := st .GetProviderCache (ctx , key )
550+ if err != nil || ! ok {
551+ t .Fatalf ("cache ok=%v err=%v" , ok , err )
552+ }
553+ if got .ETag != `"reviews-old"` {
554+ t .Fatalf ("review etag advanced on failed reviewThreads: %q" , got .ETag )
555+ }
556+ }
557+
558+ func TestDiscoveryParseFailureDoesNotAdvanceCache (t * testing.T ) {
559+ ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
560+ if r .Method != http .MethodGet || r .URL .Path != "/repos/o/r/pulls" {
561+ t .Fatalf ("unexpected %s %s" , r .Method , r .URL .Path )
562+ }
563+ w .Header ().Set ("ETag" , `"new"` )
564+ _ , _ = w .Write ([]byte (`not-json` ))
565+ }))
566+ defer ts .Close ()
567+ ctx := context .Background ()
568+ st := store .NewMemoryStore ()
569+ scope := domain.SCMProviderCacheScope {Provider : domain .SCMProviderGitHub , Host : "github.com" , Repo : "o/r" , CredentialHash : "cred" }
570+ key := domain.SCMProviderCacheKey {SCMProviderCacheScope : scope , Namespace : cachePRList , Key : "open-discovery" }
571+ if err := st .PutProviderCache (ctx , domain.SCMProviderCacheEntry {Key : key , ETag : `"old"` , Value : []byte (`[]` )}); err != nil {
572+ t .Fatal (err )
573+ }
574+ p := NewProvider (ProviderOptions {RESTBase : ts .URL , GraphQLURL : ts .URL + "/graphql" , Token : StaticTokenSource ("token" )})
575+ subj := domain.SCMSubject {SessionID : "s1" , ProjectID : "p1" , Provider : domain .SCMProviderGitHub , Host : "github.com" , Repo : "o/r" , Branch : "feat/27" , CredentialHash : "cred" }
576+ if _ , err := p .ObserveSessions (ctx , observeReq (subj ), st ); err == nil {
577+ t .Fatal ("expected parse error" )
578+ }
579+ got , ok , err := st .GetProviderCache (ctx , key )
580+ if err != nil || ! ok {
581+ t .Fatalf ("cache ok=%v err=%v" , ok , err )
582+ }
583+ if got .ETag != `"old"` {
584+ t .Fatalf ("etag advanced on parse failure: %q" , got .ETag )
585+ }
586+ }
587+
588+ func TestPollStateConsecutiveFailuresIncrementAndReset (t * testing.T ) {
589+ var fail atomic.Bool
590+ fail .Store (true )
591+ ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
592+ switch {
593+ case r .Method == http .MethodPost && r .URL .Path == "/graphql" && fail .Load ():
594+ w .WriteHeader (http .StatusInternalServerError )
595+ _ , _ = w .Write ([]byte (`{"message":"down"}` ))
596+ return
597+ case r .Method == http .MethodPost && r .URL .Path == "/graphql" :
598+ writeGraphQLPR (t , w , 5 , "feat/27" , "SUCCESS" , "APPROVED" , nil )
599+ case r .Method == http .MethodGet && strings .Contains (r .URL .Path , "/comments" ):
600+ _ , _ = w .Write ([]byte (`[]` ))
601+ default :
602+ t .Fatalf ("unexpected %s %s" , r .Method , r .URL .Path )
603+ }
604+ }))
605+ defer ts .Close ()
606+ ctx := context .Background ()
607+ st := store .NewMemoryStore ()
608+ p := NewProvider (ProviderOptions {RESTBase : ts .URL , GraphQLURL : ts .URL + "/graphql" , Token : StaticTokenSource ("token" )})
609+ subj := domain.SCMSubject {SessionID : "s1" , ProjectID : "p1" , Provider : domain .SCMProviderGitHub , Host : "github.com" , Repo : "o/r" , Branch : "feat/27" , PRNumber : 5 }
610+ for want := 1 ; want <= 2 ; want ++ {
611+ res , err := p .ObserveSessions (ctx , observeReq (subj ), st )
612+ if err == nil {
613+ t .Fatal ("expected failure" )
614+ }
615+ if got := res .PollStates [0 ].ConsecutiveFail ; got != want {
616+ t .Fatalf ("failure count=%d want=%d" , got , want )
617+ }
618+ if err := st .PutPollState (ctx , res .PollStates [0 ]); err != nil {
619+ t .Fatal (err )
620+ }
621+ }
622+ fail .Store (false )
623+ res , err := p .ObserveSessions (ctx , observeReq (subj ), st )
624+ if err != nil {
625+ t .Fatal (err )
626+ }
627+ if got := res .PollStates [0 ].ConsecutiveFail ; got != 0 {
628+ t .Fatalf ("failure count after success=%d" , got )
629+ }
630+ }
631+
447632func TestGraphQLBatchIsCappedAtTwentyFivePRs (t * testing.T ) {
448633 var graphQLCalls atomic.Int32
449634 ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
0 commit comments