Skip to content

If authFile is missing, try to use the user's default .netrc file (~/.netrc) #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grepwood wants to merge 1 commit into
base: master
Choose a base branch
from
Open

If authFile is missing, try to use the user's default .netrc file (~/.netrc) #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions 3rdparty/workspace.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
# Do not edit. bazel-deps autogenerates this file from dependencies.yaml.
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "read_netrc", "read_user_netrc", "use_netrc")

def _get_auth(ctx, urls):
netrc = {}
if 'netrc' in dir(ctx.attr):
netrc = read_netrc(ctx, ctx.attr.netrc)
else:
netrc = read_user_netrc(ctx)
return use_netrc(netrc, urls, {})

def _jar_artifact_impl(ctx):
jar_name = "%s.jar" % ctx.name
ctx.download(
output = ctx.path("jar/%s" % jar_name),
url = ctx.attr.urls,
sha256 = ctx.attr.sha256,
executable = False
executable = False,
auth = _get_auth(ctx, ctx.attr.urls)
)
src_name = "%s-sources.jar" % ctx.name
srcjar_attr = ""
Expand All @@ -15,7 +26,8 @@ def _jar_artifact_impl(ctx):
output = ctx.path("jar/%s" % src_name),
url = ctx.attr.src_urls,
sha256 = ctx.attr.src_sha256,
executable = False
executable = False,
auth = _get_auth(ctx, ctx.attr.src_urls)
)
srcjar_attr = '\n srcjar = ":%s",' % src_name

Expand Down
62 changes: 32 additions & 30 deletions src/scala/com/github/johnynek/bazel_deps/Writer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,38 +283,40 @@ object Writer {
}
.mkString("\n")

val ifAuth: String => String =
if (model.hasAuthFile) identity
else _ => ""

val jarArtifactImpl =
s"""${
if (model.hasAuthFile)
s"""|load("@bazel_tools//tools/build_defs/repo:utils.bzl", "read_netrc", "use_netrc")
|
|def _jar_artifact_impl(ctx):
| netrc = read_netrc(ctx, "${model.getAuthFile.get}")
| auth = use_netrc(netrc, ctx.attr.urls, {})
|""".stripMargin
else "def _jar_artifact_impl(ctx):"
s"""|load("@bazel_tools//tools/build_defs/repo:utils.bzl", "read_netrc", "read_user_netrc", "use_netrc")
|
|def _get_auth(ctx, urls):
| netrc = {}
| if 'netrc' in dir(ctx.attr):""".stripMargin
${
if(model.hasAuthFile) " netrc = read_netrc(ctx, "${model.getAuthFile.get}")"
else " netrc = read_netrc(ctx, ctx.attr.netrc)"
}
| jar_name = "%s.jar" % ctx.name
| ctx.download(
| output = ctx.path("jar/%s" % jar_name),
| url = ctx.attr.urls,
| sha256 = ctx.attr.sha256,
| executable = False${ifAuth(",\n auth = auth")}
| )
| src_name = "%s-sources.jar" % ctx.name
| srcjar_attr = ""
| has_sources = len(ctx.attr.src_urls) != 0
| if has_sources:${ifAuth("\n src_auth = use_netrc(netrc, ctx.attr.src_urls, {})")}
| ctx.download(
| output = ctx.path("jar/%s" % src_name),
| url = ctx.attr.src_urls,
| sha256 = ctx.attr.src_sha256,
| executable = False${ifAuth(",\n auth = src_auth")}
| )""".stripMargin
| else:
| netrc = read_user_netrc(ctx)
| return use_netrc(netrc, urls, {})
|
|def _jar_artifact_impl(ctx):
| jar_name = "%s.jar" % ctx.name
| ctx.download(
| output = ctx.path("jar/%s" % jar_name),
| url = ctx.attr.urls,
| sha256 = ctx.attr.sha256,
| executable = False,
| auth = _get_auth(ctx, ctx.attr.urls)
| )
| src_name = "%s-sources.jar" % ctx.name
| srcjar_attr = ""
| has_sources = len(ctx.attr.src_urls) != 0
| if has_sources:
| ctx.download(
| output = ctx.path("jar/%s" % src_name),
| url = ctx.attr.src_urls,
| sha256 = ctx.attr.src_sha256,
| executable = False,
| auth = _get_auth(ctx, ctx.attr.src_urls)
| )""".stripMargin

s"""# Do not edit. bazel-deps autogenerates this file from $depsFile.
|$jarArtifactImpl
Expand Down