Apply HEX_CDN (mirror url) to the default public hex repo only

Author: belltoy

src/rebar3.erl

@@ -134,6 +134,7 @@ run_aux(State, RawArgs) ->
     %% Maybe change the default hex CDN
     HexCDN = case os:getenv("HEX_CDN") of
                  false -> ?DEFAULT_CDN;
+                 [] -> ?DEFAULT_CDN;
                  CDN -> CDN
              end,
     State2 = rebar_state:set(State1, rebar_packages_cdn, HexCDN),

src/rebar_hex_repos.erl

@@ -34,7 +34,7 @@ from_state(BaseConfig, State) ->
     %% add base config entries that are specific to use by rebar3 and not overridable
     Repos1 = merge_with_base_and_auth(Repos, BaseConfig, Auth),
     %% merge organizations parent repo options into each oraganization repo
-    update_organizations(Repos1).
+    update_organizations(maybe_apply_mirror(Repos1, State)).
 
 -spec get_repo_config(unicode:unicode_binary(), rebar_state:t() | [repo()])
                      -> {ok, repo()} | error.
@@ -105,6 +105,15 @@ update_organizations(Repos) ->
                       Repo
               end, Repos).
 
+maybe_apply_mirror(Repos, State) ->
+    lists:map(fun(Repo=#{repo_name := ?PUBLIC_HEX_REPO}) ->
+                      Repo#{repo_url => rebar_state:maybe_default_cdn(State)};
+                 (Repo=#{name := ?PUBLIC_HEX_REPO}) ->
+                      Repo#{repo_url => rebar_state:maybe_default_cdn(State)};
+                 (Repo) ->
+                      Repo
+              end, Repos).
+
 update_repo_list(R=#{name := N}, [H=#{name := HN} | Rest]) when N =:= HN ->
     [maps:merge(R, H) | Rest];
 update_repo_list(R, [H | Rest]) ->

src/rebar_packages.erl

@@ -243,9 +243,8 @@ parse_checksum(Checksum) ->
 
 update_package(Name, RepoConfig=#{name := Repo}, State) ->
     ?MODULE:verify_table(State),
-    CDN = rebar_state:maybe_default_cdn(State),
-    ?DEBUG("Getting package ~ts resource from repo ~ts", [Name, CDN]),
-    try r3_hex_repo:get_package(get_package_repo_config(RepoConfig#{repo_url => CDN}), Name) of
+    ?DEBUG("Getting package ~ts resource from repo ~ts", [Name, maps:get(repo_url, RepoConfig, undefined)]),
+    try r3_hex_repo:get_package(get_package_repo_config(RepoConfig), Name) of
         {ok, {200, _Headers, Releases}} ->
             _ = insert_releases(Name, Releases, Repo, ?PACKAGE_TABLE),
             {ok, RegistryDir} = rebar_packages:registry_dir(State),

src/rebar_pkg_resource.erl

@@ -210,11 +210,11 @@ store_etag_in_cache(Path, ETag) ->
       UpdateETag :: boolean(),
       Res :: ok | {unexpected_hash, integer(), integer()} | {fetch_fail, binary(), binary()}
            | {bad_registry_checksum, integer(), integer()} | {error, _}.
-cached_download(TmpDir, CachePath, Pkg={pkg, Name, Vsn, _OldHash, _Hash, RepoConfig}, State, ETag,
+cached_download(TmpDir, CachePath, Pkg={pkg, Name, Vsn, _OldHash, _Hash, RepoConfig}, _State, ETag,
                 ETagPath, UpdateETag) ->
-    CDN = rebar_state:maybe_default_cdn(State),
-    ?DEBUG("Downloading package ~ts from repo ~ts", [Name, CDN]),
-    case request(RepoConfig#{repo_url => CDN}, Name, Vsn, ETag) of
+    RepoUrl = maps:get(repo_url, RepoConfig, undefined),
+    ?DEBUG("Downloading package ~ts from repo ~ts", [Name, RepoUrl]),
+    case request(RepoConfig, Name, Vsn, ETag) of
         {ok, cached} ->
             ?DEBUG("Version cached at ~ts is up to date, reusing it", [CachePath]),
             serve_from_cache(TmpDir, CachePath, Pkg);

src/rebar_state.erl

@@ -497,7 +497,7 @@ add_provider(State=#state_t{providers=Providers, allow_provider_overrides=false}
 -spec maybe_default_cdn(t()) -> binary().
 maybe_default_cdn(State) ->
     CDN = rebar_state:get(State, rebar_packages_cdn, ?DEFAULT_CDN),
-    rebar_utils:to_binary(CDN).
+    rebar_utils:to_binary(rebar_utils:to_binary(CDN)).
 
 -dialyzer({no_match, create_logic_providers/2}). % we want to be permissive with providers:new/2
 create_logic_providers(ProviderModules, State0) ->