bib: switch from pelletier/go-toml to BurntSushi/toml

I have no preference between these two, but we use BurntSushi everywhere else, so by doing this switch we have one less dependency.
osbuild · Jul 18, 2024 · ee95629 · ee95629
1 parent c972c20
commit ee95629
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/bib/go.mod b/bib/go.mod
@@ -3,11 +3,11 @@ module github.com/osbuild/bootc-image-builder/bib
 go 1.21
 
 require (
+	github.com/BurntSushi/toml v1.4.0
 	github.com/aws/aws-sdk-go v1.54.19
 	github.com/cheggaaa/pb/v3 v3.1.5
 	github.com/google/uuid v1.6.0
 	github.com/osbuild/images v0.71.0
-	github.com/pelletier/go-toml v1.9.5
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
@@ -19,7 +19,6 @@ require (
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/Microsoft/hcsshim v0.12.3 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect

diff --git a/bib/go.sum b/bib/go.sum
@@ -230,8 +230,6 @@ github.com/osbuild/images v0.71.0 h1:tmeqUU1cpaxyF/0gnMNigS3p9JDXIg/SDvPE1BkBIDU
 github.com/osbuild/images v0.71.0/go.mod h1:52FwDBdnr7DPTg/p0eFowZCadDx5S2qTiPfmUs+Ps3k=
 github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f h1:/UDgs8FGMqwnHagNDPGOlts35QkhAZ8by3DR7nMih7M=
 github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

diff --git a/bib/internal/buildconfig/config.go b/bib/internal/buildconfig/config.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pelletier/go-toml"
+	"github.com/BurntSushi/toml"
 	"github.com/sirupsen/logrus"
 
 	"github.com/osbuild/images/pkg/blueprint"
@@ -59,7 +59,7 @@ func decodeTomlBuildConfig(r io.Reader, what string) (*BuildConfig, error) {
 	dec := toml.NewDecoder(r)
 
 	var conf BuildConfig
-	if err := dec.Decode(&conf); err != nil {
+	if _, err := dec.Decode(&conf); err != nil {
 		return nil, fmt.Errorf("cannot decode %q: %w", what, err)
 	}
 	return &conf, nil