Skip to content

Commit b992455

Browse files
bmalehornbmalehorn
authored
Merge pull request #4 from opendoor-labs/bm/fix-telia-oss-26
Return all open PRs instead of filtering by date
2 parents f819803 + e7c80e8 commit b992455

File tree

3 files changed

+70
-19
lines changed

3 files changed

+70
-19
lines changed

‎check.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ Loop:
6969
}
7070
}
7171

72-
// Filter out commits that are too old.
73-
if !versionTime.After(request.Version.CommittedDate) {
74-
continue
75-
}
76-
7772
// Filter out pull request if it does not contain at least one of the desired labels
7873
if len(request.Source.Labels) > 0 {
7974
labelFound := false

‎check_test.go

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestCheck(t *testing.T) {
6464
},
6565

6666
{
67-
description: "check returns the previous version when its still latest",
67+
description: "check returns all open PRs if there is a previous",
6868
source: resource.Source{
6969
Repository: "itsdalmo/test-repository",
7070
AccessToken: "oauthtoken",
@@ -73,6 +73,17 @@ func TestCheck(t *testing.T) {
7373
pullRequests: testPullRequests,
7474
files: [][]string{},
7575
expected: resource.CheckResponse{
76+
resource.NewVersion(testPullRequests[14], testPullRequests[14].Tip.CommittedDate.Time),
77+
resource.NewVersion(testPullRequests[13], testPullRequests[13].Tip.CommittedDate.Time),
78+
resource.NewVersion(testPullRequests[12], testPullRequests[12].Tip.CommittedDate.Time),
79+
resource.NewVersion(testPullRequests[11], testPullRequests[11].Tip.CommittedDate.Time),
80+
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
81+
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
82+
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
83+
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
84+
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
85+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
86+
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
7687
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
7788
},
7889
},
@@ -87,6 +98,16 @@ func TestCheck(t *testing.T) {
8798
pullRequests: testPullRequests,
8899
files: [][]string{},
89100
expected: resource.CheckResponse{
101+
resource.NewVersion(testPullRequests[14], testPullRequests[14].Tip.CommittedDate.Time),
102+
resource.NewVersion(testPullRequests[13], testPullRequests[13].Tip.CommittedDate.Time),
103+
resource.NewVersion(testPullRequests[12], testPullRequests[12].Tip.CommittedDate.Time),
104+
resource.NewVersion(testPullRequests[11], testPullRequests[11].Tip.CommittedDate.Time),
105+
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
106+
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
107+
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
108+
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
109+
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
110+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
90111
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
91112
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
92113
},
@@ -107,6 +128,7 @@ func TestCheck(t *testing.T) {
107128
{"terraform/modules/variables.tf", "travis.yml"},
108129
},
109130
expected: resource.CheckResponse{
131+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
110132
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
111133
},
112134
},
@@ -126,6 +148,7 @@ func TestCheck(t *testing.T) {
126148
{"terraform/modules/variables.tf", "travis.yml"},
127149
},
128150
expected: resource.CheckResponse{
151+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
129152
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
130153
},
131154
},
@@ -140,6 +163,18 @@ func TestCheck(t *testing.T) {
140163
version: resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
141164
pullRequests: testPullRequests,
142165
expected: resource.CheckResponse{
166+
resource.NewVersion(testPullRequests[14], testPullRequests[14].Tip.CommittedDate.Time),
167+
resource.NewVersion(testPullRequests[13], testPullRequests[13].Tip.CommittedDate.Time),
168+
resource.NewVersion(testPullRequests[12], testPullRequests[12].Tip.CommittedDate.Time),
169+
resource.NewVersion(testPullRequests[11], testPullRequests[11].Tip.CommittedDate.Time),
170+
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
171+
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
172+
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
173+
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
174+
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
175+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
176+
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
177+
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
143178
resource.NewVersion(testPullRequests[0], testPullRequests[0].Tip.CommittedDate.Time),
144179
},
145180
},
@@ -154,6 +189,16 @@ func TestCheck(t *testing.T) {
154189
version: resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
155190
pullRequests: testPullRequests,
156191
expected: resource.CheckResponse{
192+
resource.NewVersion(testPullRequests[14], testPullRequests[14].Tip.CommittedDate.Time),
193+
resource.NewVersion(testPullRequests[13], testPullRequests[13].Tip.CommittedDate.Time),
194+
resource.NewVersion(testPullRequests[12], testPullRequests[12].Tip.CommittedDate.Time),
195+
resource.NewVersion(testPullRequests[11], testPullRequests[11].Tip.CommittedDate.Time),
196+
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
197+
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
198+
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
199+
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
200+
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
201+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
157202
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
158203
},
159204
},
@@ -168,6 +213,16 @@ func TestCheck(t *testing.T) {
168213
version: resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
169214
pullRequests: testPullRequests,
170215
expected: resource.CheckResponse{
216+
resource.NewVersion(testPullRequests[14], testPullRequests[14].Tip.CommittedDate.Time),
217+
resource.NewVersion(testPullRequests[13], testPullRequests[13].Tip.CommittedDate.Time),
218+
resource.NewVersion(testPullRequests[12], testPullRequests[12].Tip.CommittedDate.Time),
219+
resource.NewVersion(testPullRequests[11], testPullRequests[11].Tip.CommittedDate.Time),
220+
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
221+
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
222+
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
223+
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
224+
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
225+
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
171226
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
172227
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
173228
},
@@ -183,6 +238,14 @@ func TestCheck(t *testing.T) {
183238
version: resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
184239
pullRequests: testPullRequests,
185240
expected: resource.CheckResponse{
241+
resource.NewVersion(testPullRequests[14], testPullRequests[14].Tip.CommittedDate.Time),
242+
resource.NewVersion(testPullRequests[13], testPullRequests[13].Tip.CommittedDate.Time),
243+
resource.NewVersion(testPullRequests[12], testPullRequests[12].Tip.CommittedDate.Time),
244+
resource.NewVersion(testPullRequests[11], testPullRequests[11].Tip.CommittedDate.Time),
245+
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
246+
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
247+
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
248+
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
186249
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
187250
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
188251
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),

‎e2e/e2e_test.go

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ import (
2424
)
2525

2626
var (
27+
firstCommitID = "23dc9f552bf989d1a4aeb65ce23351dee0ec9019"
28+
firstPullRequestID = "3"
29+
firstDateTime = time.Date(2018, time.May, 11, 7, 28, 56, 0, time.UTC)
2730
targetCommitID = "a5114f6ab89f4b736655642a11e8d15ce363d882"
2831
targetPullRequestID = "4"
2932
targetDateTime = time.Date(2018, time.May, 11, 8, 43, 48, 0, time.UTC)
@@ -55,25 +58,15 @@ func TestCheckE2E(t *testing.T) {
5558
},
5659

5760
{
58-
description: "check returns the previous version when its still latest",
61+
description: "check returns all open PRs if there is a previous version",
5962
source: resource.Source{
6063
Repository: "itsdalmo/test-repository",
6164
AccessToken: os.Getenv("GITHUB_ACCESS_TOKEN"),
6265
},
6366
version: resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
6467
expected: resource.CheckResponse{
65-
resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
66-
},
67-
},
68-
69-
{
70-
description: "check returns all new versions since the last",
71-
source: resource.Source{
72-
Repository: "itsdalmo/test-repository",
73-
AccessToken: os.Getenv("GITHUB_ACCESS_TOKEN"),
74-
},
75-
version: resource.Version{PR: targetPullRequestID, Commit: targetCommitID, CommittedDate: targetDateTime},
76-
expected: resource.CheckResponse{
68+
resource.Version{PR: firstPullRequestID, Commit: firstCommitID, CommittedDate: firstDateTime},
69+
resource.Version{PR: targetPullRequestID, Commit: targetCommitID, CommittedDate: targetDateTime},
7770
resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
7871
},
7972
},

0 commit comments

Comments
 (0)