Make ScanNoLogs really silent

We were not making it with no logs fully unless we explicitely passed the option. Now it makes more sense as its full silent Signed-off-by: Itxaka <[email protected]>
kairos-io · Nov 6, 2024 · 06d17b4 · 06d17b4
1 parent 5aac4eb
commit 06d17b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -392,10 +392,11 @@ func FilterKeys(d []byte) ([]byte, error) {
 }
 
 // ScanNoLogs is a wrapper around Scan that sets the logger to null
+// Also sets the NoLogs option to true by default
 func ScanNoLogs(opts ...collector.Option) (c *Config, err error) {
 	log := sdkTypes.NewNullLogger()
 	result := NewConfig(WithLogger(log))
-	return scan(result, opts...)
+	return scan(result, append(opts, collector.NoLogs)...)
 }
 
 // Scan is a wrapper around collector.Scan that sets the logger to the default Kairos logger

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -228,7 +228,7 @@ var _ = Describe("Schema", func() {
 			cleanup()
 		})
 		It("Scan can override options", func() {
-			c, err := ScanNoLogs(collector.Readers(strings.NewReader(`uki-max-entries: 34`)), collector.NoLogs)
+			c, err := ScanNoLogs(collector.Readers(strings.NewReader(`uki-max-entries: 34`)))
 			Expect(err).ShouldNot(HaveOccurred())
 			Expect(c.UkiMaxEntries).To(Equal(34))
 		})
@@ -279,7 +279,7 @@ stages:
           groups:
             - "admin"
 `
-			config, err := pkgConfig.ScanNoLogs(collector.Readers(strings.NewReader(cc)), collector.NoLogs)
+			config, err := pkgConfig.ScanNoLogs(collector.Readers(strings.NewReader(cc)))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(config.CheckForUsers()).ToNot(HaveOccurred())
 		})
@@ -297,7 +297,7 @@ stages:
         kairos:
           passwd: "kairos"
 `
-			config, err := pkgConfig.ScanNoLogs(collector.Readers(strings.NewReader(cc)), collector.NoLogs)
+			config, err := pkgConfig.ScanNoLogs(collector.Readers(strings.NewReader(cc)))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(config.CheckForUsers()).To(HaveOccurred())
 		})

diff --git a/pkg/config/spec_test.go b/pkg/config/spec_test.go
@@ -458,19 +458,15 @@ var _ = Describe("Types", Label("types", "config"), func() {
 				})
 
 				It("sets image size to provided value if set in the config and image is smaller", func() {
-					cfg, err := config.ScanNoLogs(collector.Readers(strings.NewReader("#cloud-config\nupgrade:\n  system:\n    size: 666\n")),
-						collector.NoLogs,
-					)
+					cfg, err := config.ScanNoLogs(collector.Readers(strings.NewReader("#cloud-config\nupgrade:\n  system:\n    size: 666\n")))
 					// Set manually the config collector in the cfg file before unmarshalling the spec
 					c.Config = cfg.Config
 					spec, err := config.NewUpgradeSpec(c)
 					Expect(err).ShouldNot(HaveOccurred())
 					Expect(spec.Active.Size).To(Equal(uint(666)))
 				})
 				It("sets image size to default value if not set in the config and image is smaller", func() {
-					cfg, err := config.ScanNoLogs(collector.Readers(strings.NewReader("#cloud-config\nupgrade:\n  system:\n    uri: dir:/\n")),
-						collector.NoLogs,
-					)
+					cfg, err := config.ScanNoLogs(collector.Readers(strings.NewReader("#cloud-config\nupgrade:\n  system:\n    uri: dir:/\n")))
 					// Set manually the config collector in the cfg file before unmarshalling the spec
 					c.Config = cfg.Config
 					spec, err := config.NewUpgradeSpec(c)
@@ -479,7 +475,7 @@ var _ = Describe("Types", Label("types", "config"), func() {
 				})
 
 				It("sets image size to the source if default is smaller", func() {
-					cfg, err := config.ScanNoLogs(collector.Readers(strings.NewReader("#cloud-config\nupgrade:\n  system:\n    uri: file:/tmp/waka\n")), collector.NoLogs)
+					cfg, err := config.ScanNoLogs(collector.Readers(strings.NewReader("#cloud-config\nupgrade:\n  system:\n    uri: file:/tmp/waka\n")))
 					// Set manually the config collector in the cfg file before unmarshalling the spec
 					c.Config = cfg.Config
 					Expect(c.Fs.Mkdir("/tmp", 0777)).ShouldNot(HaveOccurred())