Skip to content

deps: switch yaml libraries #1970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
achilleas-k merged 1 commit into from
Oct 27, 2025
Merged

deps: switch yaml libraries #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/gen-manifests/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/gobwas/glob"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/blueprint/pkg/blueprint"
"github.com/osbuild/images/internal/buildconfig"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ require (
github.com/stretchr/testify v1.11.1
github.com/ubccr/kerby v0.0.0-20230802201021-412be7bfaee5
github.com/vmware/govmomi v0.52.0
go.yaml.in/yaml/v3 v3.0.3
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
golang.org/x/oauth2 v0.30.0
golang.org/x/sys v0.35.0
golang.org/x/tools v0.36.0
google.golang.org/api v0.248.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
libvirt.org/go/libvirt v1.11006.0
)

Expand Down Expand Up @@ -200,5 +200,6 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
google.golang.org/grpc v1.74.2 // indirect
google.golang.org/protobuf v1.36.7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.5.0 // indirect
)
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,8 @@ go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeX
go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
Expand Down
2 changes: 1 addition & 1 deletion internal/environment/environment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/environment"
"github.com/osbuild/images/pkg/rpmmd"
Expand Down
2 changes: 1 addition & 1 deletion pkg/arch/arch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/common"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/bib/osinfo/osinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"

"github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/blueprint/pkg/blueprint"
"github.com/osbuild/images/pkg/bib/blueprintload"
Expand Down
2 changes: 1 addition & 1 deletion pkg/customizations/fsnode/fsnode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/common"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/datasizes/size_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/BurntSushi/toml"
"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/pkg/datasizes"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/disk/enums_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/pkg/disk"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/disk/partition_table_yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/pkg/datasizes"
"github.com/osbuild/images/pkg/disk"
Expand Down
2 changes: 1 addition & 1 deletion pkg/distro/defs/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"sort"
"text/template"

"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/data/distrodefs"
"github.com/osbuild/images/internal/common"
Expand Down
2 changes: 1 addition & 1 deletion pkg/distro/defs/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/common"
"github.com/osbuild/images/pkg/arch"
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/anaconda_installer_iso_tree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/common"
"github.com/osbuild/images/pkg/arch"
Expand Down
2 changes: 1 addition & 1 deletion pkg/osbuild/chrony_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/common"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/osbuild/modprobe_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestNewModprobeStage(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/osbuild/sshd_config_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/internal/common"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/osbuild/udev_rules_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package osbuild
import (
"testing"

"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion pkg/platform/platform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/pkg/platform"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/platform/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package platform_test
import (
"testing"

"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion pkg/runner/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/osbuild/images/pkg/runner"
)
Expand Down
Loading