Skip to content

Ignore woodpecker internal labels when determining agent support #31

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

Merged
windsource merged 1 commit into from
Apr 6, 2025
Merged

Ignore woodpecker internal labels when determining agent support #31

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
17 changes: 16 additions & 1 deletion src/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ use std::{collections::HashMap, error::Error};

pub type Labels = HashMap<String, String>;

const WOODPECKER_INTERNAL_LABEL_PREFIX: &str = "woodpecker-ci.org";

#[cfg_attr(test, automock)]
#[async_trait]
pub trait AgentProvider {
Expand All @@ -27,7 +29,7 @@ impl FilterLabels {
}
pub fn supports(&self, workflow_labels: &Labels) -> bool {
for (k, v) in workflow_labels.iter() {
if !v.is_empty() {
if !v.is_empty() && !k.starts_with(WOODPECKER_INTERNAL_LABEL_PREFIX) {
if let Some(filter_value) = self.0.get(k) {
if filter_value != v && filter_value != "*" {
return false;
Expand Down Expand Up @@ -81,4 +83,17 @@ mod tests {
let workflow_labels: Labels = HashMap::from([("platform".to_string(), "".to_string())]);
assert!(fl.supports(&workflow_labels));
}
#[test]
fn filter_labels_woodpecker_internal() {
let fl = FilterLabels::from_string("type=*,platform=linux/amd64,backend=docker");
let workflow_labels: Labels = HashMap::from([
("platform".to_string(), "".to_string()),
("woodpecker-ci.org/repo-id".to_string(), "3".to_string()),
(
"woodpecker-ci.org/repo-forge-id".to_string(),
"23949".to_string(),
),
]);
assert!(fl.supports(&workflow_labels));
}
}