Skip to content

Commit

Permalink
Merge pull request #2663 from Juneezee/chore/yaml
Browse files Browse the repository at this point in the history
chore: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml`
  • Loading branch information
lizardruss authored Aug 17, 2023
2 parents 2f751b0 + 5947e58 commit a32aff7
Show file tree
Hide file tree
Showing 21 changed files with 20 additions and 1,004 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ require (
github.com/evanphx/json-patch/v5 v5.1.0
github.com/fujiwara/shapeio v1.0.0
github.com/gertd/go-pluralize v0.2.0
github.com/ghodss/yaml v1.0.0
github.com/gliderlabs/ssh v0.3.5
github.com/go-resty/resty/v2 v2.7.0
github.com/google/go-containerregistry v0.13.0
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ github.com/fujiwara/shapeio v1.0.0/go.mod h1:LmEmu6L/8jetyj1oewewFb7bZCNRwE7wLCU
github.com/gertd/go-pluralize v0.2.0 h1:VzWNnxkUo3wkW2Nmp+3ieHSTQQ0LBHeSVxlKsQPQ+UY=
github.com/gertd/go-pluralize v0.2.0/go.mod h1:4ouO1Ndf/r7sZMorwp4Sbfw80lUni+sd+o3qJR8L9To=
github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
Expand Down
5 changes: 2 additions & 3 deletions pkg/devspace/build/builder/kaniko/build_pod.go
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
package kaniko

import (
"fmt"
"path/filepath"

"github.com/loft-sh/devspace/pkg/devspace/build/builder/kaniko/util"
devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"

"github.com/docker/distribution/reference"
jsonyaml "github.com/ghodss/yaml"
"gopkg.in/yaml.v3"
jsonyaml "sigs.k8s.io/yaml"

"github.com/docker/docker/api/types"
"github.com/pkg/errors"
k8sv1 "k8s.io/api/core/v1"

"fmt"

"github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/config/loader/testing/fake.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"github.com/loft-sh/devspace/pkg/devspace/config"
"github.com/loft-sh/devspace/pkg/devspace/kubectl"

"github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/devspace/config/constants"
"github.com/loft-sh/devspace/pkg/devspace/config/loader"
"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
"github.com/loft-sh/devspace/pkg/util/log"
"github.com/pkg/errors"
"sigs.k8s.io/yaml"
)

// FakeConfigLoader is the fake config loader
Expand Down
7 changes: 4 additions & 3 deletions pkg/devspace/config/versions/v1beta10/upgrade_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package v1beta10

import (
"github.com/ghodss/yaml"
"reflect"
"testing"

next "github.com/loft-sh/devspace/pkg/devspace/config/versions/v1beta11"
"github.com/loft-sh/devspace/pkg/util/log"
"github.com/loft-sh/devspace/pkg/util/ptr"
"reflect"
"testing"
"sigs.k8s.io/yaml"
)

type testCase struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/config/versions/v1beta7/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"reflect"
"testing"

"github.com/ghodss/yaml"
next "github.com/loft-sh/devspace/pkg/devspace/config/versions/v1beta8"
"github.com/loft-sh/devspace/pkg/util/log"
"sigs.k8s.io/yaml"
)

type testCase struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/config/versions/v1beta8/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"reflect"
"testing"

"github.com/ghodss/yaml"
next "github.com/loft-sh/devspace/pkg/devspace/config/versions/v1beta9"
"github.com/loft-sh/devspace/pkg/util/log"
"sigs.k8s.io/yaml"
)

type testCase struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/config/versions/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"strings"
"unicode"

jsonyaml "github.com/ghodss/yaml"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
k8sv1 "k8s.io/api/core/v1"
jsonyaml "sigs.k8s.io/yaml"

"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
"github.com/loft-sh/devspace/pkg/util/dockerfile"
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/deploy/deployer/kubectl/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"regexp"
"strings"

jsonyaml "github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
"github.com/loft-sh/devspace/pkg/devspace/pipeline/env"
"github.com/loft-sh/devspace/pkg/util/constraint"
Expand All @@ -19,6 +18,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"mvdan.cc/sh/v3/expand"
jsonyaml "sigs.k8s.io/yaml"
)

// Builder is the manifest builder interface
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/deploy/deployer/kubectl/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"os"
"strings"

jsonyaml "github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/devspace/config/constants"
"github.com/loft-sh/devspace/pkg/devspace/config/loader/patch"
"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/legacy"
Expand All @@ -26,6 +25,7 @@ import (
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"mvdan.cc/sh/v3/expand"
jsonyaml "sigs.k8s.io/yaml"
)

var Cachemanifest = "./.devspace/manifest-cache.yaml"
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/helm/v3/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
"github.com/loft-sh/devspace/pkg/devspace/helm/generic"
"github.com/loft-sh/devspace/pkg/devspace/helm/types"
"github.com/loft-sh/devspace/pkg/util/log"
"github.com/loft-sh/utils/pkg/downloader/commands"
"sigs.k8s.io/yaml"
)

type client struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/plugin/installer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"path/filepath"
"strings"

"github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/util/git"
"github.com/otiai10/copy"
"sigs.k8s.io/yaml"
)

type Installer interface {
Expand Down
12 changes: 5 additions & 7 deletions pkg/devspace/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@ package plugin
import (
"encoding/base32"
"fmt"

"github.com/blang/semver"
"github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/devspace/config/constants"
"github.com/loft-sh/devspace/pkg/util/log"
"sync"

"io"
"os"
"os/exec"
"path/filepath"
"runtime"
"sync"

"github.com/blang/semver"
"github.com/loft-sh/devspace/pkg/devspace/config/constants"
"github.com/loft-sh/devspace/pkg/util/log"
"github.com/mitchellh/go-homedir"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"sigs.k8s.io/yaml"
)

var encoding = base32.StdEncoding.WithPadding('0')
Expand Down
3 changes: 1 addition & 2 deletions pkg/devspace/services/podreplace/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import (
"strings"

"github.com/loft-sh/devspace/pkg/devspace/build/builder/kaniko/util"

"github.com/ghodss/yaml"
"github.com/loft-sh/devspace/pkg/devspace/build/builder/restart"
"github.com/loft-sh/devspace/pkg/devspace/config/loader"
runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
Expand All @@ -21,6 +19,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/yaml"
)

var (
Expand Down
20 changes: 0 additions & 20 deletions vendor/github.com/ghodss/yaml/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/ghodss/yaml/.travis.yml

This file was deleted.

50 changes: 0 additions & 50 deletions vendor/github.com/ghodss/yaml/LICENSE

This file was deleted.

Loading

0 comments on commit a32aff7

Please sign in to comment.