refactor: remove js_image_layer bazel5 legacy symlink detection (#1610)

js/private/image/index.ts

@@ -43,15 +43,6 @@ function findKeyByValue(entries: Entries, value: string): string | undefined {
     return undefined
 }
 
-function leftStrip(p: string, p1: string, p2: string) {
-    if (p.startsWith(p1)) {
-        return p.slice(p1.length)
-    } else if (p.startsWith(p2)) {
-        return p.slice(p2.length)
-    }
-    return p
-}
-
 async function readlinkSafe(p: string) {
     try {
         const link = await readlink(p)
@@ -64,37 +55,6 @@ async function readlinkSafe(p: string) {
     }
 }
 
-// TODO: drop once we no longer support bazel 5
-async function resolveSymlinkLegacy(relativeP: string) {
-    let prevHop = path.resolve(relativeP)
-    let hopped = false
-    let execrootOutOfSandbox = ''
-    let execroot = process.env.JS_BINARY__EXECROOT!
-    while (true) {
-        let nextHop = await readlinkSafe(prevHop)
-
-        if (!execrootOutOfSandbox && !nextHop.startsWith(execroot)) {
-            execrootOutOfSandbox = nextHop
-                .replace(relativeP, '')
-                .replace(/\/$/, '')
-            prevHop = nextHop
-            continue
-        }
-
-        let relativeNextHop = leftStrip(nextHop, execroot, execrootOutOfSandbox)
-        let relativePrevHop = leftStrip(prevHop, execroot, execrootOutOfSandbox)
-
-        if (relativeNextHop != relativePrevHop) {
-            prevHop = nextHop
-            hopped = true
-        } else if (!hopped) {
-            return undefined
-        } else {
-            return nextHop
-        }
-    }
-}
-
 async function resolveSymlink(p: string) {
     let prevHop = path.resolve(p)
     let hopped = false
@@ -254,11 +214,7 @@ export async function build(
     outputPath: string,
     compression: Compression,
     owner: Owner,
-    useLegacySymlinkDetection: boolean
 ) {
-    const resolveSymlinkFn = useLegacySymlinkDetection
-        ? resolveSymlinkLegacy
-        : resolveSymlink
     const output = pack()
     const existing_paths = new Set<string>()
 
@@ -325,7 +281,7 @@ export async function build(
             )
         }
 
-        const realp = await resolveSymlinkFn(dest)
+        const realp = await resolveSymlink(dest)
 
         // it's important that we don't treat any symlink pointing out of execroot since
         // bazel symlinks external files into sandbox to make them available to us.
@@ -392,7 +348,6 @@ if (import.meta.url === pathToFileURL(process.argv[1]).href) {
         outputPath,
         compression,
         owner,
-        useLegacySymlinkDetection,
     ] = process.argv.slice(2)
     const raw_entries = await readFile(entriesPath)
     const entries: Entries = JSON.parse(raw_entries.toString())
@@ -401,7 +356,6 @@ if (import.meta.url === pathToFileURL(process.argv[1]).href) {
         entries,
         outputPath,
         compression as Compression,
-        { uid, gid } as Owner,
-        !!useLegacySymlinkDetection
+        { uid, gid } as Owner
     )
 }

js/private/js_image_layer.bzl

@@ -14,7 +14,6 @@ js_image_layer(
 """
 
 load("@aspect_bazel_lib//lib:paths.bzl", "to_rlocation_path")
-load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 
 _DOC = """Create container image layers from js_binary targets.
@@ -217,8 +216,6 @@ def _build_layer(ctx, type, entries, inputs):
     args.add(output)
     args.add(ctx.attr.compression)
     args.add(ctx.attr.owner)
-    if not bazel_lib_utils.is_bazel_6_or_greater():
-        args.add("true")
 
     ctx.actions.run(
         inputs = inputs + [entries_output],