Skip to content

merge queue: embarking main (c30b79b), #1373 and #1364 together #1377

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

Closed
mergify wants to merge 5 commits into from
Closed

merge queue: embarking main (c30b79b), #1373 and #1364 together #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b149f4
docs(port): add port review checklist for HTTP/test/UX parity pitfalls
jd May 5, 2026
458b512
feat(rust): add mergify_core::auth with gh and git-config fallbacks
jd May 5, 2026
41c2109
chore(deps): update mergifyio/gha-mergify-ci action to v17
renovate[bot] May 6, 2026
9b4f0e5
Merge of #1373
mergify[bot] May 6, 2026
a5d7f73
Merge of #1364
mergify[bot] May 6, 2026
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 .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Verify all jobs succeeded
uses: Mergifyio/gha-mergify-ci@v16
uses: Mergifyio/gha-mergify-ci@v17
with:
action: wait-jobs
jobs: ${{ toJSON(needs) }}
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 8 additions & 36 deletions crates/mergify-ci/src/scopes_send.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,24 @@
//! returns success — matches Python's "no PR, nothing to send"
//! behavior.
//!
//! Auth + API URL resolution follows the same fallback order as
//! ``config simulate``: explicit flag → ``MERGIFY_TOKEN`` /
//! ``MERGIFY_API_URL`` env var → default (or error).
//! Auth + API URL resolution goes through `mergify_core::auth`,
//! which adds a `gh auth token` fallback (matches Python's
//! `utils.get_default_token`) and a `git config remote.origin.url`
//! fallback for the repository slug (matches
//! `utils.get_default_repository`).

use std::env;
use std::path::Path;

use mergify_core::ApiFlavor;
use mergify_core::CliError;
use mergify_core::HttpClient;
use mergify_core::Output;
use mergify_core::auth;
use serde::Deserialize;
use serde::Serialize;
use url::Url;

use crate::detector;

const DEFAULT_API_URL: &str = "https://api.mergify.com";

pub struct ScopesSendOptions<'a> {
pub repository: Option<&'a str>,
pub pull_request: Option<u64>,
Expand All @@ -56,8 +55,8 @@ pub async fn run(opts: ScopesSendOptions<'_>, output: &mut dyn Output) -> Result
};

let repository = resolve_repository(opts.repository)?;
let token = resolve_token(opts.token)?;
let api_url = resolve_api_url(opts.api_url)?;
let token = auth::resolve_token(opts.token)?;
let api_url = auth::resolve_api_url(opts.api_url)?;

// Whenever the deprecated `--file` flag is supplied, surface
// the deprecation warning — even when `--scopes-json` is also
Expand Down Expand Up @@ -111,33 +110,6 @@ fn resolve_pull_request(explicit: Option<u64>) -> Result<Option<u64>, CliError>
detector::get_github_pull_request_number()
}

fn resolve_token(explicit: Option<&str>) -> Result<String, CliError> {
if let Some(value) = explicit.filter(|s| !s.is_empty()) {
return Ok(value.to_string());
}
for env_name in ["MERGIFY_TOKEN", "GITHUB_TOKEN"] {
if let Ok(value) = env::var(env_name) {
if !value.is_empty() {
return Ok(value);
}
}
}
Err(CliError::Configuration(
"please set the 'MERGIFY_TOKEN' or 'GITHUB_TOKEN' environment variable, \
or pass --token explicitly"
.to_string(),
))
}

fn resolve_api_url(explicit: Option<&str>) -> Result<Url, CliError> {
let raw = explicit
.map(str::to_string)
.or_else(|| env::var("MERGIFY_API_URL").ok())
.filter(|s| !s.is_empty())
.unwrap_or_else(|| DEFAULT_API_URL.to_string());
Url::parse(&raw).map_err(|e| CliError::Configuration(format!("invalid --api-url {raw:?}: {e}")))
}

#[derive(Deserialize)]
struct DetectedScopesFile {
scopes: Vec<String>,
Expand Down
124 changes: 6 additions & 118 deletions crates/mergify-config/src/simulate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,23 @@
//! 5. Prints the simulator's title + summary.
//!
//! Token / api-url / config-file all follow the same resolution
//! order as the Python CLI: explicit flag, then env var, then
//! default. Missing token falls back from ``MERGIFY_TOKEN`` to
//! ``GITHUB_TOKEN``. The ``gh auth token`` subprocess fallback from
//! Python isn't ported yet — if neither env var is set the command
//! errors out.
//! order as the Python CLI (`mergify_core::auth`): explicit flag,
//! then env var, then `gh auth token` for the bearer, then the
//! default API URL.

use std::env;
use std::io::Write;
use std::path::Path;

use mergify_core::ApiFlavor;
use mergify_core::CliError;
use mergify_core::HttpClient;
use mergify_core::Output;
use mergify_core::auth;
use serde::Deserialize;
use serde::Serialize;
use url::Url;

use crate::paths::resolve_config_path;

const DEFAULT_API_URL: &str = "https://api.mergify.com";

/// Deserialized shape of the `(owner/repo, number)` pair parsed from
/// a pull-request URL.
#[derive(Clone, Debug, Eq, PartialEq)]
Expand Down Expand Up @@ -75,39 +70,6 @@ pub fn parse_pr_url(url: &str) -> Result<PullRequestRef, String> {
})
}

/// Resolve the Mergify API bearer token.
///
/// Precedence: explicit `--token`, then `MERGIFY_TOKEN`, then
/// `GITHUB_TOKEN`. Errors out when none of those are set.
fn resolve_token(explicit: Option<&str>) -> Result<String, CliError> {
if let Some(token) = explicit.filter(|t| !t.is_empty()) {
return Ok(token.to_string());
}
for env_name in ["MERGIFY_TOKEN", "GITHUB_TOKEN"] {
if let Ok(value) = env::var(env_name) {
if !value.is_empty() {
return Ok(value);
}
}
}
Err(CliError::Configuration(
"please set the 'MERGIFY_TOKEN' or 'GITHUB_TOKEN' environment variable, \
or pass --token explicitly"
.to_string(),
))
}

/// Resolve the Mergify API base URL. Falls back to `MERGIFY_API_URL`
/// env var, then to the default `https://api.mergify.com`.
fn resolve_api_url(explicit: Option<&str>) -> Result<Url, CliError> {
let raw = explicit
.map(str::to_string)
.or_else(|| env::var("MERGIFY_API_URL").ok())
.filter(|s| !s.is_empty())
.unwrap_or_else(|| DEFAULT_API_URL.to_string());
Url::parse(&raw).map_err(|e| CliError::Configuration(format!("invalid --api-url {raw:?}: {e}")))
}

#[derive(Serialize)]
struct SimulatorRequest<'a> {
mergify_yml: &'a str,
Expand All @@ -133,8 +95,8 @@ pub async fn run(opts: SimulateOptions<'_>, output: &mut dyn Output) -> Result<(
CliError::Configuration(format!("cannot read {}: {e}", config_path.display()))
})?;

let token = resolve_token(opts.token)?;
let api_url = resolve_api_url(opts.api_url)?;
let token = auth::resolve_token(opts.token)?;
let api_url = auth::resolve_api_url(opts.api_url)?;

output.status(&format!("Simulating against {api_url}…"))?;

Expand Down Expand Up @@ -218,80 +180,6 @@ mod tests {
assert!(parse_pr_url("https://github.com//repo/pull/42").is_err());
}

#[test]
fn resolve_token_prefers_explicit_over_env() {
temp_env::with_vars(
[
("MERGIFY_TOKEN", Some("from-env")),
("GITHUB_TOKEN", Some("github-env")),
],
|| {
assert_eq!(resolve_token(Some("from-cli")).unwrap(), "from-cli");
},
);
}

#[test]
fn resolve_token_falls_back_to_mergify_env() {
temp_env::with_vars(
[
("MERGIFY_TOKEN", Some("mergify-env")),
("GITHUB_TOKEN", Some("github-env")),
],
|| {
assert_eq!(resolve_token(None).unwrap(), "mergify-env");
},
);
}

#[test]
fn resolve_token_falls_back_to_github_env() {
temp_env::with_vars(
[
("MERGIFY_TOKEN", None::<&str>),
("GITHUB_TOKEN", Some("github-env")),
],
|| {
assert_eq!(resolve_token(None).unwrap(), "github-env");
},
);
}

#[test]
fn resolve_token_errors_when_no_source_available() {
temp_env::with_vars(
[
("MERGIFY_TOKEN", None::<&str>),
("GITHUB_TOKEN", None::<&str>),
],
|| {
let err = resolve_token(None).unwrap_err();
assert!(matches!(err, CliError::Configuration(_)));
assert!(err.to_string().contains("MERGIFY_TOKEN"));
},
);
}

#[test]
fn resolve_api_url_uses_default_when_unset() {
temp_env::with_vars([("MERGIFY_API_URL", None::<&str>)], || {
assert_eq!(
resolve_api_url(None).unwrap().as_str(),
"https://api.mergify.com/",
);
});
}

#[test]
fn resolve_api_url_prefers_explicit() {
temp_env::with_vars([("MERGIFY_API_URL", Some("https://from.env"))], || {
assert_eq!(
resolve_api_url(Some("https://from.cli")).unwrap().as_str(),
"https://from.cli/",
);
});
}

#[tokio::test]
async fn run_posts_config_and_prints_simulator_result() {
let server = MockServer::start().await;
Expand Down
1 change: 1 addition & 0 deletions crates/mergify-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tokio = { version = "1", default-features = false, features = ["macros", "rt", "
url = "2"

[dev-dependencies]
temp-env = "0.3"
tokio = { version = "1", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
wiremock = "0.6"

Expand Down
Loading
Loading