From f248073c7904d24c30e986dbaf0ed99154b07cd8 Mon Sep 17 00:00:00 2001 From: Wei Lim Date: Wed, 16 Oct 2024 15:52:27 -0700 Subject: [PATCH 1/2] update library gopkg.in/yaml.v3 to github.com/braydonk/yaml --- cli/azd/pkg/ai/config.go | 2 +- cli/azd/pkg/alpha/alpha_feature.go | 2 +- cli/azd/pkg/apphost/generate.go | 2 +- cli/azd/pkg/containerapps/container_app.go | 2 +- cli/azd/pkg/infra/provisioning/manager.go | 2 +- cli/azd/pkg/osutil/expandable_string_test.go | 2 +- cli/azd/pkg/project/project.go | 2 +- cli/azd/pkg/project/project_config_test.go | 2 +- cli/azd/pkg/project/project_test.go | 2 +- cli/azd/pkg/project/service_target_aks_test.go | 2 +- cli/azd/pkg/tools/kubectl/kube_config.go | 2 +- cli/azd/pkg/tools/kubectl/models_test.go | 2 +- cli/azd/pkg/tools/kubectl/util.go | 2 +- cli/azd/pkg/workflow/config_test.go | 2 +- cli/azd/pkg/workflow/workflow.go | 2 +- cli/azd/test/cmdrecord/cassette.go | 2 +- cli/azd/test/cmdrecord/cmdrecorder_test.go | 2 +- cli/azd/test/cmdrecord/proxy/main.go | 2 +- cli/azd/test/recording/recording.go | 2 +- go.mod | 3 ++- go.sum | 2 ++ 21 files changed, 23 insertions(+), 20 deletions(-) diff --git a/cli/azd/pkg/ai/config.go b/cli/azd/pkg/ai/config.go index 3b621a237c2..b4b51104c63 100644 --- a/cli/azd/pkg/ai/config.go +++ b/cli/azd/pkg/ai/config.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) // ComponentConfig is a base configuration structure used by multiple AI components diff --git a/cli/azd/pkg/alpha/alpha_feature.go b/cli/azd/pkg/alpha/alpha_feature.go index 95dc8889415..94f8d11b84d 100644 --- a/cli/azd/pkg/alpha/alpha_feature.go +++ b/cli/azd/pkg/alpha/alpha_feature.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/azure/azure-dev/cli/azd/resources" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) // Feature defines the structure for a feature in alpha mode. diff --git a/cli/azd/pkg/apphost/generate.go b/cli/azd/pkg/apphost/generate.go index 4d1bececeb8..8a753bfcb54 100644 --- a/cli/azd/pkg/apphost/generate.go +++ b/cli/azd/pkg/apphost/generate.go @@ -28,8 +28,8 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/osutil" "github.com/azure/azure-dev/cli/azd/pkg/output" "github.com/azure/azure-dev/cli/azd/resources" + "github.com/braydonk/yaml" "github.com/psanford/memfs" - "gopkg.in/yaml.v3" ) const RedisContainerAppService = "redis" diff --git a/cli/azd/pkg/containerapps/container_app.go b/cli/azd/pkg/containerapps/container_app.go index 8edd230b8cc..b9390f5e31a 100644 --- a/cli/azd/pkg/containerapps/container_app.go +++ b/cli/azd/pkg/containerapps/container_app.go @@ -20,7 +20,7 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/config" "github.com/azure/azure-dev/cli/azd/pkg/convert" "github.com/benbjohnson/clock" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) const ( diff --git a/cli/azd/pkg/infra/provisioning/manager.go b/cli/azd/pkg/infra/provisioning/manager.go index c31bb910b27..5979aac9a71 100644 --- a/cli/azd/pkg/infra/provisioning/manager.go +++ b/cli/azd/pkg/infra/provisioning/manager.go @@ -22,7 +22,7 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/output" "github.com/azure/azure-dev/cli/azd/pkg/output/ux" "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) type DefaultProviderResolver func() (ProviderKind, error) diff --git a/cli/azd/pkg/osutil/expandable_string_test.go b/cli/azd/pkg/osutil/expandable_string_test.go index 4e9832dbf50..a0f3ac2c53b 100644 --- a/cli/azd/pkg/osutil/expandable_string_test.go +++ b/cli/azd/pkg/osutil/expandable_string_test.go @@ -6,8 +6,8 @@ package osutil import ( "testing" + "github.com/braydonk/yaml" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" ) func TestExpandableStringYaml(t *testing.T) { diff --git a/cli/azd/pkg/project/project.go b/cli/azd/pkg/project/project.go index 84d33f85a60..ae8f6c5c03c 100644 --- a/cli/azd/pkg/project/project.go +++ b/cli/azd/pkg/project/project.go @@ -18,7 +18,7 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" "github.com/azure/azure-dev/cli/azd/pkg/osutil" "github.com/blang/semver/v4" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) const ( diff --git a/cli/azd/pkg/project/project_config_test.go b/cli/azd/pkg/project/project_config_test.go index 3b0b1af2e4c..02f68f0a086 100644 --- a/cli/azd/pkg/project/project_config_test.go +++ b/cli/azd/pkg/project/project_config_test.go @@ -13,8 +13,8 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/osutil" "github.com/azure/azure-dev/cli/azd/test/mocks" "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/braydonk/yaml" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" ) // Tests invalid project configurations. diff --git a/cli/azd/pkg/project/project_test.go b/cli/azd/pkg/project/project_test.go index 3e7129a487b..f3fa036e69c 100644 --- a/cli/azd/pkg/project/project_test.go +++ b/cli/azd/pkg/project/project_test.go @@ -18,9 +18,9 @@ import ( "github.com/azure/azure-dev/cli/azd/test/mocks/mockarmresources" "github.com/azure/azure-dev/cli/azd/test/mocks/mockazcli" "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/braydonk/yaml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" ) // Specifying resource name in the project file should override the default diff --git a/cli/azd/pkg/project/service_target_aks_test.go b/cli/azd/pkg/project/service_target_aks_test.go index 7c10d949a5f..18327fdd490 100644 --- a/cli/azd/pkg/project/service_target_aks_test.go +++ b/cli/azd/pkg/project/service_target_aks_test.go @@ -35,9 +35,9 @@ import ( "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" "github.com/azure/azure-dev/cli/azd/test/ostest" "github.com/benbjohnson/clock" + "github.com/braydonk/yaml" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" ) func Test_NewAksTarget(t *testing.T) { diff --git a/cli/azd/pkg/tools/kubectl/kube_config.go b/cli/azd/pkg/tools/kubectl/kube_config.go index c9f54b8507c..c4f4f1a4812 100644 --- a/cli/azd/pkg/tools/kubectl/kube_config.go +++ b/cli/azd/pkg/tools/kubectl/kube_config.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) // Manages k8s configurations available to the k8s CLI diff --git a/cli/azd/pkg/tools/kubectl/models_test.go b/cli/azd/pkg/tools/kubectl/models_test.go index d8d3966b952..6d447c10d25 100644 --- a/cli/azd/pkg/tools/kubectl/models_test.go +++ b/cli/azd/pkg/tools/kubectl/models_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" + "github.com/braydonk/yaml" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" ) func Test_Port_TargetPort_Unmarshalling(t *testing.T) { diff --git a/cli/azd/pkg/tools/kubectl/util.go b/cli/azd/pkg/tools/kubectl/util.go index 4593eaf5512..68802401ec1 100644 --- a/cli/azd/pkg/tools/kubectl/util.go +++ b/cli/azd/pkg/tools/kubectl/util.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "github.com/braydonk/yaml" "github.com/sethvargo/go-retry" - "gopkg.in/yaml.v3" ) var ( diff --git a/cli/azd/pkg/workflow/config_test.go b/cli/azd/pkg/workflow/config_test.go index 2c6aecd21ef..78294d30266 100644 --- a/cli/azd/pkg/workflow/config_test.go +++ b/cli/azd/pkg/workflow/config_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/MakeNowJust/heredoc/v2" + "github.com/braydonk/yaml" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" ) var testWorkflow = &Workflow{ diff --git a/cli/azd/pkg/workflow/workflow.go b/cli/azd/pkg/workflow/workflow.go index 86a7111f291..ed97ec9fdc8 100644 --- a/cli/azd/pkg/workflow/workflow.go +++ b/cli/azd/pkg/workflow/workflow.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) // Workflow stores a list of steps to execute diff --git a/cli/azd/test/cmdrecord/cassette.go b/cli/azd/test/cmdrecord/cassette.go index 306d4da0d18..212f44bad84 100644 --- a/cli/azd/test/cmdrecord/cassette.go +++ b/cli/azd/test/cmdrecord/cassette.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strconv" - "gopkg.in/yaml.v3" + "github.com/braydonk/yaml" ) const InteractionIdFile = "int-id.txt" diff --git a/cli/azd/test/cmdrecord/cmdrecorder_test.go b/cli/azd/test/cmdrecord/cmdrecorder_test.go index 72d844de0f6..f78427cbe8f 100644 --- a/cli/azd/test/cmdrecord/cmdrecorder_test.go +++ b/cli/azd/test/cmdrecord/cmdrecorder_test.go @@ -10,9 +10,9 @@ import ( "path/filepath" "testing" + "github.com/braydonk/yaml" "github.com/stretchr/testify/require" "gopkg.in/dnaeon/go-vcr.v3/recorder" - "gopkg.in/yaml.v3" ) // Verify that record + playback work together. diff --git a/cli/azd/test/cmdrecord/proxy/main.go b/cli/azd/test/cmdrecord/proxy/main.go index 3953e5e9bff..7ade8315ebe 100644 --- a/cli/azd/test/cmdrecord/proxy/main.go +++ b/cli/azd/test/cmdrecord/proxy/main.go @@ -13,8 +13,8 @@ import ( "strings" "github.com/azure/azure-dev/cli/azd/test/cmdrecord" + "github.com/braydonk/yaml" "gopkg.in/dnaeon/go-vcr.v3/recorder" - "gopkg.in/yaml.v3" ) type ErrExitCode struct { diff --git a/cli/azd/test/recording/recording.go b/cli/azd/test/recording/recording.go index 12fa8b5fd43..8d0a54c0b5a 100644 --- a/cli/azd/test/recording/recording.go +++ b/cli/azd/test/recording/recording.go @@ -26,9 +26,9 @@ import ( "time" "github.com/azure/azure-dev/cli/azd/test/cmdrecord" + "github.com/braydonk/yaml" "gopkg.in/dnaeon/go-vcr.v3/cassette" "gopkg.in/dnaeon/go-vcr.v3/recorder" - "gopkg.in/yaml.v3" ) type recordOptions struct { diff --git a/go.mod b/go.mod index 164e3b7cb42..0dca27b1057 100644 --- a/go.mod +++ b/go.mod @@ -35,6 +35,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/bmatcuk/doublestar/v4 v4.6.0 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 + github.com/braydonk/yaml v0.7.0 github.com/buger/goterm v1.0.4 github.com/cli/browser v1.1.0 github.com/drone/envsubst v1.0.3 @@ -69,7 +70,6 @@ require ( go.uber.org/multierr v1.8.0 golang.org/x/sys v0.21.0 gopkg.in/dnaeon/go-vcr.v3 v3.1.2 - gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -106,4 +106,5 @@ require ( google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.56.3 // indirect google.golang.org/protobuf v1.33.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 1bfc6810097..aa2cd325a7c 100644 --- a/go.sum +++ b/go.sum @@ -145,6 +145,8 @@ github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvz github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= +github.com/braydonk/yaml v0.7.0 h1:ySkqO7r0MGoCNhiRJqE0Xe9yhINMyvOAB3nFjgyJn2k= +github.com/braydonk/yaml v0.7.0/go.mod h1:hcm3h581tudlirk8XEUPDBAimBPbmnL0Y45hCRl47N4= github.com/buger/goterm v1.0.4 h1:Z9YvGmOih81P0FbVtEYTFF6YsSgxSUKEhf/f9bTMXbY= github.com/buger/goterm v1.0.4/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= From 00c974509d675ed4e8a4ed4d2ed02a463a41138c Mon Sep 17 00:00:00 2001 From: Wei Lim Date: Wed, 16 Oct 2024 16:08:38 -0700 Subject: [PATCH 2/2] update cspell --- .vscode/cspell-github-user-aliases.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/cspell-github-user-aliases.txt b/.vscode/cspell-github-user-aliases.txt index 1fb61a96429..4676714fb87 100644 --- a/.vscode/cspell-github-user-aliases.txt +++ b/.vscode/cspell-github-user-aliases.txt @@ -6,6 +6,7 @@ benbjohnson blang bmatcuk bradleyjkemp +braydonk briandowns buger cobey