Merge pull request #2304 from ripienaar/dependencies

(misc) Move to new yaml library

Author: ripienaar

aagent/machine/machine.go

@@ -14,16 +14,17 @@ import (
 	"sync"
 	"time"
 
+	"github.com/goccy/go-yaml"
+	"github.com/looplab/fsm"
+	"github.com/nats-io/jsm.go"
+	"github.com/sirupsen/logrus"
+
 	"github.com/choria-io/go-choria/aagent/model"
 	"github.com/choria-io/go-choria/aagent/watchers"
 	"github.com/choria-io/go-choria/backoff"
 	"github.com/choria-io/go-choria/inter"
 	"github.com/choria-io/go-choria/internal/util"
 	"github.com/choria-io/go-choria/lifecycle"
-	"github.com/ghodss/yaml"
-	"github.com/looplab/fsm"
-	"github.com/nats-io/jsm.go"
-	"github.com/sirupsen/logrus"
 )
 
 const dataFileName = "machine_data.json"

aagent/machine/machine_test.go

@@ -12,10 +12,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/goccy/go-yaml"
+	"github.com/sirupsen/logrus"
+
 	"github.com/choria-io/go-choria/aagent/plugin"
 	"github.com/choria-io/go-choria/aagent/watchers"
-	"github.com/ghodss/yaml"
-	"github.com/sirupsen/logrus"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

aagent/watchers/ccmmanifestwatcher/ccmmanifest.go

@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ghodss/yaml"
+	"github.com/goccy/go-yaml"
 
 	"github.com/choria-io/ccm/manager"
 	ccmmodel "github.com/choria-io/ccm/model"

aagent/watchers/machineswatcher/manager/plugin.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2021-2025, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -7,9 +7,10 @@ package machines_manager
 import (
 	_ "embed"
 
+	"github.com/goccy/go-yaml"
+
 	"github.com/choria-io/go-choria/aagent/machine"
 	"github.com/choria-io/go-choria/aagent/plugin"
-	"github.com/ghodss/yaml"
 )
 
 var (

aagent/watchers/pluginswatcher/machinesmanager/plugin.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2021-2025, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -7,9 +7,10 @@ package machines_manager
 import (
 	_ "embed"
 
+	"github.com/goccy/go-yaml"
+
 	"github.com/choria-io/go-choria/aagent/machine"
 	"github.com/choria-io/go-choria/aagent/plugin"
-	"github.com/ghodss/yaml"
 )
 
 var (

aagent/watchers/pluginswatcher/plugins_test.go

@@ -14,12 +14,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/choria-io/go-choria/aagent/model"
-	iu "github.com/choria-io/go-choria/internal/util"
-	"github.com/ghodss/yaml"
+	"github.com/goccy/go-yaml"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
+
+	"github.com/choria-io/go-choria/aagent/model"
+	iu "github.com/choria-io/go-choria/internal/util"
 )
 
 func TestMachine(t *testing.T) {

filter/facts/facts.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2019-2025, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,7 +13,7 @@ import (
 
 	"github.com/tidwall/gjson"
 
-	"github.com/ghodss/yaml"
+	"github.com/goccy/go-yaml"
 
 	"github.com/choria-io/go-choria/internal/util"
 )

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/fatih/structtag v1.2.0
 	github.com/freman/eventloghook v0.0.0-20250604093238-a195f2852650
 	github.com/ghodss/yaml v1.0.0
+	github.com/goccy/go-yaml v1.19.1
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/google/go-cmp v0.7.0
@@ -87,7 +88,6 @@ require (
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/goccy/go-yaml v1.19.1 // indirect
 	github.com/google/go-tpm v0.9.8 // indirect
 	github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f // indirect
 	github.com/google/uuid v1.6.0 // indirect

plugin/plugin.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2018-2025, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -10,9 +10,10 @@ import (
 	"sort"
 	"time"
 
+	"github.com/goccy/go-yaml"
+
 	"github.com/choria-io/go-choria/inter"
 	"github.com/choria-io/go-choria/internal/fs"
-	"github.com/ghodss/yaml"
 )
 
 // List is a list of plugins to load

protocol/filter_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2017-2025, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"github.com/goccy/go-yaml"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"