Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .vscode/cspell-github-user-aliases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ benbjohnson
blang
bmatcuk
bradleyjkemp
braydonk
briandowns
buger
cobey
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/ai/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/alpha/alpha_feature.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/apphost/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/containerapps/container_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/infra/provisioning/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/osutil/expandable_string_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/project/project_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/project/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/project/service_target_aks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/tools/kubectl/kube_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/tools/kubectl/models_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/tools/kubectl/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"time"

"github.com/braydonk/yaml"
"github.com/sethvargo/go-retry"
"gopkg.in/yaml.v3"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/workflow/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/pkg/workflow/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"gopkg.in/yaml.v3"
"github.com/braydonk/yaml"
)

// Workflow stores a list of steps to execute
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/test/cmdrecord/cassette.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"
"strconv"

"gopkg.in/yaml.v3"
"github.com/braydonk/yaml"
)

const InteractionIdFile = "int-id.txt"
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/test/cmdrecord/cmdrecorder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/test/cmdrecord/proxy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/test/recording/recording.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -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
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down