bzlmod: track of ignored dependencies

Now we also track ignored dependencies
bookingcom · Jan 4, 2024 · 8e110d3 · 8e110d3
1 parent 80c9ad0
commit 8e110d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmd/rpmtree.go b/cmd/rpmtree.go
@@ -208,6 +208,7 @@ func loadBzlModLockFile() (*bazel.BzlModLockFile, error) {
 			Name: rpmtreeopts.name,
 			BuildFile: rpmtreeopts.buildfile,
 			Arch: rpmtreeopts.arch,
+			ForceIgnoreWithDependencies: rpmtreeopts.forceIgnoreRegex,
 		}, nil
 	}
 

diff --git a/pkg/bazel/bzlmod.go b/pkg/bazel/bzlmod.go
@@ -46,6 +46,7 @@ type LockFileArgs struct {
 	Path string;
 	Bazeldnf string;
 	GeneratedVisibility []string;
+	ForceIgnoreWithDependencies []string;
 }
 
 func getStringValue(arg *build.AssignExpr) (string, bool) {
@@ -332,11 +333,12 @@ RepoFiles []string   `json:"repo-files"`
 Arch string          `json:"arch"`
 Required []string    `json:"required"`
 Version int          `json:"version"`
+ForceIgnoreWithDependencies []string `json:"force-ignore-with-dependencies"`
 
 Rpms []BzlModLockFileRPM `json:"rpms"`
 }
 
-const CURRENT_LOCK_FILE_VERSION = 1
+const CURRENT_LOCK_FILE_VERSION = 2
 
 func LoadBzlModLockFile(path string) (*BzlModLockFile, error) {
 	_, err := os.Stat(path)