Skip to content

Commit 6711c9a

Browse files
committed
convert version to utilize issue state model
1 parent d67d769 commit 6711c9a

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

src/concourse.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ use concourse_resource::IntoMetadataKV;
99
// check input and (vec seralized to list) output, out output
1010
#[derive(Eq, PartialEq, Serialize, Deserialize, Debug)]
1111
pub(super) struct Version {
12-
state: String,
12+
state: octocrab::models::IssueState,
1313
}
1414

1515
impl Version {
1616
/// Constructor
1717
/// ```
18-
/// let version = Version::new(String::from("open"));
18+
/// let version = Version::new(octocrab::models::IssueState::Closed);
1919
/// ```
20-
pub(super) fn new(state: String) -> Self {
20+
pub(super) fn new(state: octocrab::models::IssueState) -> Self {
2121
Version { state }
2222
}
2323
}
@@ -188,9 +188,9 @@ mod tests {
188188
#[test]
189189
fn test_version_new() {
190190
assert_eq!(
191-
Version::new(String::from("open")),
191+
Version::new(octocrab::models::IssueState::Open),
192192
Version {
193-
state: String::from("open")
193+
state: octocrab::models::IssueState::Open
194194
},
195195
"version could not be constructed with the correct issue state",
196196
);
@@ -202,7 +202,7 @@ mod tests {
202202
assert_eq!(
203203
version,
204204
Version {
205-
state: String::from("closed")
205+
state: octocrab::models::IssueState::Closed
206206
},
207207
"version did not contain the expected member values",
208208
)

src/main.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ impl concourse_resource::Resource for GithubIssue {
3535
"the check step will be skipped because 'skip_check' was set to true in source"
3636
);
3737
return vec![
38-
concourse::Version::new(String::from("open")),
39-
concourse::Version::new(String::from("closed")),
38+
concourse::Version::new(octocrab::models::IssueState::Open),
39+
concourse::Version::new(octocrab::models::IssueState::Closed),
4040
];
4141
}
4242

@@ -74,11 +74,11 @@ impl concourse_resource::Resource for GithubIssue {
7474
// return two sized version vector if issue state matches trigger, and one sized if otherwise
7575
if issue.state == source.trigger() {
7676
vec![
77-
concourse::Version::new(String::from("open")),
78-
concourse::Version::new(String::from("closed")),
77+
concourse::Version::new(octocrab::models::IssueState::Open),
78+
concourse::Version::new(octocrab::models::IssueState::Closed),
7979
]
8080
} else {
81-
vec![concourse::Version::new(String::from("open"))]
81+
vec![concourse::Version::new(octocrab::models::IssueState::Open)]
8282
}
8383
}
8484

@@ -103,7 +103,7 @@ impl concourse_resource::Resource for GithubIssue {
103103
"there is no actual functionality for the in step, and the version and metadata are dummied"
104104
);
105105
Ok(concourse_resource::InOutput {
106-
version: concourse::Version::new(String::from("open")),
106+
version: concourse::Version::new(octocrab::models::IssueState::Open),
107107
metadata: None,
108108
})
109109
}
@@ -167,7 +167,7 @@ impl concourse_resource::Resource for GithubIssue {
167167

168168
// return out step output
169169
concourse_resource::OutOutput {
170-
version: concourse::Version::new(String::from("open")),
170+
version: concourse::Version::new(octocrab::models::IssueState::Open),
171171
metadata: Some(concourse::OutMetadata::new(
172172
issue.number,
173173
issue.url,
@@ -221,8 +221,8 @@ mod tests {
221221
assert_eq!(
222222
version_vec,
223223
vec![
224-
concourse::Version::new(String::from("open")),
225-
concourse::Version::new(String::from("closed"))
224+
concourse::Version::new(octocrab::models::IssueState::Open),
225+
concourse::Version::new(octocrab::models::IssueState::Closed)
226226
],
227227
"the resource_check did not return a two size vector of issue states for a closed issue",
228228
);
@@ -259,7 +259,7 @@ mod tests {
259259
// the issue is closed and trigger is open so we expect a size one vec
260260
assert_eq!(
261261
version_vec,
262-
vec![concourse::Version::new(String::from("open"))],
262+
vec![concourse::Version::new(octocrab::models::IssueState::Open)],
263263
"the resource_check did not return a one size vector of issue states for an issue with differing trigger and state",
264264
);
265265
}
@@ -293,8 +293,8 @@ mod tests {
293293
assert_eq!(
294294
version_vec,
295295
vec![
296-
concourse::Version::new(String::from("open")),
297-
concourse::Version::new(String::from("closed"))
296+
concourse::Version::new(octocrab::models::IssueState::Open),
297+
concourse::Version::new(octocrab::models::IssueState::Closed)
298298
],
299299
"the resource_check did not return a two size vector of issue states for a requested check skip",
300300
);
@@ -304,14 +304,14 @@ mod tests {
304304
fn test_resource_in() {
305305
let in_output = GithubIssue::resource_in(
306306
None,
307-
concourse::Version::new(String::from("open")),
307+
concourse::Version::new(octocrab::models::IssueState::Open),
308308
None,
309309
"",
310310
)
311311
.unwrap();
312312
assert_eq!(
313313
in_output.version,
314-
concourse::Version::new(String::from("open")),
314+
concourse::Version::new(octocrab::models::IssueState::Open),
315315
"the resource in did not dummy the expected return version output",
316316
);
317317
}

0 commit comments

Comments
 (0)