Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/zizmor/src/audit/artipacked.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use itertools::Itertools as _;
use super::{Audit, AuditLoadError, audit_meta};
use crate::{
finding::{Confidence, Finding, Fix, Persona, Severity, location::Routable as _},
models::{StepBodyCommon, StepCommon, uses::RepositoryUsesExt as _},
models::{StepBodyCommon, StepCommon, uses::repository::RepositoryUsesExt as _},
state::AuditState,
utils::split_patterns,
};
Expand Down
3 changes: 2 additions & 1 deletion crates/zizmor/src/audit/cache_poisoning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::finding::location::{Locatable as _, Routable};
use crate::finding::{Confidence, Finding, Fix, FixDisposition, Severity};
use crate::models::StepCommon;
use crate::models::coordinate::{ActionCoordinate, ControlExpr, ControlFieldType, Toggle, Usage};
use crate::models::uses::repository::RepositoryUsesPattern;
use crate::models::workflow::{JobExt as _, NormalJob, Step, Steps};
use crate::state::AuditState;

Expand Down Expand Up @@ -339,7 +340,7 @@ impl CachePoisoning {

fn create_configurable_action_fix<'doc>(
&self,
_uses_pattern: &crate::models::uses::RepositoryUsesPattern,
_uses_pattern: &RepositoryUsesPattern,
control: &ControlExpr,
step: &Step<'doc>,
) -> Option<Fix<'doc>> {
Expand Down
2 changes: 1 addition & 1 deletion crates/zizmor/src/audit/impostor_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::{
config::Config,
finding::{Confidence, Finding, Severity, location::Locatable as _},
github_api::{self, ComparisonStatus},
models::{StepCommon, uses::RepositoryUsesExt as _, workflow::Workflow},
models::{StepCommon, uses::repository::RepositoryUsesExt as _, workflow::Workflow},
state::AuditState,
};

Expand Down
4 changes: 3 additions & 1 deletion crates/zizmor/src/audit/known_vulnerable_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ use crate::{
config::Config,
finding::{Confidence, Finding, Fix, Severity, location::Routable as _},
github_api,
models::{StepCommon, action::CompositeStep, uses::RepositoryUsesExt as _, workflow::Step},
models::{
StepCommon, action::CompositeStep, uses::repository::RepositoryUsesExt as _, workflow::Step,
},
state::AuditState,
};
use yamlpatch::{Op, Patch};
Expand Down
2 changes: 1 addition & 1 deletion crates/zizmor/src/audit/ref_confusion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::models::{StepCommon, action::CompositeStep};
use crate::{
finding::{Confidence, Severity},
github_api,
models::uses::RepositoryUsesExt as _,
models::uses::repository::RepositoryUsesExt as _,
state::AuditState,
};

Expand Down
4 changes: 3 additions & 1 deletion crates/zizmor/src/audit/stale_action_refs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ use crate::{
config::Config,
finding::{Confidence, Finding, Severity},
github_api,
models::{StepCommon, action::CompositeStep, uses::RepositoryUsesExt as _, workflow::Step},
models::{
StepCommon, action::CompositeStep, uses::repository::RepositoryUsesExt as _, workflow::Step,
},
state::AuditState,
};

Expand Down
4 changes: 2 additions & 2 deletions crates/zizmor/src/audit/template_injection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ use crate::{
location::{Routable as _, SymbolicLocation},
},
models::{
self, StepCommon, action::CompositeStep, inputs::Capability, uses::RepositoryUsesPattern,
workflow::Step,
self, StepCommon, action::CompositeStep, inputs::Capability,
uses::repository::RepositoryUsesPattern, workflow::Step,
},
state::AuditState,
utils::{self, DEFAULT_ENVIRONMENT_VARIABLES, ExtractedExpr, extract_fenced_expressions},
Expand Down
2 changes: 1 addition & 1 deletion crates/zizmor/src/audit/unpinned_uses.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use github_actions_models::common::Uses;
use super::{Audit, AuditLoadError, AuditState, audit_meta};
use crate::config::{Config, UsesPolicy};
use crate::finding::{Confidence, Finding, Persona, Severity};
use crate::models::uses::RepositoryUsesPattern;
use crate::models::uses::repository::RepositoryUsesPattern;
use crate::models::{StepCommon, action::CompositeStep, uses::UsesExt as _, workflow::Step};

pub(crate) struct UnpinnedUses;
Expand Down
2 changes: 1 addition & 1 deletion crates/zizmor/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::{
audit::{AuditCore, forbidden_uses::ForbiddenUses, unpinned_uses::UnpinnedUses},
finding::Finding,
github_api::Client,
models::uses::RepositoryUsesPattern,
models::uses::repository::RepositoryUsesPattern,
registry::input::RepoSlug,
tips,
};
Expand Down
4 changes: 2 additions & 2 deletions crates/zizmor/src/models/coordinate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use indexmap::IndexMap;

use crate::utils::ExtractedExpr;

use super::{StepBodyCommon, StepCommon, uses::RepositoryUsesPattern};
use super::{StepBodyCommon, StepCommon, uses::repository::RepositoryUsesPattern};

pub(crate) enum ActionCoordinate {
Configurable {
Expand Down Expand Up @@ -389,7 +389,7 @@ mod tests {
use crate::{
models::{
coordinate::{ControlExpr, ControlFieldType, Toggle, Usage},
uses::RepositoryUsesPattern,
uses::repository::RepositoryUsesPattern,
workflow::{Job, Workflow},
},
registry::input::InputKey,
Expand Down
Loading
Loading