Skip to content

Fix nuget proxy kind label #5

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
Wolfeg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix nuget proxy kind label #5

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
37 changes: 37 additions & 0 deletions pkgly/src/app/api/repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,13 @@ async fn resolve_repository_kind(
crate::repository::npm::NPMRegistryConfigType::get_type_static(),
)
.await
} else if repo_type.eq_ignore_ascii_case(crate::repository::nuget::REPOSITORY_TYPE_ID) {
load_proxy_kind::<crate::repository::nuget::NugetRepositoryConfig>(
repository,
site,
crate::repository::nuget::NugetRepositoryConfigType::get_type_static(),
)
.await
} else if repo_type.eq_ignore_ascii_case("go") {
load_proxy_kind::<crate::repository::go::GoRepositoryConfig>(
repository,
Expand Down Expand Up @@ -452,6 +459,16 @@ impl ProxyKindClassifier for crate::repository::npm::NPMRegistryConfig {
}
}

impl ProxyKindClassifier for crate::repository::nuget::NugetRepositoryConfig {
fn proxy_kind_label(&self) -> Option<&'static str> {
match self {
Self::Hosted => Some("hosted"),
Self::Proxy(_) => Some("proxy"),
Self::Virtual(_) => Some("virtual"),
}
}
}

impl ProxyKindClassifier for crate::repository::go::GoRepositoryConfig {
fn proxy_kind_label(&self) -> Option<&'static str> {
match self {
Expand Down Expand Up @@ -499,6 +516,7 @@ mod repository_kind_tests {
NPMRegistryConfig, NpmProxyConfig,
npm_virtual::{NpmVirtualConfig, VirtualResolutionOrder},
},
nuget::NugetRepositoryConfig,
python::{PythonProxyConfig, PythonRepositoryConfig},
ruby::RubyRepositoryConfig,
};
Expand Down Expand Up @@ -577,6 +595,25 @@ mod repository_kind_tests {
assert_eq!(config.proxy_kind_label(), Some("virtual"));
}

#[test]
fn nuget_proxy_reports_proxy_kind() {
let config = serde_json::from_value(serde_json::json!({
"type": "Proxy",
"config": { "upstream_url": "https://api.nuget.org/v3/index.json" }
}));
let config: NugetRepositoryConfig = match config {
Ok(config) => config,
Err(error) => panic!("NuGet proxy config must deserialize: {error}"),
};
assert_eq!(config.proxy_kind_label(), Some("proxy"));
}

#[test]
fn nuget_virtual_reports_virtual_kind() {
let config = NugetRepositoryConfig::Virtual(Default::default());
assert_eq!(config.proxy_kind_label(), Some("virtual"));
}

#[test]
fn go_proxy_reports_proxy_kind() {
let config = GoRepositoryConfig::Proxy(GoProxyConfig::default());
Expand Down