Rename node. ignores to rpm. ignores

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
openshift · Jul 11, 2023 · e37abb0 · e37abb0
1 parent 8381d70
commit e37abb0
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 34 deletions.
diff --git a/dist/releases/4.10/config.toml b/dist/releases/4.10/config.toml
@@ -27,13 +27,13 @@ filter_files = [
 filter_images = [ ]
 
 # these node exceptions via rpm have been manually validated
-[node."glibc-2.28-151.el8.x86_64"]
+[rpm."glibc-2.28-151.el8.x86_64"]
 filter_files = [ "/sbin/ldconfig" ]
 
-[node."cri-o-1.23.5-16.rhaos4.10.gitbb2cc9a.el8.x86_64"]
+[rpm."cri-o-1.23.5-16.rhaos4.10.gitbb2cc9a.el8.x86_64"]
 filter_files = [ "/usr/bin/pinns" ]
 
-[node."podman-catatonit-3.2.3-0.12.module+el8.4.0+14908+81312c48.x86_64"]
+[rpm."podman-catatonit-3.2.3-0.12.module+el8.4.0+14908+81312c48.x86_64"]
 filter_files = [ "/usr/libexec/catatonit/catatonit" ]
 
 # Payload Components

diff --git a/dist/releases/4.11/config.toml b/dist/releases/4.11/config.toml
@@ -28,48 +28,48 @@ filter_images = [ ]
 
 # Node Ignores
 # these node exceptions via rpm have been manually validated
-[node."glibc-2.28-189.5.el8_6.x86_64"]
+[rpm."glibc-2.28-189.5.el8_6.x86_64"]
 filter_files = [
   "/sbin/ldconfig"
 ]
 
-[node."ignition-2.14.0-5.rhaos4.11.el8.x86_64"]
+[rpm."ignition-2.14.0-5.rhaos4.11.el8.x86_64"]
 filter_files = [
   "/usr/lib/dracut/modules.d/30ignition/ignition"
 ]
 
-[node."skopeo-1.5.2-4.rhaos4.11.el8.x86_64"]
+[rpm."skopeo-1.5.2-4.rhaos4.11.el8.x86_64"]
 filter_files = [
   "/usr/bin/skopeo"
 ]
 
-[node."podman-catatonit-4.0.2-7.rhaos4.11.el8.x86_64"]
+[rpm."podman-catatonit-4.0.2-7.rhaos4.11.el8.x86_64"]
 filter_files = [
   "/usr/libexec/catatonit/catatonit"
 ]
 
-[node."runc-1.1.2-2.rhaos4.11.el8.x86_64"]
+[rpm."runc-1.1.2-2.rhaos4.11.el8.x86_64"]
 filter_files = [
   "/usr/bin/runc"
 ]
 
-[node."cri-o-1.24.6-2.rhaos4.11.git4bfe15a.el8.x86_64"]
+[rpm."cri-o-1.24.6-2.rhaos4.11.git4bfe15a.el8.x86_64"]
 filter_files = [
   "/usr/bin/crio",
   "/usr/bin/crio-status",
   "/usr/bin/pinns",
 ]
 
-[node."cri-tools-1.24.2-7.el8.x86_64"]
+[rpm."cri-tools-1.24.2-7.el8.x86_64"]
 filter_files = [ "/usr/bin/crictl" ]
 
-[node."podman-4.0.2-7.rhaos4.11.el8.x86_64"]
+[rpm."podman-4.0.2-7.rhaos4.11.el8.x86_64"]
 filter_Files = [
   "/usr/bin/podman",
   "/usr/libexec/podman/rootlessport",
 ]
 
-[node."containernetworking-plugins-1.0.1-6.rhaos4.11.el8.x86_64"]
+[rpm."containernetworking-plugins-1.0.1-6.rhaos4.11.el8.x86_64"]
 filter_files = [
   "/usr/libexec/cni/bandwidth",
   "/usr/libexec/cni/bridge",

diff --git a/dist/releases/4.12/config.toml b/dist/releases/4.12/config.toml
@@ -28,45 +28,45 @@ filter_images = [ ]
 
 # Node Ignores
 # these node exceptions via rpm have been manually validated
-[node."runc-1.1.6-4.rhaos4.12.el8.x86_64"]
+[rpm."runc-1.1.6-4.rhaos4.12.el8.x86_64"]
 filter_files = [ "/usr/bin/runc" ]
 
-[node."cri-tools-1.25.0-2.el8.x86_64"]
+[rpm."cri-tools-1.25.0-2.el8.x86_64"]
 filter_files = [ "/usr/bin/crictl" ]
 
-[node."glibc-2.28-189.5.el8_6.x86_64"]
+[rpm."glibc-2.28-189.5.el8_6.x86_64"]
 filter_files = [ "/sbin/ldconfig" ]
 
-[node."cri-o-1.25.3-5.rhaos4.12.git44a2cb2.el8.x86_64"]
+[rpm."cri-o-1.25.3-5.rhaos4.12.git44a2cb2.el8.x86_64"]
 filter_files = [
   "/usr/bin/crio",
   "/usr/bin/crio-status",
   "/usr/bin/pinns",
 ]
 
-[[node."podman-4.2.0-6.1.rhaos4.12.el8.x86_64".ignore_errors]]
+[[rpm."podman-4.2.0-6.1.rhaos4.12.el8.x86_64".ignore_errors]]
 error = "ErrGoMissingTag"
 files = [
   "/usr/bin/podman",
   "/usr/libexec/podman/rootlessport",
 ]
 
-[node."ignition-2.14.0-6.rhaos4.12.el8.x86_64"]
+[rpm."ignition-2.14.0-6.rhaos4.12.el8.x86_64"]
 filter_files = [
   "/usr/lib/dracut/modules.d/30ignition/ignition"
 ]
 
-[node."skopeo-1.9.4-3.1.rhaos4.12.el8.x86_64"]
+[rpm."skopeo-1.9.4-3.1.rhaos4.12.el8.x86_64"]
 filter_files = [
   "/usr/bin/skopeo"
 ]
 
-[node."podman-catatonit-4.2.0-6.1.rhaos4.12.el8.x86_64"]
+[rpm."podman-catatonit-4.2.0-6.1.rhaos4.12.el8.x86_64"]
 filter_files = [
   "/usr/libexec/catatonit/catatonit"
 ]
 
-[node."containernetworking-plugins-1.0.1-7.rhaos4.12.el8.x86_64"]
+[rpm."containernetworking-plugins-1.0.1-7.rhaos4.12.el8.x86_64"]
 filter_files = [
 "/usr/libexec/cni/bandwidth",
 "/usr/libexec/cni/bridge",

diff --git a/dist/releases/4.9/config.toml b/dist/releases/4.9/config.toml
@@ -28,18 +28,18 @@ filter_files = [
 filter_images = [ ]
 
 # these node exceptions via rpm have been manually validated
-[node."cri-o-1.22.5-20.rhaos4.9.gitdf6ec18.el8.x86_64"]
+[rpm."cri-o-1.22.5-20.rhaos4.9.gitdf6ec18.el8.x86_64"]
 filter_files = [
   "/usr/bin/pinns",
 ]
 
-[node."glibc-2.28-151.el8.x86_64"]
+[rpm."glibc-2.28-151.el8.x86_64"]
 filter_files = [ "/sbin/ldconfig" ]
 
-[node."cri-o-1.23.5-16.rhaos4.10.gitbb2cc9a.el8.x86_64"]
+[rpm."cri-o-1.23.5-16.rhaos4.10.gitbb2cc9a.el8.x86_64"]
 filter_files = [ "/usr/bin/pinns" ]
 
-[node."podman-catatonit-3.2.3-0.12.module+el8.4.0+14908+81312c48.x86_64"]
+[rpm."podman-catatonit-3.2.3-0.12.module+el8.4.0+14908+81312c48.x86_64"]
 filter_files = [ "/usr/libexec/catatonit/catatonit" ]
 
 # Payload Components

diff --git a/node_scan.go b/node_scan.go
@@ -40,7 +40,7 @@ func runNodeScan(ctx context.Context, cfg *Config, root string) []*ScanResults {
 			continue
 		}
 		ignoreErrors := cfg.IgnoreErrors
-		if op, ok := cfg.NodeIgnores[rpm]; ok {
+		if op, ok := cfg.RpmIgnores[rpm]; ok {
 			ignoreErrors = append(ignoreErrors, op.IgnoreErrors...)
 		}
 		for _, innerPath := range files {

diff --git a/types.go b/types.go
@@ -32,7 +32,7 @@ type Config struct {
 
 	PayloadIgnores map[string]IgnoreLists `toml:"payload"`
 	TagIgnores     map[string]IgnoreLists `toml:"tag"`
-	NodeIgnores    map[string]IgnoreLists `toml:"node"`
+	RpmIgnores     map[string]IgnoreLists `toml:"rpm"`
 }
 
 type IgnoreError struct {

diff --git a/types_config.go b/types_config.go
@@ -51,8 +51,8 @@ func (c *Config) isFileIgnoredByTag(path string, tag *imagev1.TagReference) bool
 	return false
 }
 
-func (c *Config) isFileIgnoredByNode(path string, tag string) bool {
-	if op, ok := c.NodeIgnores[tag]; ok {
+func (c *Config) isFileIgnoredByRpm(path string, tag string) bool {
+	if op, ok := c.RpmIgnores[tag]; ok {
 		return isMatch(path, op.FilterFiles)
 	}
 	return false
@@ -74,12 +74,8 @@ func (c *Config) IgnoreFileWithTag(path string, tag *imagev1.TagReference) bool
 	return c.isFileIgnoredByTag(path, tag)
 }
 
-func (c *Config) IgnoreFileByNode(path string, nodeVersion string) bool {
-	return c.isFileIgnoredByNode(path, nodeVersion)
-}
-
 func (c *Config) IgnoreFileByRpm(path string, rpm string) bool {
-	return c.isFileIgnoredByNode(path, rpm)
+	return c.isFileIgnoredByRpm(path, rpm)
 }
 
 func (c *Config) IgnoreDirWithComponent(path string, component *OpenshiftComponent) bool {