Fix internal build error (#6800)

Add the missing arg for `extract_providers` and fix struct provider syntax.

Googlers, see cl/617097191.

#oncall

Author: yatbear

tensorboard/defs/internal/html.bzl

@@ -15,11 +15,7 @@
 """Rule for building the HTML binary."""
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_aspect")
-load("@io_bazel_rules_closure//closure/private:defs.bzl", "WebFilesInfo", "collect_runfiles", "long_path", "unfurl")  # buildifier: disable=bzl-visibility
-
-# TODO(ytjing): Directly import this function once it's synced from OSS to internal rules_closure repo.
-def extract_providers(deps, provider):
-    return [dep[provider] for dep in deps if provider in dep]
+load("@io_bazel_rules_closure//closure/private:defs.bzl", "WebFilesInfo", "collect_runfiles", "extract_providers", "long_path", "unfurl")  # buildifier: disable=bzl-visibility
 
 def _tb_combine_html_impl(ctx):
     """Compiles HTMLs into one HTML.

tensorboard/defs/web.bzl

@@ -22,19 +22,17 @@ load(
     "@io_bazel_rules_closure//closure/private:defs.bzl",
     "CLOSURE_LIBRARY_BASE_ATTR",
     "CLOSURE_WORKER_ATTR",
+    "ClosureJsLibraryInfo",
     "WebFilesInfo",
     "collect_js",
     "collect_runfiles",
     "difference",
+    "extract_providers",
     "long_path",
     "unfurl",
 )
 load("//tensorboard/defs/internal:html.bzl", _tb_combine_html = "tb_combine_html")
 
-# TODO(ytjing): Directly import this function once it's synced from OSS to internal rules_closure repo.
-def extract_providers(deps, provider):
-    return [dep[provider] for dep in deps if provider in dep]
-
 def _tf_web_library(ctx):
     if not ctx.attr.srcs:
         if ctx.attr.deps:
@@ -55,6 +53,7 @@ def _tf_web_library(ctx):
 
     # process what came before
     deps = extract_providers(ctx.attr.deps, provider = WebFilesInfo)
+    deps = unfurl(deps)
     webpaths = depset(transitive = [dep.webpaths for dep in deps])
 
     # process what comes now
@@ -96,11 +95,11 @@ def _tf_web_library(ctx):
         # If a rule exists purely to export other build rules, then it's
         # appropriate for the exported sources to be included in the
         # development web server.
-        export_deps = unfurl(extract_providers(ctx.attr.exports))
+        export_deps = unfurl(extract_providers(ctx.attr.exports, WebFilesInfo))
         devserver_manifests = depset(
             order = "postorder",
             transitive = (
-                [manifests] + [dep[WebFilesInfo].manifests for dep in export_deps]
+                [manifests] + [dep.manifests for dep in export_deps]
             ),
         )
     params = struct(
@@ -134,10 +133,10 @@ def _tf_web_library(ctx):
             manifests = manifests,
             webpaths = webpaths,
             dummy = dummy,
-            exports = export_deps,
+            exports = unfurl(extract_providers(ctx.attr.exports, WebFilesInfo)),
         ),
         collect_js(
-            unfurl(deps),
+            unfurl(extract_providers(ctx.attr.deps, provider = ClosureJsLibraryInfo)),
             ctx.files._closure_library_base,
         ),
         DefaultInfo(

tensorboard/defs/zipper.bzl

@@ -14,11 +14,7 @@
 
 """Rule for zipping Webfiles."""
 
-load("@io_bazel_rules_closure//closure/private:defs.bzl", "WebFilesInfo", "collect_runfiles", "unfurl")  # buildifier: disable=bzl-visibility
-
-# TODO(ytjing): Directly import this function once it's synced from OSS to internal rules_closure repo.
-def extract_providers(deps, provider):
-    return [dep[provider] for dep in deps if provider in dep]
+load("@io_bazel_rules_closure//closure/private:defs.bzl", "WebFilesInfo", "collect_runfiles", "extract_providers", "unfurl")  # buildifier: disable=bzl-visibility
 
 def _tensorboard_zip_file(ctx):
     deps = extract_providers(ctx.attr.deps, provider = WebFilesInfo)