factor our process_ctx

Author: kellyma2

pkg/rpm_pfg.bzl

@@ -151,20 +151,20 @@ def _make_absolute_if_not_already_or_is_macro(path):
 # TODO(nacl, #459): These are redundant with functions and structures in
 # pkg/private/pkg_files.bzl.  We should really use the infrastructure provided
 # there, but as of writing, it's not quite ready.
-def _process_files(pfi, origin_label, grouping_label, file_base, dest_check_map, packaged_directories, rpm_files_list, install_script_pieces):
+def _process_files(pfi, origin_label, grouping_label, file_base, process_ctx):
     for dest, src in pfi.dest_src_map.items():
         metadata = _package_contents_metadata(origin_label, grouping_label)
-        if dest in dest_check_map:
-            _conflicting_contents_error(dest, metadata, dest_check_map[dest])
+        if dest in process_ctx.dest_check_map:
+            _conflicting_contents_error(dest, metadata, process_ctx.dest_check_map[dest])
         else:
-            dest_check_map[dest] = metadata
+            process_ctx.dest_check_map[dest] = metadata
 
         abs_dest = _make_absolute_if_not_already_or_is_macro(dest)
         if src.is_directory:
             # Set aside TreeArtifact information for external processing
             #
             # @unsorted-dict-items
-            packaged_directories.append({
+            process_ctx.packaged_directories.append({
                 "src": src,
                 "dest": abs_dest,
                 # This doesn't exactly make it extensible, but it saves
@@ -174,43 +174,43 @@ def _process_files(pfi, origin_label, grouping_label, file_base, dest_check_map,
             })
         else:
             # Files are well-known.  Take care of them right here.
-            rpm_files_list.append(_FILE_MODE_STANZA_FMT.format(file_base, abs_dest))
-            install_script_pieces.append(_INSTALL_FILE_STANZA_FMT.format(
+            process_ctx.rpm_files_list.append(_FILE_MODE_STANZA_FMT.format(file_base, abs_dest))
+            process_ctx.install_script_pieces.append(_INSTALL_FILE_STANZA_FMT.format(
                 src.path,
                 abs_dest,
             ))
 
-def _process_dirs(pdi, origin_label, grouping_label, file_base, dest_check_map, packaged_directories, rpm_files_list, install_script_pieces):
+def _process_dirs(pdi, origin_label, grouping_label, file_base, process_ctx):
     for dest in pdi.dirs:
         metadata = _package_contents_metadata(origin_label, grouping_label)
-        if dest in dest_check_map:
-            _conflicting_contents_error(dest, metadata, dest_check_map[dest])
+        if dest in process_ctx.dest_check_map:
+            _conflicting_contents_error(dest, metadata, process_ctx.dest_check_map[dest])
         else:
-            dest_check_map[dest] = metadata
+            process_ctx.dest_check_map[dest] = metadata
 
         abs_dirname = _make_absolute_if_not_already_or_is_macro(dest)
-        rpm_files_list.append(_FILE_MODE_STANZA_FMT.format(file_base, abs_dirname))
+        process_ctx.rpm_files_list.append(_FILE_MODE_STANZA_FMT.format(file_base, abs_dirname))
 
-        install_script_pieces.append(_INSTALL_DIR_STANZA_FMT.format(
+        process_ctx.install_script_pieces.append(_INSTALL_DIR_STANZA_FMT.format(
             abs_dirname,
         ))
 
-def _process_symlink(psi, origin_label, grouping_label, file_base, dest_check_map, packaged_directories, rpm_files_list, install_script_pieces):
+def _process_symlink(psi, origin_label, grouping_label, file_base, process_ctx):
     metadata = _package_contents_metadata(origin_label, grouping_label)
-    if psi.destination in dest_check_map:
-        _conflicting_contents_error(psi.destination, metadata, dest_check_map[psi.destination])
+    if psi.destination in process_ctx.dest_check_map:
+        _conflicting_contents_error(psi.destination, metadata, process_ctx.dest_check_map[psi.destination])
     else:
-        dest_check_map[psi.destination] = metadata
+        process_ctx.dest_check_map[psi.destination] = metadata
 
     abs_dest = _make_absolute_if_not_already_or_is_macro(psi.destination)
-    rpm_files_list.append(_FILE_MODE_STANZA_FMT.format(file_base, abs_dest))
-    install_script_pieces.append(_INSTALL_SYMLINK_STANZA_FMT.format(
+    process_ctx.rpm_files_list.append(_FILE_MODE_STANZA_FMT.format(file_base, abs_dest))
+    process_ctx.install_script_pieces.append(_INSTALL_SYMLINK_STANZA_FMT.format(
         abs_dest,
         psi.target,
         psi.attributes["mode"],
     ))
 
-def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, install_script_pieces):
+def _process_dep(dep, process_ctx):
     # NOTE: This does not detect cases where directories are not named
     # consistently.  For example, all of these may collide in reality, but
     # won't be detected by the below:
@@ -233,10 +233,7 @@ def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, inst
             dep.label,  # origin label
             None,  # group label
             _make_filetags(dep[PackageFilesInfo].attributes),  # file_base
-            dest_check_map,
-            packaged_directories,
-            rpm_files_list,
-            install_script_pieces,
+            process_ctx,
         )
 
     if PackageDirsInfo in dep:
@@ -245,10 +242,7 @@ def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, inst
             dep.label,  # origin label
             None,  # group label
             _make_filetags(dep[PackageDirsInfo].attributes, "%dir"),  # file_base
-            dest_check_map,
-            packaged_directories,
-            rpm_files_list,
-            install_script_pieces,
+            process_ctx,
         )
 
     if PackageSymlinkInfo in dep:
@@ -257,10 +251,7 @@ def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, inst
             dep.label,  # origin label
             None,  # group label
             _make_filetags(dep[PackageSymlinkInfo].attributes),  # file_base
-            dest_check_map,
-            packaged_directories,
-            rpm_files_list,
-            install_script_pieces,
+            process_ctx,
         )
 
     if PackageFilegroupInfo in dep:
@@ -272,10 +263,7 @@ def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, inst
                 origin,
                 dep.label,
                 file_base,
-                dest_check_map,
-                packaged_directories,
-                rpm_files_list,
-                install_script_pieces,
+                process_ctx,
             )
         for entry, origin in pfg_info.pkg_dirs:
             file_base = _make_filetags(entry.attributes, "%dir")
@@ -284,10 +272,7 @@ def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, inst
                 origin,
                 dep.label,
                 file_base,
-                dest_check_map,
-                packaged_directories,
-                rpm_files_list,
-                install_script_pieces,
+                process_ctx,
             )
 
         for entry, origin in pfg_info.pkg_symlinks:
@@ -297,10 +282,7 @@ def _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, inst
                 origin,
                 dep.label,
                 file_base,
-                dest_check_map,
-                packaged_directories,
-                rpm_files_list,
-                install_script_pieces,
+                process_ctx,
             )
 
 #### Rule implementation
@@ -571,8 +553,15 @@ def _pkg_rpm_impl(ctx):
     # produce an installation script that is longer than necessary.  A better
     # implementation would track directories that are created and ensure that
     # they aren't unnecessarily recreated.
+
+    process_ctx = struct(
+        dest_check_map = dest_check_map,
+        packaged_directories = packaged_directories,
+        rpm_files_list = rpm_files_list,
+        install_script_pieces = install_script_pieces,
+    )
     for dep in ctx.attr.srcs:
-        _process_dep(dep, dest_check_map, packaged_directories, rpm_files_list, install_script_pieces)
+        _process_dep(dep, process_ctx)
 
     #### Procedurally-generated scripts/lists (%install, %files)