Skip to content

Commit 9a6e0af

Browse files
josh-traceyjosh-tracey
committed
chore: cleanup
1 parent f4f5078 commit 9a6e0af

8 files changed

Lines changed: 99 additions & 262 deletions

File tree

‎fix_all.py‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎fix_tests.py‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎fix_tests2.py‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/workflow/image.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,10 @@ mod tests_derive {
185185
use super::*;
186186
#[test]
187187
fn test_derive_image_tag() {
188-
assert_eq!(derive_image_tag(Some("2bcc3f70984bb6d33d93bbcbb9eb3539ce033dc8")), "2bcc3f7");
188+
assert_eq!(
189+
derive_image_tag(Some("2bcc3f70984bb6d33d93bbcbb9eb3539ce033dc8")),
190+
"2bcc3f7"
191+
);
189192
assert_eq!(derive_image_tag(Some("abc")), "abc");
190193
assert_eq!(derive_image_tag(None), "dev");
191194
}

‎src/workflow/planner.rs‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ impl WorkflowPlanner {
180180
self.env.registry.clone()
181181
};
182182
let repository = format!("Adriftdev/sailr/{}", s.service.name);
183-
let tag = crate::workflow::image::derive_image_tag(Some(&s.fingerprint.full_hash));
183+
let tag = crate::workflow::image::derive_image_tag(Some(
184+
&s.fingerprint.full_hash,
185+
));
184186
let image_ref = format!("{}/{}:{}", registry, repository, tag);
185187
items.push(crate::workflow::image::ImagePushPlanItem {
186188
service: s.service.name.clone(),
@@ -387,7 +389,7 @@ impl WorkflowPlanner {
387389
crate::workflow::profile::WorkflowStepMode::Plan => {
388390
let push_plan = plan.image_push_plan.clone().unwrap();
389391
let mut task = Task::new("workflow:push-plan");
390-
392+
391393
let deps_refs: Vec<&str> = last_tasks.iter().map(|s| s.as_str()).collect();
392394
if !deps_refs.is_empty() {
393395
task = task.depends_on(&deps_refs);
@@ -396,7 +398,9 @@ impl WorkflowPlanner {
396398
task = task.exec_fn(move |_ctx| {
397399
let push_plan = push_plan.clone();
398400
async move {
399-
crate::LOGGER.info(&crate::workflow::render::render_image_push_plan_text(&push_plan));
401+
crate::LOGGER.info(&crate::workflow::render::render_image_push_plan_text(
402+
&push_plan,
403+
));
400404
Ok(())
401405
}
402406
});
@@ -595,7 +599,8 @@ mod tests {
595599
mode: WorkflowMode::Check,
596600
engine: WorkflowEngine::Runkernel,
597601
interactive: false,
598-
build: build_mode, push: WorkflowStepMode::Disabled,
602+
build: build_mode,
603+
push: WorkflowStepMode::Disabled,
599604
generate: WorkflowStepMode::Run,
600605
deploy: deploy_mode,
601606
test: WorkflowStepMode::Disabled,
@@ -812,12 +817,8 @@ mod tests_addendum {
812817
policy: None,
813818
};
814819

815-
let planner = WorkflowPlanner::new(
816-
normalized,
817-
std::sync::Arc::new(env),
818-
options,
819-
runner_ctx,
820-
);
820+
let planner =
821+
WorkflowPlanner::new(normalized, std::sync::Arc::new(env), options, runner_ctx);
821822

822823
let plan = planner.plan().unwrap();
823824
assert!(plan.image_push_plan.is_some());
@@ -877,12 +878,7 @@ mod tests_addendum {
877878
policy: None,
878879
};
879880

880-
let planner = WorkflowPlanner::new(
881-
normalized,
882-
env_arc.clone(),
883-
options,
884-
runner_ctx,
885-
);
881+
let planner = WorkflowPlanner::new(normalized, env_arc.clone(), options, runner_ctx);
886882

887883
let plan = planner.plan().unwrap();
888884
assert!(plan.image_push_plan.is_none());

‎src/workflow/profile.rs‎

Lines changed: 57 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -104,57 +104,63 @@ impl WorkflowProfile {
104104
let mut approval = self.approval;
105105
let mut apply = self.apply.unwrap_or(false);
106106

107-
let (default_build, default_push, default_generate, default_deploy, default_test, default_verify) =
108-
match self.mode {
109-
WorkflowMode::Check => (
110-
WorkflowStepMode::Plan,
111-
WorkflowStepMode::Disabled,
112-
WorkflowStepMode::Run,
113-
WorkflowStepMode::Disabled,
114-
WorkflowStepMode::Disabled,
115-
WorkflowStepMode::Disabled,
116-
),
117-
WorkflowMode::Build => (
118-
WorkflowStepMode::Run,
119-
WorkflowStepMode::Disabled,
120-
WorkflowStepMode::Disabled,
121-
WorkflowStepMode::Disabled,
122-
WorkflowStepMode::Disabled,
123-
WorkflowStepMode::Disabled,
124-
),
125-
WorkflowMode::Go => (
126-
WorkflowStepMode::Run,
127-
WorkflowStepMode::Disabled,
128-
WorkflowStepMode::Run,
129-
if apply {
130-
WorkflowStepMode::Run
131-
} else {
132-
WorkflowStepMode::Plan
133-
},
134-
WorkflowStepMode::Disabled,
135-
WorkflowStepMode::Disabled,
136-
),
137-
WorkflowMode::Deploy => (
138-
WorkflowStepMode::Disabled,
139-
WorkflowStepMode::Disabled,
140-
WorkflowStepMode::Run,
141-
if apply {
142-
WorkflowStepMode::Run
143-
} else {
144-
WorkflowStepMode::Plan
145-
},
146-
WorkflowStepMode::Disabled,
147-
WorkflowStepMode::Disabled,
148-
),
149-
WorkflowMode::Promote | WorkflowMode::Rollback => (
150-
WorkflowStepMode::Disabled,
151-
WorkflowStepMode::Disabled,
152-
WorkflowStepMode::Disabled,
153-
WorkflowStepMode::Disabled,
154-
WorkflowStepMode::Disabled,
155-
WorkflowStepMode::Disabled,
156-
),
157-
};
107+
let (
108+
default_build,
109+
default_push,
110+
default_generate,
111+
default_deploy,
112+
default_test,
113+
default_verify,
114+
) = match self.mode {
115+
WorkflowMode::Check => (
116+
WorkflowStepMode::Plan,
117+
WorkflowStepMode::Disabled,
118+
WorkflowStepMode::Run,
119+
WorkflowStepMode::Disabled,
120+
WorkflowStepMode::Disabled,
121+
WorkflowStepMode::Disabled,
122+
),
123+
WorkflowMode::Build => (
124+
WorkflowStepMode::Run,
125+
WorkflowStepMode::Disabled,
126+
WorkflowStepMode::Disabled,
127+
WorkflowStepMode::Disabled,
128+
WorkflowStepMode::Disabled,
129+
WorkflowStepMode::Disabled,
130+
),
131+
WorkflowMode::Go => (
132+
WorkflowStepMode::Run,
133+
WorkflowStepMode::Disabled,
134+
WorkflowStepMode::Run,
135+
if apply {
136+
WorkflowStepMode::Run
137+
} else {
138+
WorkflowStepMode::Plan
139+
},
140+
WorkflowStepMode::Disabled,
141+
WorkflowStepMode::Disabled,
142+
),
143+
WorkflowMode::Deploy => (
144+
WorkflowStepMode::Disabled,
145+
WorkflowStepMode::Disabled,
146+
WorkflowStepMode::Run,
147+
if apply {
148+
WorkflowStepMode::Run
149+
} else {
150+
WorkflowStepMode::Plan
151+
},
152+
WorkflowStepMode::Disabled,
153+
WorkflowStepMode::Disabled,
154+
),
155+
WorkflowMode::Promote | WorkflowMode::Rollback => (
156+
WorkflowStepMode::Disabled,
157+
WorkflowStepMode::Disabled,
158+
WorkflowStepMode::Disabled,
159+
WorkflowStepMode::Disabled,
160+
WorkflowStepMode::Disabled,
161+
WorkflowStepMode::Disabled,
162+
),
163+
};
158164

159165
let build = self.build.unwrap_or(default_build);
160166
let push = self.push.unwrap_or(default_push);

‎src/workflow/render.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ mod tests {
191191
mode: WorkflowMode::Check,
192192
engine: WorkflowEngine::Runkernel,
193193
interactive: false,
194-
build: WorkflowStepMode::Run, push: WorkflowStepMode::Disabled,
194+
build: WorkflowStepMode::Run,
195+
push: WorkflowStepMode::Disabled,
195196
generate: WorkflowStepMode::Run,
196197
deploy: WorkflowStepMode::Disabled,
197198
test: WorkflowStepMode::Disabled,
@@ -232,7 +233,8 @@ mod tests {
232233
from: "workflow:validate".to_string(),
233234
to: "build:api".to_string(),
234235
}],
235-
build_plan: None, image_push_plan: None,
236+
build_plan: None,
237+
image_push_plan: None,
236238
effects: WorkflowEffects {
237239
mutates_docker: true,
238240
..Default::default()

0 commit comments

Comments
 (0)