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

chore: Switch go-yaml library to Nobl9 fork #482

Merged
merged 4 commits into from
Jul 8, 2024
+14 −17
Merged

chore: Switch go-yaml library to Nobl9 fork #482

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d695199
switch to fork
nieomylnieja Jul 5, 2024
9d93ad0
correct deprecated linter config
nieomylnieja Jul 5, 2024
e129786
Update .golangci.yml
nieomylnieja Jul 5, 2024
bd14568
Merge branch 'main' into switch-go-yaml-library-to-nobl9-fork
nieomylnieja Jul 8, 2024
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
6 changes: 3 additions & 3 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
run:
un:
timeout: 5m
nieomylnieja marked this conversation as resolved.
Show resolved Hide resolved
modules-download-mode: readonly
skip-dirs:
- scripts
skip-dirs-use-default: true

issues:
Expand All @@ -24,6 +22,8 @@ issues:
- linters:
- revive
text: "error-strings: error strings should not be capitalized or end with punctuation or a newline"
exclude-dirs:
- scripts
# Value 0 means show all.
max-issues-per-linter: 0
max-same-issues: 0
Expand Down
5 changes: 1 addition & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/MicahParks/keyfunc/v3 v3.3.3
github.com/aws/aws-sdk-go v1.54.14
github.com/bmatcuk/doublestar/v4 v4.6.1
github.com/goccy/go-yaml v1.11.3
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/nobl9/go-yaml v1.0.1
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.9.0
github.com/teambition/rrule-go v1.8.2
Expand All @@ -31,6 +31,3 @@ require (
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

// We might in the end decide to just go with the fork direcly.
replace github.com/goccy/go-yaml => github.com/nobl9/go-yaml v0.0.0-20240626115914-6b82fd0d61b9
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/nobl9/go-yaml v0.0.0-20240626115914-6b82fd0d61b9 h1:HWAY7k8zA8T3dgQRg6llwyWshguD6bIeaVXukNrnen4=
github.com/nobl9/go-yaml v0.0.0-20240626115914-6b82fd0d61b9/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
github.com/nobl9/go-yaml v1.0.1 h1:Aj1kSaYdRQTKlvS6ihvXzQJhCpoHhtf9nfA95zqWH4Q=
github.com/nobl9/go-yaml v1.0.1/go.mod h1:t7vCO8ctYdBweZxU5lUgxzAw31+ZcqJYeqRtrv+5RHI=
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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/docgen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"

"github.com/nobl9/nobl9-go/internal/validation"
"github.com/nobl9/nobl9-go/manifest"
Expand Down
2 changes: 1 addition & 1 deletion internal/manifest/v1alphatest/labels_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"
"github.com/stretchr/testify/require"

"github.com/nobl9/nobl9-go/internal/testutils"
Expand Down
2 changes: 1 addition & 1 deletion internal/manifest/v1alphatest/metadata_annotations_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"
"github.com/stretchr/testify/require"

"github.com/nobl9/nobl9-go/internal/testutils"
Expand Down
2 changes: 1 addition & 1 deletion internal/validation/example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"time"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"

"github.com/nobl9/nobl9-go/internal/validation"
)
Expand Down
2 changes: 1 addition & 1 deletion manifest/v1alpha/dataexport/data_export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dataexport
import (
"encoding/json"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"

"github.com/nobl9/nobl9-go/internal/serdeutil"
"github.com/nobl9/nobl9-go/manifest"
Expand Down
2 changes: 1 addition & 1 deletion manifest/v1alpha/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"
"github.com/pkg/errors"

"github.com/nobl9/nobl9-go/manifest"
Expand Down
2 changes: 1 addition & 1 deletion sdk/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"regexp"
"strings"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"
"github.com/pkg/errors"

"github.com/nobl9/nobl9-go/manifest"
Expand Down
2 changes: 1 addition & 1 deletion sdk/decode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"testing"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion sdk/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"io"

"github.com/goccy/go-yaml"
"github.com/nobl9/go-yaml"

"github.com/nobl9/nobl9-go/manifest"
)
Expand Down
Loading