Skip to content

Commit

Permalink
Revert "Make http_archive honor $HOME/.netrc"
Browse files Browse the repository at this point in the history
This reverts commit c26e339.

Work on bazelbuild#9327.
  • Loading branch information
katre committed Sep 5, 2019
1 parent f33bf96 commit bfe7c60
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 46 deletions.
37 changes: 0 additions & 37 deletions src/test/shell/bazel/skylark_repository_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1852,41 +1852,4 @@ EOF
|| fail "Expected success despite needing a file behind basic auth"
}

function test_implicit_netrc() {
mkdir x
echo 'exports_files(["file.txt"])' > x/BUILD
echo 'Hello World' > x/file.txt
tar cvf x.tar x
sha256=$(sha256sum x.tar | head -c 64)
serve_file_auth x.tar

export HOME=`pwd`
cat > .netrc <<'EOF'
machine 127.0.0.1
login foo
password bar
EOF

mkdir main
cd main
cat > WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name="ext",
url = "http://127.0.0.1:$nc_port/x.tar",
sha256="$sha256",
)
EOF
cat > BUILD <<'EOF'
genrule(
name = "it",
srcs = ["@ext//x:file.txt"],
outs = ["it.txt"],
cmd = "cp $< $@",
)
EOF
bazel build //:it \
|| fail "Expected success despite needing a file behind basic auth"
}

run_suite "local repository tests"
10 changes: 1 addition & 9 deletions tools/build_defs/repo/http.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,7 @@ def _get_auth(ctx, urls):
netrc = read_netrc(ctx, ctx.attr.netrc)
return use_netrc(netrc, urls)

if "HOME" in ctx.os.environ:
if not ctx.os.name.startswith("windows"):
netrcfile = "%s/.netrc" % (ctx.os.environ["HOME"],)
if ctx.execute(["test", "-f", netrcfile]).return_code == 0:
netrc = read_netrc(ctx, netrcfile)
return use_netrc(netrc, urls)

# TODO: Search at a similarly canonical place for Windows as well

# TODO: use ~/.netrc instead, if it exists and is readable
return {}

def _http_archive_impl(ctx):
Expand Down

0 comments on commit bfe7c60

Please sign in to comment.