6 files changed
+20
-27
crates/cli/src/deploy/setup.rs
+1
-1
@@ -27,7 +27,7 @@ pub async fn setup_project(env: Environment) -> Result<Config, ConfigError> {
27
28
let access_token = match get_smb_token(env).await {
29
Ok(token) => token,
30
- Err(_) => { return Err(ConfigError::MissingToken) },
30
+ Err(_) => return Err(ConfigError::MissingToken),
31
};
32
33
let projects = match get_projects(env, access_token).await {
crates/smbcloud-networking-project/src/crud_project_delete.rs
+1
@@ -0,0 +1 @@
1
+
crates/smbcloud-networking-project/src/crud_project_deployment_read.rs
+1
-4
@@ -1,10 +1,7 @@
1
use crate::{build_project_deployment, build_project_deployment_index};
2
use anyhow::Result;
3
use reqwest::Client;
4
-use smbcloud_model::{
5
- error_codes::ErrorResponse,
6
- project::Deployment,
7
-};
4
+use smbcloud_model::{error_codes::ErrorResponse, project::Deployment};
5
use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};
6
7
pub async fn get_deployments(
crates/smbcloud-networking-project/src/crud_project_deployment_update.rs
+1
@@ -0,0 +1 @@
1
+
crates/smbcloud-networking-project/src/crud_project_read.rs
+1
-1
@@ -13,4 +13,4 @@ pub async fn get_project(
13
.header("Authorization", access_token)
14
.header("User-agent", SMB_USER_AGENT);
15
request(builder).await
16
-}
\ No newline at end of file
16
+}
crates/smbcloud-networking-project/src/lib.rs
+15
-21
@@ -1,36 +1,30 @@
1
+pub mod crud_project_delete;
2
pub mod crud_project_deployment_create;
3
pub mod crud_project_deployment_read;
3
-pub mod crud_project_read;
4
-pub mod crud_project_delete;
4
pub mod crud_project_deployment_update;
5
+pub mod crud_project_read;
6
7
use anyhow::{anyhow, Result};
8
use log::debug;
9
use reqwest::{Client, StatusCode};
10
-use smbcloud_model::project::{Project, ProjectCreate};
11
-use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, get_smb_token, smb_base_url_builder};
10
+use smbcloud_model::{
11
+ error_codes::ErrorResponse,
12
+ project::{Project, ProjectCreate},
13
+};
14
+use smbcloud_networking::{
15
+ constants::SMB_USER_AGENT, environment::Environment, get_smb_token, network::request,
16
+ smb_base_url_builder,
17
+};
18
19
pub async fn get_projects(
20
env: Environment,
15
- access_token: String
16
-) -> Result<Vec<Project>> {
17
-
18
- debug!("Current token: {}", access_token);
19
-
20
- let response = Client::new()
21
+ access_token: String,
22
+) -> Result<Vec<Project>, ErrorResponse> {
23
+ let builder = Client::new()
24
.get(build_project_url(env))
25
.header("Authorization", access_token)
23
- .header("User-agent", SMB_USER_AGENT)
24
- .send()
25
- .await?;
26
-
27
- match response.status() {
28
- reqwest::StatusCode::OK => {
29
- let projects: Vec<Project> = response.json().await?;
30
- Ok(projects)
31
- }
32
- _ => Err(anyhow!("Failed to fetch projects.")),
33
- }
26
+ .header("User-agent", SMB_USER_AGENT);
27
+ request(builder).await
28
}
29
30
pub async fn create_project(env: Environment, project: ProjectCreate) -> Result<Project> {