Skip to content

Commit 932dbd6

Browse files
carloshdezbuenocarloshdezbueno
and
carloshdezbueno
authored
feat(bazel|toolchain): Added gcloud.py to toolchain (#84)
* feat(bazel|toolchain): Added gcloud.py to toolchain * added gcloud py as attribute * added gcloud py as attribute * added gcloud py as attribute * added gcloud files * modified gcloud_files --------- Co-authored-by: carloshdezbueno <[email protected]>
1 parent 4614406 commit 932dbd6

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

gcs/private/gcloud_toolchain.bzl

+8-3
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,18 @@ GcloudInfo = provider(
8989
fields = {
9090
"gcloud_bin": "Gcloud executable binary",
9191
"gsutil_bin": "Gsutil executable binary",
92+
"gcloud_files": "Gcloud files",
9293
},
9394
)
9495

9596
def _gcloud_toolchain_impl(ctx):
9697
gcloud=ctx.file.gcloud_bin
98+
gcloud_files_var=ctx.file.gcloud_files
9799
gsutil=ctx.file.gsutil_bin
98100

99101
template_variables = platform_common.TemplateVariableInfo({
100102
"GCLOUD_BIN": gcloud.path,
103+
"GCLOUD_FILES": gcloud_files_var.path,
101104
"GSUTIL_BIN": gsutil.path,
102105
})
103106
default_info = DefaultInfo(
@@ -106,6 +109,7 @@ def _gcloud_toolchain_impl(ctx):
106109
)
107110
gcloudinfo = GcloudInfo(
108111
gcloud_bin = gcloud,
112+
gcloud_files = gcloud_files_var,
109113
gsutil_bin = gsutil,
110114
)
111115

@@ -122,6 +126,7 @@ gcloud_toolchain = rule(
122126
attrs = {
123127
"gcloud_bin": attr.label(allow_single_file = True, mandatory = True),
124128
"gsutil_bin": attr.label(allow_single_file = True, mandatory = True),
129+
"gcloud_files": attr.label(allow_single_file = True, mandatory = True),
125130
},
126131
)
127132

@@ -140,15 +145,15 @@ def _gcloud_repo_impl(rctx):
140145
rctx.download_and_extract(
141146
url = url,
142147
sha256 = sha,
143-
stripPrefix = "google-cloud-sdk/bin",
148+
stripPrefix = "google-cloud-sdk",
144149
)
145150

146151
build_content = """
147152
load("@masorange_rules_helm//gcs/private:gcloud_toolchain.bzl", "gcloud_toolchain")
148153
149-
exports_files(["gcloud", "gsutil"])
154+
exports_files(["bin/gcloud", "bin/gsutil", "lib/gcloud.py"])
150155
151-
gcloud_toolchain(name = "gcloud_toolchain", gcloud_bin = "gcloud", gsutil_bin = "gsutil", visibility = ["//visibility:public"])
156+
gcloud_toolchain(name = "gcloud_toolchain", gcloud_bin = "bin/gcloud", gsutil_bin = "bin/gsutil", gcloud_files = "lib/gcloud.py", visibility = ["//visibility:public"])
152157
"""
153158

154159
# Base BUILD file for this repository

0 commit comments

Comments
 (0)