4 files changed
+22
-19
crates/cli/src/deploy/mod.rs
+17
-13
@@ -37,7 +37,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
37
let config = check_config(env).await?;
38
39
// Validate config with project.
40
- check_project(env, &access_token, config.project.id.clone()).await?;
40
+ check_project(env, &access_token, config.project.id).await?;
41
42
// Check remote repository setup.
43
let repo = match Repository::open(".") {
@@ -72,7 +72,8 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
72
status: DeploymentStatus::Started,
73
};
74
75
- let created_deployment = create_deployment(env, &access_token, config.project.id.clone(), payload).await?;
75
+ let created_deployment =
76
+ create_deployment(env, &access_token, config.project.id, payload).await?;
77
let user = me(env).await?;
78
79
let mut push_opts = PushOptions::new();
@@ -82,8 +83,8 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
83
let deployment_failed_flag = Arc::new(AtomicBool::new(false));
84
let update_env = env; // Env is Copy
85
let update_access_token = access_token.clone();
85
- let update_project_id = config.project.id.clone();
86
- let update_deployment_id = created_deployment.id.clone();
86
+ let update_project_id = config.project.id;
87
+ let update_deployment_id = created_deployment.id;
88
89
// Set the credentials
90
callbacks.credentials(config.credentials(user));
@@ -104,8 +105,8 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
105
callbacks.push_update_reference({
106
let flag_clone = deployment_failed_flag.clone();
107
let access_token_for_update_cb = update_access_token.clone();
107
- let project_id_for_update_cb = update_project_id.clone();
108
- let deployment_id_for_update_cb = update_deployment_id.clone();
108
+ let project_id_for_update_cb = update_project_id;
109
+ let deployment_id_for_update_cb = update_deployment_id;
110
111
move |_refname, status_message| {
112
if let Some(e) = status_message {
@@ -127,8 +128,8 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
128
update(
129
update_env, // Env is Copy
130
access_token_for_update_cb.clone(),
130
- project_id_for_update_cb.clone(),
131
- deployment_id_for_update_cb.clone(),
131
+ project_id_for_update_cb,
132
+ deployment_id_for_update_cb,
133
update_payload,
134
)
135
.await
@@ -162,20 +163,23 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
163
let result = update(
164
env,
165
access_token.clone(),
165
- config.project.id.clone(),
166
- created_deployment.id.clone(),
166
+ config.project.id,
167
+ created_deployment.id,
168
update_payload,
168
- ).await;
169
+ )
170
+ .await;
171
match result {
172
Ok(_) => println!("Deployment status successfully updated to Done."),
171
- Err(update_err) => eprintln!("Error updating deployment status to Done: {}", update_err),
173
+ Err(update_err) => {
174
+ eprintln!("Error updating deployment status to Done: {}", update_err)
175
+ }
176
}
177
Ok(CommandResult {
178
spinner,
179
symbol: succeed_symbol(),
180
msg: succeed_message("Deployment complete."),
181
})
178
- },
182
+ }
183
Err(e) => Err(anyhow!(fail_message(&e.to_string()))),
184
}
185
}
crates/smbcloud-networking-project/src/lib.rs
+1
-1
@@ -4,4 +4,4 @@ pub mod crud_project_deployment_create;
4
pub mod crud_project_deployment_read;
5
pub mod crud_project_deployment_update;
6
pub mod crud_project_read;
7
-mod url_builder;
\ No newline at end of file
7
+mod url_builder;
crates/smbcloud-networking-project/src/url_builder.rs
-1
@@ -1,4 +1,3 @@
1
-
1
use smbcloud_networking::{environment::Environment, smb_base_url_builder};
2
3
// Private functions
crates/smbcloud-networking/src/network.rs
+4
-4
@@ -22,11 +22,11 @@ pub async fn parse_error_response<T: DeserializeOwned>(
22
};
23
24
if LOG_RESPONSE_BODY {
25
- println!("");
25
+ println!();
26
println!("Parse Error >>>>");
27
println!("{:?}", serde_json::to_string_pretty(&response_body));
28
println!("Parse Error >>>>");
29
- println!("");
29
+ println!();
30
}
31
32
let e = match serde_json::from_str::<ErrorResponse>(&response_body) {
@@ -75,11 +75,11 @@ pub async fn request<R: DeserializeOwned>(builder: RequestBuilder) -> Result<R,
75
};
76
77
if LOG_RESPONSE_BODY {
78
- println!("");
78
+ println!();
79
println!("Parse >>>>");
80
println!("{:?}", serde_json::to_string_pretty(&response_body));
81
println!("Parse >>>>");
82
- println!("");
82
+ println!();
83
}
84
85
let response = match serde_json::from_str::<R>(&response_body) {