@@ -89,15 +89,18 @@ GcloudInfo = provider(
89
89
fields = {
90
90
"gcloud_bin" : "Gcloud executable binary" ,
91
91
"gsutil_bin" : "Gsutil executable binary" ,
92
+ "gcloud_files" : "Gcloud files" ,
92
93
},
93
94
)
94
95
95
96
def _gcloud_toolchain_impl (ctx ):
96
97
gcloud = ctx .file .gcloud_bin
98
+ gcloud_files_var = ctx .file .gcloud_files
97
99
gsutil = ctx .file .gsutil_bin
98
100
99
101
template_variables = platform_common .TemplateVariableInfo ({
100
102
"GCLOUD_BIN" : gcloud .path ,
103
+ "GCLOUD_FILES" : gcloud_files_var .path ,
101
104
"GSUTIL_BIN" : gsutil .path ,
102
105
})
103
106
default_info = DefaultInfo (
@@ -106,6 +109,7 @@ def _gcloud_toolchain_impl(ctx):
106
109
)
107
110
gcloudinfo = GcloudInfo (
108
111
gcloud_bin = gcloud ,
112
+ gcloud_files = gcloud_files_var ,
109
113
gsutil_bin = gsutil ,
110
114
)
111
115
@@ -122,6 +126,7 @@ gcloud_toolchain = rule(
122
126
attrs = {
123
127
"gcloud_bin" : attr .label (allow_single_file = True , mandatory = True ),
124
128
"gsutil_bin" : attr .label (allow_single_file = True , mandatory = True ),
129
+ "gcloud_files" : attr .label (allow_single_file = True , mandatory = True ),
125
130
},
126
131
)
127
132
@@ -140,15 +145,15 @@ def _gcloud_repo_impl(rctx):
140
145
rctx .download_and_extract (
141
146
url = url ,
142
147
sha256 = sha ,
143
- stripPrefix = "google-cloud-sdk/bin " ,
148
+ stripPrefix = "google-cloud-sdk" ,
144
149
)
145
150
146
151
build_content = """
147
152
load("@masorange_rules_helm//gcs/private:gcloud_toolchain.bzl", "gcloud_toolchain")
148
153
149
- exports_files(["gcloud", "gsutil"])
154
+ exports_files(["bin/ gcloud", "bin/ gsutil", "lib/gcloud.py "])
150
155
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"])
152
157
"""
153
158
154
159
# Base BUILD file for this repository
0 commit comments