Skip to content
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

Jump to bottom

chore: replace github.com/ghodss/yaml with sigs.k8s.io/yaml #1808

Merged
merged 1 commit into from
Sep 10, 2024
Merged

chore: replace github.com/ghodss/yaml with sigs.k8s.io/yaml #1808

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: 0 additions & 2 deletions e2e/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
Expand Down
3 changes: 1 addition & 2 deletions pkg/sdk/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
github.com/cisco-open/operator-tools v0.36.0
github.com/ghodss/yaml v1.0.0
github.com/go-logr/zapr v1.3.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.34.1
Expand All @@ -23,6 +22,7 @@ require (
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/yaml v1.4.0
)

require (
Expand Down Expand Up @@ -81,5 +81,4 @@ require (
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
2 changes: 0 additions & 2 deletions pkg/sdk/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/concat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestConcat(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/dedot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestDedot(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/detect_exceptions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestDetectExceptions(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/elasticsearch_genid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestElasticsearchGenId(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/enhance_k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestEnahnceK8s(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/geoip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestGeoIP(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/grep_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestGrepRegexp(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/kube_events_timestamp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestKubeEventsTimestamp(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestParser(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/prometheus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestPrometheus(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/record_modifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestRecordModifier(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/record_transformer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestRecordTransformer(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/stdout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestStdOut(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/sumologic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestSumoLogic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/tagnormaliser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestTagNormaliser(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/throttle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestThrottle(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/filter/useragent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package filter_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"

"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/aws_elasticsearch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"

"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/azurestore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestAzureStore(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/cloudwatch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TesCloudWatch(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/datadog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestDatadog(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/elasticsearch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestElasticSearch(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestFileOutputConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/format_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestFormatSingleValueConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/forward_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestForward(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/gcs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestGCS(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/gelf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestGELFOutputConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestHTTP(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/model/output/kafka_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package output_test
import (
"testing"

"github.com/ghodss/yaml"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestKafka(t *testing.T) {
Expand Down
Loading
Loading