From ba6e05f2e722c5cbe42d80554a6304124f4dcc9d Mon Sep 17 00:00:00 2001 From: Kim Hermansson Date: Tue, 26 Sep 2023 12:05:11 +0200 Subject: [PATCH 1/2] Log when pinging --- src/registry/artifactory.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/registry/artifactory.rs b/src/registry/artifactory.rs index 33428092..87a8e555 100644 --- a/src/registry/artifactory.rs +++ b/src/registry/artifactory.rs @@ -33,10 +33,23 @@ impl Artifactory { reqwest::Client::builder().redirect(reqwest::redirect::Policy::none()); if let Some(token) = credentials.registry_tokens.get(®istry) { + tracing::info!( + uri=?registry.as_str(), + token_length=?token.len(), + "The {} header is set", + Self::JFROG_AUTH_HEADER, + ); + let mut headers = HeaderMap::new(); headers.insert(Self::JFROG_AUTH_HEADER, token.parse()?); client_builder = client_builder.default_headers(headers); + } else { + tracing::info!( + uri=?registry.as_str(), + "The {} header is NOT set", + Self::JFROG_AUTH_HEADER, + ); } Ok(Self { @@ -56,9 +69,15 @@ impl Artifactory { let response = self.client.get(repositories_url).send().await?; - ensure!(response.status().is_success(), "Failed to ping artifactory"); + let status = response.status(); + + if !status.is_success() { + tracing::info!("Artifactory response header: {:?}", response); + } + + ensure!(status.is_success(), "Failed to ping artifactory"); - tracing::debug!("pinging artifactory succeeded"); + tracing::debug!("Pinging artifactory succeeded"); Ok(()) } From ecd77cbfde4e5a8e06d28dace06eff14b0abd147 Mon Sep 17 00:00:00 2001 From: Kim Hermansson Date: Tue, 26 Sep 2023 12:30:42 +0200 Subject: [PATCH 2/2] Ensure building works. --- src/registry/artifactory.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/registry/artifactory.rs b/src/registry/artifactory.rs index 87a8e555..f92013e9 100644 --- a/src/registry/artifactory.rs +++ b/src/registry/artifactory.rs @@ -33,18 +33,20 @@ impl Artifactory { reqwest::Client::builder().redirect(reqwest::redirect::Policy::none()); if let Some(token) = credentials.registry_tokens.get(®istry) { - tracing::info!( - uri=?registry.as_str(), - token_length=?token.len(), - "The {} header is set", - Self::JFROG_AUTH_HEADER, - ); + if std::env::var("BUFFRS_TESTSUITE").is_err() { + tracing::info!( + uri=?registry.as_str(), + token_length=?token.len(), + "The {} header is set", + Self::JFROG_AUTH_HEADER, + ); + } let mut headers = HeaderMap::new(); headers.insert(Self::JFROG_AUTH_HEADER, token.parse()?); client_builder = client_builder.default_headers(headers); - } else { + } else if std::env::var("BUFFRS_TESTSUITE").is_err() { tracing::info!( uri=?registry.as_str(), "The {} header is NOT set",