fix(bazel-module): Revert "feat(bazel-module): Add support for rules_img" (#37501)

Author: rarkins

lib/modules/manager/bazel-module/extract.spec.ts

@@ -618,121 +618,5 @@ describe('modules/manager/bazel-module/extract', () => {
         ],
       });
     });
-
-    it('returns rules_img pull dependencies', async () => {
-      const input = codeBlock`
-        pull = use_repo_rule("@rules_img//img:pull.bzl", "pull")
-
-        pull(
-          name = "ubuntu",
-          digest = "sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02",
-          registry = "index.docker.io",
-          repository = "library/ubuntu",
-          tag = "24.04",
-        )
-      `;
-      const res = await extractPackageFile(input, 'MODULE.bazel');
-
-      expect(res).toEqual({
-        deps: [
-          {
-            datasource: 'docker',
-            depType: 'rules_img_pull',
-            depName: 'ubuntu',
-            packageName: 'index.docker.io/library/ubuntu',
-            currentValue: '24.04',
-            currentDigest:
-              'sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02',
-            replaceString: expect.stringContaining('pull('),
-          },
-        ],
-      });
-    });
-
-    it('returns rules_img pull dependencies without tag', async () => {
-      const input = codeBlock`
-        pull = use_repo_rule("@rules_img//img:pull.bzl", "pull")
-
-        pull(
-          name = "distroless_cc",
-          digest = "sha256:d1b8e4c52be1111aa108e959ef2a822299bb70fd1819dd250871a2601ca1e4b6",
-          registry = "gcr.io",
-          repository = "distroless/cc-debian12",
-        )
-      `;
-      const res = await extractPackageFile(input, 'MODULE.bazel');
-
-      expect(res).toEqual({
-        deps: [
-          {
-            datasource: 'docker',
-            depType: 'rules_img_pull',
-            depName: 'distroless_cc',
-            packageName: 'gcr.io/distroless/cc-debian12',
-            currentDigest:
-              'sha256:d1b8e4c52be1111aa108e959ef2a822299bb70fd1819dd250871a2601ca1e4b6',
-            replaceString: expect.stringContaining('pull('),
-          },
-        ],
-      });
-    });
-
-    it('ignores non-rules_img use_repo_rule calls', async () => {
-      const input = codeBlock`
-        other_rule = use_repo_rule("@some_other//path:rule.bzl", "other_rule")
-
-        pull(
-          name = "ubuntu",
-          digest = "sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02",
-          registry = "index.docker.io",
-          repository = "library/ubuntu",
-          tag = "24.04",
-        )
-      `;
-      const res = await extractPackageFile(input, 'MODULE.bazel');
-
-      expect(res).toBeNull();
-    });
-
-    it('ignores non-rules_img use_repo_rule calls that use the name pull', async () => {
-      const input = codeBlock`
-        pull = use_repo_rule("@some_other//path:rule.bzl", "pull")
-
-        pull(
-          name = "test",
-          value = "ignored",
-        )
-      `;
-      const res = await extractPackageFile(input, 'MODULE.bazel');
-
-      expect(res).toBeNull();
-    });
-
-    it('handles multiple rules_img pulls', async () => {
-      const input = codeBlock`
-        pull = use_repo_rule("@rules_img//img:pull.bzl", "pull")
-
-        pull(
-          name = "ubuntu",
-          digest = "sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02",
-          registry = "index.docker.io",
-          repository = "library/ubuntu",
-          tag = "24.04",
-        )
-
-        pull(
-          name = "cuda",
-          digest = "sha256:f353ffca86e0cd93ab2470fe274ecf766519c24c37ed58cc2f91d915f7ebe53c",
-          registry = "index.docker.io",
-          repository = "nvidia/cuda",
-          tag = "12.8.1-cudnn-devel-ubuntu20.04",
-        )
-      `;
-      const res = await extractPackageFile(input, 'MODULE.bazel');
-
-      expect(res?.deps).toHaveLength(2);
-      expect(res?.deps[0].depName).toBe('ubuntu');
-      expect(res?.deps[1].depName).toBe('cuda');
-    });
   });
 });

lib/modules/manager/bazel-module/extract.ts

@@ -8,7 +8,6 @@ import { parse } from './parser';
 import type { ResultFragment } from './parser/fragments';
 import { RuleToMavenPackageDep, fillRegistryUrls } from './parser/maven';
 import { RuleToDockerPackageDep } from './parser/oci';
-import { RulesImgPullToDockerPackageDep } from './parser/rules-img';
 import {
   GitRepositoryToPackageDep,
   RuleToBazelModulePackageDep,
@@ -25,7 +24,6 @@ export async function extractPackageFile(
     const gitRepositoryDeps = extractGitRepositoryDeps(records);
     const mavenDeps = extractMavenDeps(records);
     const dockerDeps = LooseArray(RuleToDockerPackageDep).parse(records);
-    const rulesImgDeps = extractRulesImgDeps(records);
 
     if (gitRepositoryDeps.length) {
       pfc.deps.push(...gitRepositoryDeps);
@@ -39,10 +37,6 @@ export async function extractPackageFile(
       pfc.deps.push(...dockerDeps);
     }
 
-    if (rulesImgDeps.length) {
-      pfc.deps.push(...rulesImgDeps);
-    }
-
     return pfc.deps.length ? pfc : null;
   } catch (err) {
     logger.debug({ err, packageFile }, 'Failed to parse bazel module file.');
@@ -82,7 +76,3 @@ function extractMavenDeps(records: ResultFragment[]): PackageDependency[] {
     .transform(fillRegistryUrls)
     .parse(records);
 }
-
-function extractRulesImgDeps(records: ResultFragment[]): PackageDependency[] {
-  return LooseArray(RulesImgPullToDockerPackageDep).parse(records);
-}

lib/modules/manager/bazel-module/parser/context.ts

@@ -3,7 +3,6 @@ import type {
   ArrayFragment,
   ExtensionTagFragment,
   PreparedExtensionTagFragment,
-  RepoRuleFunctionCallFragment,
   ResultFragment,
   RuleFragment,
 } from './fragments';
@@ -34,22 +33,10 @@ export class Ctx implements CtxCompatible {
   results: ResultFragment[];
   stack: AllFragments[];
 
-  // Track repo rule assignments and function mappings
-  private repoRuleFunctions: Map<
-    string,
-    { loadPath: string; originalFunctionName: string }
-  >;
-  private currentRepoRuleAssignment?: {
-    variableName: string;
-    loadPath?: string;
-    originalFunctionName?: string;
-  };
-
   constructor(source: string) {
     this.source = source;
     this.results = [];
     this.stack = [];
-    this.repoRuleFunctions = new Map();
   }
 
   private get safeCurrent(): AllFragments | undefined {
@@ -80,16 +67,6 @@ export class Ctx implements CtxCompatible {
     throw new Error('Requested current extension tag, but does not exist.');
   }
 
-  private get currentRepoRuleFunctionCall(): RepoRuleFunctionCallFragment {
-    const current = this.current;
-    if (current.type === 'repoRuleFunctionCall') {
-      return current;
-    }
-    throw new Error(
-      'Requested current repo rule function call, but does not exist.',
-    );
-  }
-
   private get currentArray(): ArrayFragment {
     const current = this.current;
     if (current.type === 'array') {
@@ -133,20 +110,14 @@ export class Ctx implements CtxCompatible {
         return true;
       }
       if (
-        (parent.type === 'rule' ||
-          parent.type === 'extensionTag' ||
-          parent.type === 'repoRuleFunctionCall') &&
+        (parent.type === 'rule' || parent.type === 'extensionTag') &&
         current.type === 'attribute' &&
         current.value !== undefined
       ) {
         parent.children[current.name] = current.value;
         return true;
       }
-    } else if (
-      current.type === 'rule' ||
-      current.type === 'extensionTag' ||
-      current.type === 'repoRuleFunctionCall'
-    ) {
+    } else if (current.type === 'rule' || current.type === 'extensionTag') {
       this.results.push(current);
       return true;
     }
@@ -232,79 +203,4 @@ export class Ctx implements CtxCompatible {
     array.isComplete = true;
     return this.processStack();
   }
-
-  // Repo rule assignment methods
-  startRepoRuleAssignment(variableName: string): Ctx {
-    this.currentRepoRuleAssignment = { variableName };
-    return this;
-  }
-
-  addRepoRuleLoadPath(loadPath: string): Ctx {
-    if (this.currentRepoRuleAssignment) {
-      this.currentRepoRuleAssignment.loadPath = loadPath;
-    }
-    return this;
-  }
-
-  addRepoRuleFunctionName(originalFunctionName: string): Ctx {
-    if (this.currentRepoRuleAssignment) {
-      this.currentRepoRuleAssignment.originalFunctionName =
-        originalFunctionName;
-    }
-    return this;
-  }
-
-  endRepoRuleAssignment(): Ctx {
-    if (
-      this.currentRepoRuleAssignment?.loadPath &&
-      this.currentRepoRuleAssignment?.originalFunctionName
-    ) {
-      // Only track rules_img repo rules - support both load paths used in tests
-      const rulesImgLoadPaths = [
-        '@rules_img//img:pull.bzl',
-        '@rules_img//img/private/repository_rules:pull.bzl',
-      ];
-
-      if (rulesImgLoadPaths.includes(this.currentRepoRuleAssignment.loadPath)) {
-        this.repoRuleFunctions.set(
-          this.currentRepoRuleAssignment.variableName,
-          {
-            loadPath: this.currentRepoRuleAssignment.loadPath,
-            originalFunctionName:
-              this.currentRepoRuleAssignment.originalFunctionName,
-          },
-        );
-      }
-    }
-    this.currentRepoRuleAssignment = undefined;
-    return this;
-  }
-
-  // Dynamic function call methods
-  isRulesImgFunction(functionName: string): boolean {
-    return this.repoRuleFunctions.has(functionName);
-  }
-
-  startDynamicFunctionCall(functionName: string, offset: number): Ctx {
-    const repoRuleInfo = this.repoRuleFunctions.get(functionName);
-    if (!repoRuleInfo) {
-      throw new Error(`Function ${functionName} not found in repo rules`);
-    }
-
-    const functionCall = fragments.repoRuleFunctionCall(
-      functionName,
-      repoRuleInfo.loadPath,
-      repoRuleInfo.originalFunctionName,
-      offset,
-    );
-    this.stack.push(functionCall);
-    return this;
-  }
-
-  endDynamicFunctionCall(offset: number): Ctx {
-    const functionCall = this.currentRepoRuleFunctionCall;
-    functionCall.isComplete = true;
-    functionCall.rawString = this.source.slice(functionCall.offset, offset);
-    return this.processStack();
-  }
 }

lib/modules/manager/bazel-module/parser/fragments.ts

@@ -57,19 +57,6 @@ export const ExtensionTagFragmentSchema = z.object({
   offset: z.number(), // start offset in the source string
   rawString: z.string().optional(), // raw source string
 });
-export const RepoRuleFunctionCallSchema = z.object({
-  type: z.literal('repoRuleFunctionCall'),
-  // The variable name used for the function call (e.g. "pull")
-  functionName: z.string(),
-  // The load path that was imported (e.g. "@rules_img//img:pull.bzl")
-  loadPath: z.string(),
-  // The original function name from use_repo_rule (e.g. "pull")
-  originalFunctionName: z.string(),
-  children: LooseRecord(ValueFragmentsSchema),
-  isComplete: z.boolean(),
-  offset: z.number(), // start offset in the source string
-  rawString: z.string().optional(), // raw source string
-});
 export const AttributeFragmentSchema = z.object({
   type: z.literal('attribute'),
   name: z.string(),
@@ -83,7 +70,6 @@ export const AllFragmentsSchema = z.discriminatedUnion('type', [
   RuleFragmentSchema,
   PreparedExtensionTagFragmentSchema,
   ExtensionTagFragmentSchema,
-  RepoRuleFunctionCallSchema,
   StringFragmentSchema,
 ]);
 
@@ -98,15 +84,9 @@ export type PreparedExtensionTagFragment = z.infer<
   typeof PreparedExtensionTagFragmentSchema
 >;
 export type ExtensionTagFragment = z.infer<typeof ExtensionTagFragmentSchema>;
-export type RepoRuleFunctionCallFragment = z.infer<
-  typeof RepoRuleFunctionCallSchema
->;
 export type StringFragment = z.infer<typeof StringFragmentSchema>;
 export type ValueFragments = z.infer<typeof ValueFragmentsSchema>;
-export type ResultFragment =
-  | RuleFragment
-  | ExtensionTagFragment
-  | RepoRuleFunctionCallFragment;
+export type ResultFragment = RuleFragment | ExtensionTagFragment;
 
 export function string(value: string): StringFragment {
   return {
@@ -172,27 +152,6 @@ export function extensionTag(
   };
 }
 
-export function repoRuleFunctionCall(
-  functionName: string,
-  loadPath: string,
-  originalFunctionName: string,
-  offset: number,
-  children: ChildFragments = {},
-  rawString?: string,
-  isComplete = false,
-): RepoRuleFunctionCallFragment {
-  return {
-    type: 'repoRuleFunctionCall',
-    functionName,
-    loadPath,
-    originalFunctionName,
-    offset,
-    rawString,
-    isComplete,
-    children,
-  };
-}
-
 export function attribute(
   name: string,
   value?: ValueFragments,

lib/modules/manager/bazel-module/parser/index.ts

@@ -2,15 +2,9 @@ import { lang, query as q } from 'good-enough-parser';
 import { Ctx } from './context';
 import { extensionTags } from './extension-tags';
 import type { ResultFragment } from './fragments';
-import { dynamicFunctionCall, repoRuleAssignment } from './repo-rules';
 import { rules } from './rules';
 
-const rule = q.alt<Ctx>(
-  rules,
-  extensionTags,
-  repoRuleAssignment,
-  dynamicFunctionCall,
-);
+const rule = q.alt<Ctx>(rules, extensionTags);
 
 const query = q.tree<Ctx>({
   type: 'root-tree',