Compare commits
7 Commits
work-repor
...
main
Author | SHA1 | Date | |
---|---|---|---|
7c1cdb64ec | |||
4bb787488d | |||
ab0df54893 | |||
7b6cc33ecb | |||
696fd15cfa | |||
957c5b91bc | |||
1d8a70768f |
@ -1,4 +0,0 @@
|
|||||||
kind: Added
|
|
||||||
body: Add an option `--assign-to-me` to automatically assign the openproject's user
|
|
||||||
to the newly created work package
|
|
||||||
time: 2024-03-17T21:35:42.724855046+01:00
|
|
@ -1,3 +0,0 @@
|
|||||||
kind: Added
|
|
||||||
body: Allow to configure multiple gitlab instances
|
|
||||||
time: 2024-03-17T21:35:56.447907065+01:00
|
|
5
.changes/v0.2.0.md
Normal file
5
.changes/v0.2.0.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
## v0.2.0 - 2024-11-14
|
||||||
|
### Added
|
||||||
|
* Add an option `--assign-to-me` to automatically assign the openproject's user to the newly created work package
|
||||||
|
* Allow to configure multiple gitlab instances
|
||||||
|
* Create work pakcage from gitea
|
@ -6,6 +6,12 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
|||||||
and is generated by [Changie](https://github.com/miniscruff/changie).
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
|
## v0.2.0 - 2024-11-14
|
||||||
|
### Added
|
||||||
|
* Add an option `--assign-to-me` to automatically assign the openproject's user to the newly created work package
|
||||||
|
* Allow to configure multiple gitlab instances
|
||||||
|
* Create work pakcage from gitea
|
||||||
|
|
||||||
## v0.1.0 - 2024-01-08
|
## v0.1.0 - 2024-01-08
|
||||||
### Added
|
### Added
|
||||||
* Initiate changie versioning
|
* Initiate changie versioning
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
[gitlab]
|
[[gitlab]]
|
||||||
# generate from https://gitlab.com/-/user_settings/personal_access_tokens
|
# generate from https://gitlab.com/-/user_settings/personal_access_tokens
|
||||||
token = "glpat-example"
|
token = "glpat-example"
|
||||||
|
domain = "gitlab.com"
|
||||||
|
|
||||||
|
[[gitea]]
|
||||||
|
token = "abcdexempletoken"
|
||||||
|
domain = "gitea.champs-libres.be"
|
||||||
|
|
||||||
[openproject]
|
[openproject]
|
||||||
# generate api token from https://champs-libres.openproject.com/my/access_token
|
# generate api token from https://champs-libres.openproject.com/my/access_token
|
||||||
|
@ -3,6 +3,7 @@ use serde::Deserialize;
|
|||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub(crate) struct Config {
|
pub(crate) struct Config {
|
||||||
pub gitlab: Vec<GitlabConfig>,
|
pub gitlab: Vec<GitlabConfig>,
|
||||||
|
pub gitea: Vec<GiteaConfig>,
|
||||||
pub openproject: OpenProjectConfig,
|
pub openproject: OpenProjectConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12,6 +13,12 @@ pub(crate) struct GitlabConfig {
|
|||||||
pub domain: String,
|
pub domain: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug)]
|
||||||
|
pub(crate) struct GiteaConfig {
|
||||||
|
pub token: String,
|
||||||
|
pub domain: String,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub(crate) struct OpenProjectConfig {
|
pub(crate) struct OpenProjectConfig {
|
||||||
pub token: String,
|
pub token: String,
|
||||||
|
20
src/debug.rs
20
src/debug.rs
@ -1,12 +1,24 @@
|
|||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use crate::openproject::client::Client;
|
use crate::gitea::issue::Issue;
|
||||||
use crate::openproject::root::RootClient;
|
use url::Url;
|
||||||
use crate::openproject::user::GetMe;
|
|
||||||
|
|
||||||
pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
|
pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
|
||||||
println!("test");
|
println!("test");
|
||||||
|
|
||||||
|
let gitea_client = crate::gitea::client::Client::from_config(config.gitea.first().unwrap());
|
||||||
|
let issue: Issue = gitea_client
|
||||||
|
.get(
|
||||||
|
Url::parse("https://gitea.champs-libres.be/api/v1/repos/julienfastre/test/issues/6")
|
||||||
|
.unwrap(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
println!("issue: {:?}", issue);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
|
||||||
|
/*
|
||||||
let open_project_client = Client::from_config(&config.openproject);
|
let open_project_client = Client::from_config(&config.openproject);
|
||||||
println!("base_url: {}", open_project_client.base_url);
|
println!("base_url: {}", open_project_client.base_url);
|
||||||
println!("base_url: will get root");
|
println!("base_url: will get root");
|
||||||
@ -16,4 +28,6 @@ pub(crate) async fn debug(config: Config) -> Result<(), GeneralError> {
|
|||||||
println!("me: {:?}", u);
|
println!("me: {:?}", u);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
19
src/error.rs
19
src/error.rs
@ -1,4 +1,23 @@
|
|||||||
|
use reqwest::header::InvalidHeaderValue;
|
||||||
|
use reqwest::Error;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct GeneralError {
|
pub struct GeneralError {
|
||||||
pub(crate) description: String,
|
pub(crate) description: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<InvalidHeaderValue> for GeneralError {
|
||||||
|
fn from(value: InvalidHeaderValue) -> Self {
|
||||||
|
GeneralError {
|
||||||
|
description: "Unable to convert the token into header value".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<reqwest::Error> for GeneralError {
|
||||||
|
fn from(value: Error) -> Self {
|
||||||
|
GeneralError {
|
||||||
|
description: format!("Unable to perform a request: {}", value.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
58
src/gitea/action.rs
Normal file
58
src/gitea/action.rs
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
use crate::cli::Issue2Work;
|
||||||
|
use crate::config::Config;
|
||||||
|
use crate::error::GeneralError;
|
||||||
|
use crate::gitea::client::has_client_for_url;
|
||||||
|
use crate::gitea::issue::{issue_html_url_to_api, Issue};
|
||||||
|
use crate::openproject::user::{GetMe, User};
|
||||||
|
use crate::openproject::work::WorkPackageWriter;
|
||||||
|
use crate::planning::Issue2WorkActionTrait;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
pub(crate) struct GiteaAction {}
|
||||||
|
|
||||||
|
impl Issue2WorkActionTrait for GiteaAction {
|
||||||
|
async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError> {
|
||||||
|
let gitea_client = crate::gitea::client::Client::from_config(config.gitea.first().unwrap());
|
||||||
|
let issue: Issue = gitea_client.get(issue_html_url_to_api(url)?).await?;
|
||||||
|
let open_project_client =
|
||||||
|
crate::openproject::client::Client::from_config(&config.openproject);
|
||||||
|
|
||||||
|
let work_package = create_work_package_from_issue(
|
||||||
|
&issue,
|
||||||
|
match args.assign_to_me {
|
||||||
|
true => {
|
||||||
|
let u = open_project_client.me().await?;
|
||||||
|
Some(u)
|
||||||
|
}
|
||||||
|
false => None,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
let work_package = open_project_client
|
||||||
|
.create_work_package(&work_package, &args.project_id)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
println!(
|
||||||
|
"new work package created: {:?}, edit at {}/projects/{}/work_packages/{}",
|
||||||
|
work_package.subject, config.openproject.base_url, args.project_id, work_package.id
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn supports(&self, url: &Url, config: &Config, _args: &Issue2Work) -> bool {
|
||||||
|
has_client_for_url(&url, &config)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create_work_package_from_issue(issue: &Issue, assignee: Option<User>) -> WorkPackageWriter {
|
||||||
|
WorkPackageWriter {
|
||||||
|
subject: format!("{} ({}/{})", issue.title, issue.repository.full_name, issue.number),
|
||||||
|
work_type: "TASK".into(),
|
||||||
|
description: crate::openproject::work::DescriptionWriter {
|
||||||
|
format: "markdown".into(),
|
||||||
|
raw: format!("From Gitea issue: {} \n\n{}", issue.html_url, issue.body),
|
||||||
|
},
|
||||||
|
assignee: assignee.into(),
|
||||||
|
}
|
||||||
|
}
|
110
src/gitea/client.rs
Normal file
110
src/gitea/client.rs
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
use crate::config::{Config, GiteaConfig};
|
||||||
|
use crate::error::GeneralError;
|
||||||
|
use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
|
||||||
|
use reqwest::{ClientBuilder, StatusCode};
|
||||||
|
use serde::de::DeserializeOwned;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Client {
|
||||||
|
token: String,
|
||||||
|
base_uri: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_client_for_url(url: &Url, config: &GiteaConfig) -> bool {
|
||||||
|
if url.domain() == Some(config.domain.as_str()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn has_client_for_url(url: &Url, config: &Config) -> bool {
|
||||||
|
for c in &config.gitea {
|
||||||
|
if is_client_for_url(url, c) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
fn client_for_url(url: &Url, config: &Config) -> Result<Client, GeneralError> {
|
||||||
|
for c in &config.gitea {
|
||||||
|
if is_client_for_url(url, c) {
|
||||||
|
return Ok(Client::from_config(&c));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(GeneralError {
|
||||||
|
description: format!("No gitea client found for url {}", url),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Client {
|
||||||
|
pub fn from_config(config: &GiteaConfig) -> Self {
|
||||||
|
Self::new(&config.token, &config.domain)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn new(token: &String, domain: &String) -> Self {
|
||||||
|
Client {
|
||||||
|
token: token.clone(),
|
||||||
|
base_uri: format!("https://{}", domain.clone()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get<T: DeserializeOwned>(&self, url: Url) -> Result<T, GeneralError> {
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.append(AUTHORIZATION, format!("token {}", self.token).parse()?);
|
||||||
|
headers.append(ACCEPT, "application/json".parse()?);
|
||||||
|
|
||||||
|
let client = ClientBuilder::new()
|
||||||
|
.default_headers(headers)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let response = client.get(url.clone()).send().await?;
|
||||||
|
|
||||||
|
match response.status() {
|
||||||
|
StatusCode::OK => {
|
||||||
|
let result: T = response.json().await?;
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
_ => Err(GeneralError {
|
||||||
|
description: format!(
|
||||||
|
"Could not call GET on {:?}, error code {}",
|
||||||
|
url,
|
||||||
|
response.status()
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_is_client_for_url() {
|
||||||
|
let config = GiteaConfig {
|
||||||
|
domain: "gitea.champs-libres.be".into(),
|
||||||
|
token: "<PASSWORD>".into(),
|
||||||
|
};
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
is_client_for_url(
|
||||||
|
&Url::parse("https://gitea.champs-libres.be/something/somewhere").unwrap(),
|
||||||
|
&config
|
||||||
|
),
|
||||||
|
true
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
is_client_for_url(
|
||||||
|
&Url::parse("https://somewhere.else/something/somewhere").unwrap(),
|
||||||
|
&config
|
||||||
|
),
|
||||||
|
false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
70
src/gitea/issue.rs
Normal file
70
src/gitea/issue.rs
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
use crate::error::GeneralError;
|
||||||
|
use crate::gitea::client::Client;
|
||||||
|
use crate::gitea::repository::Repository;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct Issue {
|
||||||
|
pub id: u64,
|
||||||
|
pub number: u64,
|
||||||
|
pub title: String,
|
||||||
|
pub body: String,
|
||||||
|
pub repository: Repository,
|
||||||
|
pub html_url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait IssueClient {
|
||||||
|
fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IssueClient for Client {
|
||||||
|
fn get_issue(_owner_or_organisation: &String, _repo: &String, number: &u64) -> Option<Issue> {
|
||||||
|
todo!()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn issue_html_url_to_api(url: &Url) -> Result<Url, GeneralError> {
|
||||||
|
let mut parts = url.path_segments().unwrap();
|
||||||
|
let domain = parts.next().unwrap();
|
||||||
|
let repo = parts.next().unwrap();
|
||||||
|
let issue = parts.next().unwrap();
|
||||||
|
let iid = parts.next().unwrap();
|
||||||
|
|
||||||
|
if !issue.eq("issues") {
|
||||||
|
return Err(GeneralError {
|
||||||
|
description: format!("Issue url is not valid: {}", url),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let url = Url::parse(
|
||||||
|
format!(
|
||||||
|
"{}://{}/api/v1/repos/{}/{}/issues/{}",
|
||||||
|
url.scheme(),
|
||||||
|
url.host().unwrap(),
|
||||||
|
domain,
|
||||||
|
repo,
|
||||||
|
iid
|
||||||
|
)
|
||||||
|
.as_str(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
Ok(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_issue_html_url_to_api() {
|
||||||
|
let url = Url::parse("https://gitea.champs-libres.be/champs-libres/test/issues/1").unwrap();
|
||||||
|
let result = issue_html_url_to_api(&url).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
result.as_str(),
|
||||||
|
"https://gitea.champs-libres.be/api/v1/repos/champs-libres/test/issues/1"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
4
src/gitea/mod.rs
Normal file
4
src/gitea/mod.rs
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
pub(crate) mod action;
|
||||||
|
pub mod client;
|
||||||
|
pub mod issue;
|
||||||
|
pub mod repository;
|
9
src/gitea/repository.rs
Normal file
9
src/gitea/repository.rs
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct Repository {
|
||||||
|
id: u64,
|
||||||
|
name: String,
|
||||||
|
owner: String,
|
||||||
|
pub full_name: String,
|
||||||
|
}
|
139
src/gitlab/action.rs
Normal file
139
src/gitlab/action.rs
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
use crate::cli::Issue2Work;
|
||||||
|
use crate::config::Config;
|
||||||
|
use crate::error::GeneralError;
|
||||||
|
use crate::gitlab::client::{client_for_url, has_client_for_url};
|
||||||
|
use crate::gitlab::issue::IssueBundle;
|
||||||
|
use crate::openproject::client::Client;
|
||||||
|
use crate::openproject::user::{GetMe, User};
|
||||||
|
use crate::openproject::work::WorkPackageWriterAssignee;
|
||||||
|
use crate::planning::Issue2WorkActionTrait;
|
||||||
|
use gitlab::api::{issues, projects, AsyncQuery};
|
||||||
|
use gitlab::{Issue, Project};
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct IssueInfo {
|
||||||
|
project: String,
|
||||||
|
iid: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// details on how to create a work package from various informations
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct Issue2WorkPackageDTO {
|
||||||
|
pub issue: IssueBundle,
|
||||||
|
pub assign_to: Option<User>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) struct GitlabAction {}
|
||||||
|
|
||||||
|
impl Issue2WorkActionTrait for GitlabAction {
|
||||||
|
async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError> {
|
||||||
|
let client = client_for_url(&url, &config).await?;
|
||||||
|
let data = extract_issue_info(&url).unwrap();
|
||||||
|
|
||||||
|
let endpoint = issues::ProjectIssues::builder()
|
||||||
|
.iid(data.iid)
|
||||||
|
.project(String::from(data.project))
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let issues: Vec<Issue> = endpoint.query_async(&client).await.unwrap();
|
||||||
|
let issue = issues.first().unwrap();
|
||||||
|
|
||||||
|
let project_endpoint = projects::Project::builder()
|
||||||
|
.project(issue.project_id.value())
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let project: Project = project_endpoint.query_async(&client).await.unwrap();
|
||||||
|
|
||||||
|
let issue_bundle = IssueBundle::new(&issue, &project);
|
||||||
|
|
||||||
|
let open_project_client = Client::from_config(&config.openproject);
|
||||||
|
|
||||||
|
let dto = Issue2WorkPackageDTO {
|
||||||
|
issue: issue_bundle,
|
||||||
|
assign_to: match args.assign_to_me {
|
||||||
|
true => {
|
||||||
|
let u = open_project_client.me().await?;
|
||||||
|
Some(u)
|
||||||
|
}
|
||||||
|
false => None,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
let work_package = open_project_client
|
||||||
|
.create_work_package(&(&dto).into(), &args.project_id)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
println!(
|
||||||
|
"new work package created: {:?}, edit at {}/projects/{}/work_packages/{}",
|
||||||
|
work_package.subject, config.openproject.base_url, args.project_id, work_package.id
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn supports(&self, url: &Url, config: &Config, _args: &Issue2Work) -> bool {
|
||||||
|
has_client_for_url(&url, &config)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_issue_info(url: &Url) -> Option<IssueInfo> {
|
||||||
|
let parts = url
|
||||||
|
.path_segments()
|
||||||
|
.expect("Could not parse path segment of given url");
|
||||||
|
let mut project_url: Vec<String> = Vec::with_capacity(3);
|
||||||
|
let mut iid: Option<String> = None;
|
||||||
|
|
||||||
|
let mut project_found = false;
|
||||||
|
|
||||||
|
for el in parts {
|
||||||
|
if el == "-" {
|
||||||
|
project_found = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if el == "issues" {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if !project_found {
|
||||||
|
project_url.push(String::from(el));
|
||||||
|
} else {
|
||||||
|
// must be the id
|
||||||
|
iid = Some(String::from(el));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(IssueInfo {
|
||||||
|
project: project_url.join("/"),
|
||||||
|
iid: iid
|
||||||
|
.expect("iid of the issue not found")
|
||||||
|
.parse()
|
||||||
|
.expect("could not transform issue id to u64"),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<&Issue2WorkPackageDTO> for crate::openproject::work::WorkPackageWriter {
|
||||||
|
fn from(value: &Issue2WorkPackageDTO) -> Self {
|
||||||
|
crate::openproject::work::WorkPackageWriter {
|
||||||
|
subject: format!(
|
||||||
|
"{} ({}/{})",
|
||||||
|
value.issue.issue.title,
|
||||||
|
value.issue.project.name_with_namespace,
|
||||||
|
value.issue.issue.iid
|
||||||
|
),
|
||||||
|
work_type: "TASK".into(),
|
||||||
|
description: crate::openproject::work::DescriptionWriter {
|
||||||
|
format: "markdown".into(),
|
||||||
|
raw: format!("From gitlab: {}", value.issue.issue.web_url),
|
||||||
|
},
|
||||||
|
assignee: WorkPackageWriterAssignee {
|
||||||
|
href: match &value.assign_to {
|
||||||
|
None => None,
|
||||||
|
Some(w) => Some(w.clone().d_links.d_self.href),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,35 +1,48 @@
|
|||||||
use crate::config::Config;
|
use crate::config::{Config, GitlabConfig};
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use gitlab::AsyncGitlab;
|
use gitlab::{AsyncGitlab, GitlabBuilder};
|
||||||
use gitlab::GitlabBuilder;
|
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
pub trait ClientProviderTrait {
|
|
||||||
async fn client_for_url(url: &Url, config: &Config) -> Result<AsyncGitlab, GeneralError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct ClientProvider {}
|
pub struct ClientProvider {}
|
||||||
|
|
||||||
impl ClientProviderTrait for ClientProvider {
|
impl ClientProvider {}
|
||||||
async fn client_for_url(url: &Url, config: &Config) -> Result<AsyncGitlab, GeneralError> {
|
|
||||||
for c in &config.gitlab {
|
|
||||||
if url.domain() == Some(c.domain.as_str()) {
|
|
||||||
let client = GitlabBuilder::new("gitlab.com", c.token.clone())
|
|
||||||
.build_async()
|
|
||||||
.await;
|
|
||||||
|
|
||||||
return match client {
|
fn is_client_for_url(url: &Url, config: &GitlabConfig) -> bool {
|
||||||
Ok(new_client) => Ok(new_client),
|
if url.domain() == Some(config.domain.as_str()) {
|
||||||
Err(e) => {
|
return true;
|
||||||
let new_error = e.into();
|
|
||||||
Err(new_error)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Err(GeneralError {
|
|
||||||
description: format!("No client available for this domain: {:?}", url.domain()),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn client_for_url(url: &Url, config: &Config) -> Result<AsyncGitlab, GeneralError> {
|
||||||
|
for c in &config.gitlab {
|
||||||
|
if is_client_for_url(url, c) {
|
||||||
|
let client = GitlabBuilder::new("gitlab.com", c.token.clone())
|
||||||
|
.build_async()
|
||||||
|
.await;
|
||||||
|
|
||||||
|
return match client {
|
||||||
|
Ok(new_client) => Ok(new_client),
|
||||||
|
Err(e) => {
|
||||||
|
let new_error = e.into();
|
||||||
|
Err(new_error)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(GeneralError {
|
||||||
|
description: format!("No client available for this domain: {:?}", url.domain()),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn has_client_for_url(url: &Url, config: &Config) -> bool {
|
||||||
|
for c in &config.gitlab {
|
||||||
|
if is_client_for_url(url, c) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
false
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
pub mod action;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
pub mod issue;
|
pub mod issue;
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ mod cli;
|
|||||||
mod config;
|
mod config;
|
||||||
mod debug;
|
mod debug;
|
||||||
mod error;
|
mod error;
|
||||||
|
mod gitea;
|
||||||
mod gitlab;
|
mod gitlab;
|
||||||
mod openproject;
|
mod openproject;
|
||||||
mod planning;
|
mod planning;
|
||||||
|
@ -11,8 +11,11 @@ pub struct UserLink {
|
|||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
#[serde(rename = "_type")]
|
#[serde(rename = "_type")]
|
||||||
|
#[allow(unused_variables)]
|
||||||
pub d_type: String,
|
pub d_type: String,
|
||||||
|
#[allow(unused_variables)]
|
||||||
pub id: u64,
|
pub id: u64,
|
||||||
|
#[allow(unused_variables)]
|
||||||
pub name: String,
|
pub name: String,
|
||||||
#[serde(rename = "_links")]
|
#[serde(rename = "_links")]
|
||||||
pub d_links: UserLink,
|
pub d_links: UserLink,
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
use crate::openproject::user::User;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Serialize, Debug)]
|
#[derive(Serialize, Debug)]
|
||||||
@ -24,3 +25,14 @@ pub struct WorkPackage {
|
|||||||
pub id: u64,
|
pub id: u64,
|
||||||
pub subject: String,
|
pub subject: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<Option<User>> for WorkPackageWriterAssignee {
|
||||||
|
fn from(value: Option<User>) -> Self {
|
||||||
|
WorkPackageWriterAssignee {
|
||||||
|
href: match value {
|
||||||
|
None => None,
|
||||||
|
Some(w) => Some(w.clone().d_links.d_self.href),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,132 +1,30 @@
|
|||||||
use crate::cli::Issue2Work;
|
use crate::cli::Issue2Work;
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use crate::gitlab::client::{ClientProvider, ClientProviderTrait};
|
use crate::gitea::action::GiteaAction;
|
||||||
use crate::gitlab::issue::IssueBundle;
|
use crate::gitlab::action::GitlabAction;
|
||||||
use crate::openproject::client::Client;
|
use crate::planning::Issue2WorkActionTrait;
|
||||||
use crate::openproject::user::{GetMe, User};
|
|
||||||
use crate::openproject::work::WorkPackageWriterAssignee;
|
|
||||||
use gitlab::api::{issues, projects, AsyncQuery};
|
|
||||||
use gitlab::{Issue, Project};
|
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
#[derive(Debug)]
|
struct App {
|
||||||
struct IssueInfo {
|
gitlab_issue2work_action: GitlabAction,
|
||||||
project: String,
|
gitea_issue2work_action: GiteaAction,
|
||||||
iid: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// details on how to create a work package from various informations
|
|
||||||
#[derive(Debug)]
|
|
||||||
struct Issue2WorkPackageDTO {
|
|
||||||
pub issue: IssueBundle,
|
|
||||||
pub assign_to: Option<User>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<&Issue2WorkPackageDTO> for crate::openproject::work::WorkPackageWriter {
|
|
||||||
fn from(value: &Issue2WorkPackageDTO) -> Self {
|
|
||||||
crate::openproject::work::WorkPackageWriter {
|
|
||||||
subject: format!(
|
|
||||||
"{} ({}/{})",
|
|
||||||
value.issue.issue.title,
|
|
||||||
value.issue.project.name_with_namespace,
|
|
||||||
value.issue.issue.iid
|
|
||||||
),
|
|
||||||
work_type: "TASK".into(),
|
|
||||||
description: crate::openproject::work::DescriptionWriter {
|
|
||||||
format: "markdown".into(),
|
|
||||||
raw: format!("From gitlab: {}", value.issue.issue.web_url),
|
|
||||||
},
|
|
||||||
assignee: WorkPackageWriterAssignee {
|
|
||||||
href: match &value.assign_to {
|
|
||||||
None => None,
|
|
||||||
Some(w) => Some(w.clone().d_links.d_self.href),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn issue2work(config: Config, args: &Issue2Work) -> Result<(), GeneralError> {
|
pub(crate) async fn issue2work(config: Config, args: &Issue2Work) -> Result<(), GeneralError> {
|
||||||
let url = Url::parse(&*args.issue_url).expect("issue_url is not valid");
|
let url = Url::parse(&*args.issue_url).expect("issue_url is not valid");
|
||||||
let data = extract_issue_info(&url).unwrap();
|
let app = App {
|
||||||
|
gitlab_issue2work_action: GitlabAction {},
|
||||||
let client = ClientProvider::client_for_url(&url, &config).await?;
|
gitea_issue2work_action: GiteaAction {},
|
||||||
|
|
||||||
let endpoint = issues::ProjectIssues::builder()
|
|
||||||
.iid(data.iid)
|
|
||||||
.project(String::from(data.project))
|
|
||||||
.build()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let issues: Vec<Issue> = endpoint.query_async(&client).await.unwrap();
|
|
||||||
let issue = issues.first().unwrap();
|
|
||||||
|
|
||||||
let project_endpoint = projects::Project::builder()
|
|
||||||
.project(issue.project_id.value())
|
|
||||||
.build()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let project: Project = project_endpoint.query_async(&client).await.unwrap();
|
|
||||||
|
|
||||||
let issue_bundle = IssueBundle::new(&issue, &project);
|
|
||||||
|
|
||||||
let open_project_client = Client::from_config(&config.openproject);
|
|
||||||
|
|
||||||
let dto = Issue2WorkPackageDTO {
|
|
||||||
issue: issue_bundle,
|
|
||||||
assign_to: match args.assign_to_me {
|
|
||||||
true => {
|
|
||||||
let u = open_project_client.me().await?;
|
|
||||||
Some(u)
|
|
||||||
}
|
|
||||||
false => None,
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let work_package = open_project_client
|
if app.gitlab_issue2work_action.supports(&url, &config, args) {
|
||||||
.create_work_package(&(&dto).into(), &args.project_id)
|
app.gitlab_issue2work_action.run(&url, &config, args).await
|
||||||
.await?;
|
} else if app.gitea_issue2work_action.supports(&url, &config, args) {
|
||||||
|
app.gitea_issue2work_action.run(&url, &config, args).await
|
||||||
println!(
|
} else {
|
||||||
"new work package created: {:?}, edit at {}/projects/{}/work_packages/{}",
|
Err(GeneralError {
|
||||||
work_package.subject, config.openproject.base_url, args.project_id, work_package.id
|
description: format!("This action is not supported for this url: {}", url),
|
||||||
);
|
})
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_issue_info(url: &Url) -> Option<IssueInfo> {
|
|
||||||
let parts = url
|
|
||||||
.path_segments()
|
|
||||||
.expect("Could not parse path segment of given url");
|
|
||||||
let mut project_url: Vec<String> = Vec::with_capacity(3);
|
|
||||||
let mut iid: Option<String> = None;
|
|
||||||
|
|
||||||
let mut project_found = false;
|
|
||||||
|
|
||||||
for el in parts {
|
|
||||||
if el == "-" {
|
|
||||||
project_found = true;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if el == "issues" {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if !project_found {
|
|
||||||
project_url.push(String::from(el));
|
|
||||||
} else {
|
|
||||||
// must be the id
|
|
||||||
iid = Some(String::from(el));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(IssueInfo {
|
|
||||||
project: project_url.join("/"),
|
|
||||||
iid: iid
|
|
||||||
.expect("iid of the issue not found")
|
|
||||||
.parse()
|
|
||||||
.expect("could not transform issue id to u64"),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
@ -1 +1,12 @@
|
|||||||
|
use crate::cli::Issue2Work;
|
||||||
|
use crate::config::Config;
|
||||||
|
use crate::error::GeneralError;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
pub(crate) mod issue2work;
|
pub(crate) mod issue2work;
|
||||||
|
|
||||||
|
pub trait Issue2WorkActionTrait {
|
||||||
|
async fn run(&self, url: &Url, config: &Config, args: &Issue2Work) -> Result<(), GeneralError>;
|
||||||
|
|
||||||
|
fn supports(&self, url: &Url, config: &Config, args: &Issue2Work) -> bool;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user