From 3a6ef503523ab30c6e9735feb11fcef9b2d73f37 Mon Sep 17 00:00:00 2001
From: Vladislav Ivanov <vlad@ivanov.email>
Date: Thu, 10 Nov 2022 10:59:25 +0700
Subject: [PATCH] Make auth optional in make_meta_config

Change: I61252ed70c0ad0eb128f95a06538e96049509187

commit-id:bd5114ff
---
 josh-proxy/src/bin/josh-proxy.rs | 38 ++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs
index 12a66ac98..c92b047f2 100644
--- a/josh-proxy/src/bin/josh-proxy.rs
+++ b/josh-proxy/src/bin/josh-proxy.rs
@@ -2,7 +2,7 @@
 #[macro_use]
 extern crate lazy_static;
 
-use josh_proxy::{MetaConfig, RepoUpdate};
+use josh_proxy::{MetaConfig, RepoConfig, RepoUpdate};
 use opentelemetry::global;
 use opentelemetry::sdk::propagation::TraceContextPropagator;
 use tracing_opentelemetry::OpenTelemetrySpanExt;
@@ -468,24 +468,30 @@ async fn query_meta_repo(
 
 async fn make_meta_config(
     serv: Arc<JoshProxyService>,
-    auth: &josh_proxy::auth::Handle,
+    auth: Option<&josh_proxy::auth::Handle>,
     parsed_url: &FilteredRepoUrl,
 ) -> josh::JoshResult<MetaConfig> {
-    let mut meta = Default::default();
-
-    if let Ok(meta_repo) = std::env::var("JOSH_META_REPO") {
-        let auth = if let Ok(token) = std::env::var("JOSH_META_AUTH_TOKEN") {
-            josh_proxy::auth::add_auth(&token)?
-        } else {
-            auth.clone()
-        };
+    let meta_repo = std::env::var("JOSH_META_REPO");
+    let auth_token = std::env::var("JOSH_META_AUTH_TOKEN");
+
+    match (auth, meta_repo) {
+        (None, _) | (_, Err(_)) => Ok(MetaConfig {
+            config: RepoConfig {
+                repo: parsed_url.upstream_repo.clone(),
+                ..Default::default()
+            },
+            ..Default::default()
+        }),
+        (Some(auth), Ok(meta_repo)) => {
+            let auth = if let Ok(token) = auth_token {
+                josh_proxy::auth::add_auth(&token)?
+            } else {
+                auth.clone()
+            };
 
-        meta = query_meta_repo(serv.clone(), &meta_repo, &parsed_url.upstream_repo, &auth).await?;
-    } else {
-        meta.config.repo = parsed_url.upstream_repo.clone();
+            query_meta_repo(serv.clone(), &meta_repo, &parsed_url.upstream_repo, &auth).await
+        }
     }
-
-    Ok(meta)
 }
 
 async fn serve_namespace(params: josh_rpc::calls::ServeNamespace) -> josh::JoshResult<()> {
@@ -766,7 +772,7 @@ async fn call_service(
         }
     };
 
-    let meta = make_meta_config(serv.clone(), &auth, &parsed_url).await?;
+    let meta = make_meta_config(serv.clone(), Some(&auth), &parsed_url).await?;
 
     let mut filter = josh::filter::chain(
         meta.config.filter,