Skip to content

Update module gopkg.in/yaml.v2 to v3 #761

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

Open
renovate wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update module gopkg.in/yaml.v2 to v3 #761

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: 1 addition & 1 deletion api/deployed_products_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type LicenseMetadata struct {
Expand Down
2 changes: 1 addition & 1 deletion api/director_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"

yamlConverter "github.com/ghodss/yaml"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type AvailabilityZoneInput struct {
Expand Down
2 changes: 1 addition & 1 deletion api/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api

import (
"fmt"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
"reflect"

yamlConverter "github.com/ghodss/yaml"
Expand Down
2 changes: 1 addition & 1 deletion api/jobs_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/onsi/gomega/ghttp"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/api"

Expand Down
2 changes: 1 addition & 1 deletion api/staged_director_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type NetworksConfigurationOutput struct {
Expand Down
2 changes: 1 addition & 1 deletion api/staged_products_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"
"strings"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type StageProductInput struct {
Expand Down
2 changes: 1 addition & 1 deletion api/stemcell_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"path/filepath"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type ProductStemcells struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/loadConfigFile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/jessevdk/go-flags"
"github.com/pivotal-cf/om/interpolate"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// Load the config file, (optionally) load the vars file, vars env as well
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/pivotal-cf/om/network"
"github.com/pivotal-cf/om/presenters"
"github.com/pivotal-cf/om/renderers"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type httpClient interface {
Expand Down
2 changes: 1 addition & 1 deletion commands/apply_changes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sort"
"time"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/api"
)
Expand Down
2 changes: 1 addition & 1 deletion commands/apply_changes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/onsi/gomega/gbytes"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/api"
"github.com/pivotal-cf/om/commands"
Expand Down
2 changes: 1 addition & 1 deletion commands/configure_director.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/pivotal-cf/om/interpolate"

"github.com/pivotal-cf/om/api"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type ConfigureDirector struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/configure_opsman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/pivotal-cf/om/api"
"github.com/pivotal-cf/om/interpolate"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type ConfigureOpsman struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/configure_product.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/pivotal-cf/om/config"

yamlConverter "github.com/ghodss/yaml"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type ConfigureProduct struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/create_vm_extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pivotal-cf/om/api"
"github.com/pivotal-cf/om/config"
"github.com/pivotal-cf/om/interpolate"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

//counterfeiter:generate -o ./fakes/create_vm_extension_service.go --fake-name CreateVMExtensionService . createVMExtensionService
Expand Down
2 changes: 1 addition & 1 deletion commands/replicate_product.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/api"
)
Expand Down
2 changes: 1 addition & 1 deletion commands/stage_product.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"slices"
"strings"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/api"
)
Expand Down
2 changes: 1 addition & 1 deletion commands/staged_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/pivotal-cf/om/api"
"github.com/pivotal-cf/om/config"
"github.com/pivotal-cf/om/configparser"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type StagedConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/staged_director_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/pivotal-cf/om/api"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type StagedDirectorConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion configparser/configparser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package configparser_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/api"
"github.com/pivotal-cf/om/configparser"
Expand Down
2 changes: 1 addition & 1 deletion configtemplate/generator/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"path"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type Executor struct {
Expand Down
2 changes: 1 addition & 1 deletion configtemplate/generator/execute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sort"
"strings"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion configtemplate/generator/integration/product_properties_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo/v2"

. "github.com/onsi/gomega"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/configtemplate/generator"
)
Expand Down
2 changes: 1 addition & 1 deletion configtemplate/generator/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

func NewMetadata(fileBytes []byte) (*Metadata, error) {
Expand Down
2 changes: 1 addition & 1 deletion configtemplate/generator/network_properties_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pivotal-cf/om/configtemplate/generator"
"github.com/pivotal-cf/om/configtemplate/generator/fakes"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

var withServiceNetwork = `network:
Expand Down
2 changes: 1 addition & 1 deletion configtemplate/generator/resource_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package generator_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/configtemplate/generator"
"github.com/pivotal-cf/om/configtemplate/generator/fakes"
Expand Down
2 changes: 1 addition & 1 deletion extractor/from_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"regexp"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

var metadataRegexp = regexp.MustCompile(`^(.*\/)?metadata/.*\.yml`)
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 @@ -35,7 +35,6 @@ require (
golang.org/x/oauth2 v0.34.0
google.golang.org/api v0.252.0
gopkg.in/go-playground/validator.v9 v9.31.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
howett.net/ranger v0.0.0-20171016084633-e2e137620847
)
Expand Down Expand Up @@ -196,4 +195,5 @@ require (
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
2 changes: 1 addition & 1 deletion interpolate/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/cloudfoundry/bosh-cli/director/template"
"github.com/cppforlife/go-patch/patch"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type Options struct {
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/taskmodifier/task_modifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/bmatcuk/doublestar"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/interpolate"
)
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmlifecyclecommands/delete_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"sort"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/interpolate"
"github.com/pivotal-cf/om/vmlifecycle/vmmanagers"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmlifecyclecommands/export_opsman_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"os"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/vmlifecycle/configfetchers"
"github.com/pivotal-cf/om/vmlifecycle/vmmanagers"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmlifecyclecommands/upgrade_opsman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"time"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/interpolate"
"github.com/pivotal-cf/om/vmlifecycle/extractopsmansemver"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"time"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type AWSCredential struct {
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/pivotal-cf/om/vmlifecycle/runner"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type AzureCredential struct {
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gstruct"
"github.com/onsi/gomega/types"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/vmlifecycle/matchers"
"github.com/pivotal-cf/om/vmlifecycle/vmmanagers"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/gcp.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"
"strings"

yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

type GCPCredential struct {
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/gcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/vmlifecycle/vmmanagers"
"github.com/pivotal-cf/om/vmlifecycle/vmmanagers/fakes"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/openstack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

. "github.com/onsi/gomega"
"github.com/onsi/gomega/gstruct"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/vmlifecycle/matchers"
"github.com/pivotal-cf/om/vmlifecycle/vmmanagers"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/vmmanagers_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/fatih/color"
. "github.com/onsi/ginkgo/v2"
Expand Down
2 changes: 1 addition & 1 deletion vmlifecycle/vmmanagers/vsphere_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/pivotal-cf/om/vmlifecycle/matchers"
"github.com/pivotal-cf/om/vmlifecycle/vmmanagers"
Expand Down
Loading