Skip to content

refactor: optimize variable containment check and remove redundant clones #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moostoopha wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: optimize variable containment check and remove redundant clones #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/models/variables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ impl EnvironmentVariableServiceType {
}

/// Model for all information about a Cloud Manager pipeline variable
/// Model for all information about a Cloud Manager environment variable
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct PipelineVariable {
pub name: String,
Expand Down
14 changes: 10 additions & 4 deletions src/variables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ pub async fn set_env_vars_from_file(
// - $enc2 <...> / $enc2<...> (new scheme)
// - $enc <...> / $enc<...> (legacy scheme, with fallback)
// - raw base64 (tries new first, then legacy)
let tmp_loop_var_value = tmp_loop_var.clone().value.unwrap();
let tmp_loop_var_value = tmp_loop_var.value.clone().unwrap();
if tmp_loop_var_value.starts_with("$enc") {
tmp_loop_var.value = Some(decrypt(tmp_loop_var_value));
}
Expand All @@ -268,9 +268,12 @@ pub async fn set_env_vars_from_file(

// If a variable is only present on Cloud Manager and not in the YAML, then we
// will set its value to None and push it to vars_final, so it will be deleted.
// Build a set for O(1) lookup instead of scanning the vec on every iteration.
let vars_yaml_set: HashSet<EnvironmentVariable> =
vars_yaml.iter().cloned().collect();
let vars_cloud = get_env_vars(client, p.id, e.id).await.unwrap().variables;
for vc in vars_cloud {
if !vars_yaml.clone().contains(&vc) {
if !vars_yaml_set.contains(&vc) {
let variable_to_be_deleted = EnvironmentVariable {
name: vc.name,
value: None,
Expand Down Expand Up @@ -515,7 +518,7 @@ pub async fn set_pipeline_vars_from_file(
// - $enc2 <...> / $enc2<...> (new scheme)
// - $enc <...> / $enc<...> (legacy scheme, with fallback)
// - raw base64 (tries new first, then legacy)
let tmp_loop_var_value = tmp_loop_var.clone().value.unwrap();
let tmp_loop_var_value = tmp_loop_var.value.clone().unwrap();
if tmp_loop_var_value.starts_with("$enc") {
tmp_loop_var.value = Some(decrypt(tmp_loop_var_value));
}
Expand All @@ -526,12 +529,15 @@ pub async fn set_pipeline_vars_from_file(

// If a variable is only present on Cloud Manager and not in the YAML, then we
// will set its value to None and push it to vars_final, so it will be deleted.
// Build a set for O(1) lookup instead of scanning the vec on every iteration.
let vars_yaml_set: HashSet<PipelineVariable> =
vars_yaml.iter().cloned().collect();
let vars_cloud = get_pipeline_vars(client, p.id, &l.id)
.await
.unwrap()
.variables;
for vc in vars_cloud {
if !vars_yaml.clone().contains(&vc) {
if !vars_yaml_set.contains(&vc) {
let variable_to_be_deleted = PipelineVariable {
name: vc.name,
value: None,
Expand Down