diff options
| author | Bryan Paxton <39971740+starbelly@users.noreply.github.com> | 2019-03-07 10:54:01 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2019-03-07 09:54:01 -0700 |
| commit | 209c02ec57c2cc3207ee0174c3af3675b8dc8f79 (patch) | |
| tree | e07b25a27a2c4cc438db75d8d066179b4e57f3f7 /src/rebar_packages.erl | |
| parent | 9e2e54afd74104ecb05c55e033803f41932eb940 (diff) | |
Fix fetching of private packages from orgs on hex repos (#2020)
- vendor in hex_core at v0.5.0
- Change where repo_name should be the org and not the parent
- Changed rebar_utils:url_append_path/2 to not explicitly add a '?',
this is returned in the Query chunk by http_uri:parse/1 (e.g., "?foo=bar")
- update organization_merging test to expect the sub-repo as the repo_name
- Add tests for rebar_utils:url_append_path/2
- Stop referencing/setting "organization" in config and use new
organization settings (api_repository and repo_organization)
- Do not set (assume) the read key is valid for any/every repo
- Set repo_organization and api_repository to org
- Update tests to check for new config opts
Diffstat (limited to 'src/rebar_packages.erl')
| -rw-r--r-- | src/rebar_packages.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl index fc68cab..a260e47 100644 --- a/src/rebar_packages.erl +++ b/src/rebar_packages.erl @@ -31,7 +31,7 @@ format_error({missing_package, Pkg}) -> -spec get(rebar_hex_repos:repo(), binary()) -> {ok, map()} | {error, term()}. get(Config, Name) -> - try hex_api_package:get(Config, Name) of + try r3_hex_api_package:get(Config, Name) of {ok, {200, _Headers, PkgInfo}} -> {ok, PkgInfo}; {ok, {404, _, _}} -> @@ -233,7 +233,7 @@ parse_checksum(Checksum) -> update_package(Name, RepoConfig=#{name := Repo}, State) -> ?MODULE:verify_table(State), - try hex_repo:get_package(get_package_repo_config(RepoConfig), Name) of + 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), @@ -244,7 +244,7 @@ update_package(Name, RepoConfig=#{name := Repo}, State) -> fail; Error -> ?DEBUG("Hex get_package request failed: ~p", [Error]), - %% TODO: add better log message. hex_core should export a format_error + %% TODO: add better log message. r3_hex_core should export a format_error ?WARN("Failed to update package from repo ~ts", [Repo]), fail catch @@ -255,8 +255,6 @@ update_package(Name, RepoConfig=#{name := Repo}, State) -> get_package_repo_config(RepoConfig=#{mirror_of := Repo}) -> get_package_repo_config(maps:remove(mirror_of, RepoConfig#{name => Repo})); -get_package_repo_config(RepoConfig=#{read_key := Key}) -> - get_package_repo_config(maps:remove(read_key, RepoConfig#{repo_key => Key})); get_package_repo_config(RepoConfig) -> RepoConfig. |