Skip to content

(misc) Move to new yaml library #2304

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
ripienaar merged 1 commit into from
Dec 31, 2025
Merged

(misc) Move to new yaml library #2304

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
9 changes: 5 additions & 4 deletions aagent/machine/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions aagent/machine/machine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion aagent/watchers/ccmmanifestwatcher/ccmmanifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions aagent/watchers/machineswatcher/manager/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 (
Expand Down
5 changes: 3 additions & 2 deletions aagent/watchers/pluginswatcher/machinesmanager/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 (
Expand Down
7 changes: 4 additions & 3 deletions aagent/watchers/pluginswatcher/plugins_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions filter/facts/facts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions plugin/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions protocol/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"
Expand Down
9 changes: 4 additions & 5 deletions providers/discovery/flatfile/flatfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2021-2022, 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

Expand All @@ -16,14 +16,13 @@ import (
"strings"
"time"

"github.com/choria-io/go-choria/inter"
"github.com/goccy/go-yaml"
"github.com/sirupsen/logrus"
"github.com/tidwall/gjson"

"github.com/choria-io/go-choria/filter/identity"
"github.com/choria-io/go-choria/inter"
"github.com/choria-io/go-choria/providers/agent/mcorpc/replyfmt"

"github.com/ghodss/yaml"
"github.com/sirupsen/logrus"
)

const validIdentity = `^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$`
Expand Down
7 changes: 4 additions & 3 deletions providers/discovery/inventory/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -12,11 +12,12 @@ import (
"path/filepath"
"strings"

"github.com/choria-io/go-choria/inter"
"github.com/expr-lang/expr/vm"
"github.com/ghodss/yaml"
"github.com/goccy/go-yaml"
"github.com/sirupsen/logrus"

"github.com/choria-io/go-choria/inter"

"github.com/choria-io/go-choria/filter/compound"
"github.com/choria-io/go-choria/internal/util"
"github.com/choria-io/go-choria/protocol"
Expand Down