diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml index 6c038c4900d..5999add6ec7 100644 --- a/.github/workflows/cli-ci.yml +++ b/.github/workflows/cli-ci.yml @@ -5,7 +5,6 @@ on: paths: - "cli/**" - ".github/workflows/cli-ci.yml" - - "go.mod" branches: [main] # If two events are triggered within a short time in the same PR, cancel the run of the oldest event diff --git a/.gitignore b/.gitignore index fb3ecd557fa..660ecdae526 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,18 @@ test-results/ *.terraform* # Finder state files -.DS_Store \ No newline at end of file +.DS_Store +cli/azd/azure-dev +cli/azd/azure-dev.exe +cli/azd/azd +cli/azd/azd.exe +cli/azd/extensions/azure.coding-agent/azurecodingagent +cli/azd/extensions/azure.coding-agent/azurecodingagent.exe +cli/azd/extensions/azure.ai.agents/azureaiagent +cli/azd/extensions/azure.ai.agents/azureaiagent.exe +cli/azd/extensions/microsoft.azd.extensions/microsoft.azd.extensions +cli/azd/extensions/microsoft.azd.extensions/microsoft.azd.extensions.exe +cli/azd/extensions/microsoft.azd.ai.builder/microsoft.azd.ai.builder +cli/azd/extensions/microsoft.azd.ai.builder/microsoft.azd.ai.builder.exe +cli/azd/extensions/microsoft.azd.demo/microsoft.azd.demo +cli/azd/extensions/microsoft.azd.demo/microsoft.azd.demo.exe diff --git a/cli/azd/appdetect/main.go b/cli/azd/appdetect/main.go index fea0394d404..a75ccd7d3a3 100644 --- a/cli/azd/appdetect/main.go +++ b/cli/azd/appdetect/main.go @@ -10,7 +10,7 @@ import ( "fmt" "os" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" + "github.com/azure/azure-dev/internal/appdetect" ) var directory string diff --git a/cli/azd/ci-build.ps1 b/cli/azd/ci-build.ps1 index b29121ddab6..1f0757698ac 100644 --- a/cli/azd/ci-build.ps1 +++ b/cli/azd/ci-build.ps1 @@ -146,13 +146,13 @@ $tagsFlag = "-tags=$($tags -join ',')" $ldFlags = @( "-s", "-w", - "-X 'github.com/azure/azure-dev/cli/azd/internal.Version=$Version (commit $SourceVersion)'" + "-X 'github.com/azure/azure-dev/internal.Version=$Version (commit $SourceVersion)'" ) # Add GitHub Copilot linker flags if enabled if ($GitHubCopilotEnabled) { - $ldFlags += "-X 'github.com/azure/azure-dev/cli/azd/pkg/llm.clientID=$GitHubCopilotClientId'" - $ldFlags += "-X 'github.com/azure/azure-dev/cli/azd/pkg/llm.copilotIntegrationID=$GitHubCopilotIntegrationId'" + $ldFlags += "-X 'github.com/azure/azure-dev/pkg/llm.clientID=$GitHubCopilotClientId'" + $ldFlags += "-X 'github.com/azure/azure-dev/pkg/llm.copilotIntegrationID=$GitHubCopilotIntegrationId'" } $ldFlag = "-ldflags=$($ldFlags -join ' ')" @@ -184,10 +184,17 @@ elseif ($IsMacOS) { Write-Host $msg } +# Set output filename to azd (default would be azure-dev based on module path) +$outputFlag = "-o=azd" +if ($IsWindows) { + $outputFlag = "-o=azd.exe" +} + # collect flags $buildFlags += @( $tagsFlag, - $ldFlag + $ldFlag, + $outputFlag ) function PrintFlags() { diff --git a/cli/azd/cmd/actions/action_descriptor.go b/cli/azd/cmd/actions/action_descriptor.go index d6b0550b7a6..ca9777d4421 100644 --- a/cli/azd/cmd/actions/action_descriptor.go +++ b/cli/azd/cmd/actions/action_descriptor.go @@ -4,7 +4,7 @@ package actions import ( - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/actions/action_descriptor_test.go b/cli/azd/cmd/actions/action_descriptor_test.go index bf9c569a2e0..32fc0f39c86 100644 --- a/cli/azd/cmd/actions/action_descriptor_test.go +++ b/cli/azd/cmd/actions/action_descriptor_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/auth.go b/cli/azd/cmd/auth.go index 7f68cb507a1..b063f742950 100644 --- a/cli/azd/cmd/auth.go +++ b/cli/azd/cmd/auth.go @@ -4,8 +4,8 @@ package cmd import ( - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/auth_login.go b/cli/azd/cmd/auth_login.go index 69d5b2e4648..0bfb333da34 100644 --- a/cli/azd/cmd/auth_login.go +++ b/cli/azd/cmd/auth_login.go @@ -17,18 +17,18 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/oneauth" - "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/tools/github" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/runcontext" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/oneauth" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/tools/github" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/auth_logout.go b/cli/azd/cmd/auth_logout.go index 4cb7b874886..aea7115d1a6 100644 --- a/cli/azd/cmd/auth_logout.go +++ b/cli/azd/cmd/auth_logout.go @@ -8,11 +8,11 @@ import ( "fmt" "io" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/auth_token.go b/cli/azd/cmd/auth_token.go index 786d477ae71..8730934dcfd 100644 --- a/cli/azd/cmd/auth_token.go +++ b/cli/azd/cmd/auth_token.go @@ -12,14 +12,14 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/auth_token_test.go b/cli/azd/cmd/auth_token_test.go index 40441bcfcc5..62247cae376 100644 --- a/cli/azd/cmd/auth_token_test.go +++ b/cli/azd/cmd/auth_token_test.go @@ -15,12 +15,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/output" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/auto_install.go b/cli/azd/cmd/auto_install.go index 23a88980725..44b64441e02 100644 --- a/cli/azd/cmd/auto_install.go +++ b/cli/azd/cmd/auto_install.go @@ -12,13 +12,13 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/tracing/resource" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/auto_install_multi_namespace_test.go b/cli/azd/cmd/auto_install_multi_namespace_test.go index f53b34e4ca6..456e6e097a7 100644 --- a/cli/azd/cmd/auto_install_multi_namespace_test.go +++ b/cli/azd/cmd/auto_install_multi_namespace_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/pkg/extensions" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/cmd/auto_install_test.go b/cli/azd/cmd/auto_install_test.go index 2ffc0428b7a..4d58a46804a 100644 --- a/cli/azd/cmd/auto_install_test.go +++ b/cli/azd/cmd/auto_install_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/pkg/extensions" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/cmd/build.go b/cli/azd/cmd/build.go index 20720fb9c0a..c4e61f2b2e2 100644 --- a/cli/azd/cmd/build.go +++ b/cli/azd/cmd/build.go @@ -9,15 +9,15 @@ import ( "io" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/workflow" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/cmd_help.go b/cli/azd/cmd/cmd_help.go index 2a83c7b52c2..285f1d946b0 100644 --- a/cli/azd/cmd/cmd_help.go +++ b/cli/azd/cmd/cmd_help.go @@ -8,8 +8,8 @@ import ( "slices" "strings" - cmdinternal "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/pkg/output" + cmdinternal "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/cobra_builder.go b/cli/azd/cmd/cobra_builder.go index b6a7679560b..5681de39044 100644 --- a/cli/azd/cmd/cobra_builder.go +++ b/cli/azd/cmd/cobra_builder.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/cobra_builder_test.go b/cli/azd/cmd/cobra_builder_test.go index 7af7c0ff57c..fbc11a3ae8d 100644 --- a/cli/azd/cmd/cobra_builder_test.go +++ b/cli/azd/cmd/cobra_builder_test.go @@ -8,13 +8,13 @@ import ( "errors" "testing" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/test/mocks" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/completion.go b/cli/azd/cmd/completion.go index a57c1d77a12..c55f904a87c 100644 --- a/cli/azd/cmd/completion.go +++ b/cli/azd/cmd/completion.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal/figspec" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal/figspec" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/config.go b/cli/azd/cmd/config.go index 9f06cc19ded..807ef3b506e 100644 --- a/cli/azd/cmd/config.go +++ b/cli/azd/cmd/config.go @@ -14,13 +14,13 @@ import ( "strings" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/container.go b/cli/azd/cmd/container.go index 40e2375c3c6..82034552aba 100644 --- a/cli/azd/cmd/container.go +++ b/cli/azd/cmd/container.go @@ -18,65 +18,65 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/agent" - "github.com/azure/azure-dev/cli/azd/internal/agent/consent" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/internal/grpcserver" - "github.com/azure/azure-dev/cli/azd/internal/repository" - "github.com/azure/azure-dev/cli/azd/internal/terminal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/ai" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/armmsi" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azd" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/containerapps" - "github.com/azure/azure-dev/cli/azd/pkg/containerregistry" - "github.com/azure/azure-dev/cli/azd/pkg/devcenter" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/helm" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/kubelogin" - "github.com/azure/azure-dev/cli/azd/pkg/kustomize" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/llm" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/pipeline" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/state" - "github.com/azure/azure-dev/cli/azd/pkg/templates" - "github.com/azure/azure-dev/cli/azd/pkg/tools/az" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" - "github.com/azure/azure-dev/cli/azd/pkg/tools/javac" - "github.com/azure/azure-dev/cli/azd/pkg/tools/kubectl" - "github.com/azure/azure-dev/cli/azd/pkg/tools/maven" - "github.com/azure/azure-dev/cli/azd/pkg/tools/npm" - "github.com/azure/azure-dev/cli/azd/pkg/tools/python" - "github.com/azure/azure-dev/cli/azd/pkg/tools/swa" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/agent" + "github.com/azure/azure-dev/internal/agent/consent" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/internal/grpcserver" + "github.com/azure/azure-dev/internal/repository" + "github.com/azure/azure-dev/internal/terminal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/ai" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/armmsi" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azd" + "github.com/azure/azure-dev/pkg/azsdk" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/containerapps" + "github.com/azure/azure-dev/pkg/containerregistry" + "github.com/azure/azure-dev/pkg/devcenter" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/helm" + "github.com/azure/azure-dev/pkg/httputil" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/kubelogin" + "github.com/azure/azure-dev/pkg/kustomize" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/llm" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/pipeline" + "github.com/azure/azure-dev/pkg/platform" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/state" + "github.com/azure/azure-dev/pkg/templates" + "github.com/azure/azure-dev/pkg/tools/az" + "github.com/azure/azure-dev/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/pkg/tools/github" + "github.com/azure/azure-dev/pkg/tools/javac" + "github.com/azure/azure-dev/pkg/tools/kubectl" + "github.com/azure/azure-dev/pkg/tools/maven" + "github.com/azure/azure-dev/pkg/tools/npm" + "github.com/azure/azure-dev/pkg/tools/python" + "github.com/azure/azure-dev/pkg/tools/swa" + "github.com/azure/azure-dev/pkg/workflow" "github.com/mattn/go-colorable" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/container_test.go b/cli/azd/cmd/container_test.go index 1958b94e765..2adf7c59ed5 100644 --- a/cli/azd/cmd/container_test.go +++ b/cli/azd/cmd/container_test.go @@ -7,10 +7,10 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/down.go b/cli/azd/cmd/down.go index c93a7ee8d72..8ec8267de55 100644 --- a/cli/azd/cmd/down.go +++ b/cli/azd/cmd/down.go @@ -10,17 +10,17 @@ import ( "slices" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - inf "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + inf "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/env.go b/cli/azd/cmd/env.go index 20918413453..07f11fbd4d1 100644 --- a/cli/azd/cmd/env.go +++ b/cli/azd/cmd/env.go @@ -14,23 +14,23 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azureutil" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "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/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azureutil" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/infra/provisioning/bicep" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" "github.com/joho/godotenv" "github.com/sethvargo/go-retry" "github.com/spf13/cobra" diff --git a/cli/azd/cmd/extension.go b/cli/azd/cmd/extension.go index 7c32e0bebde..5224f1ac21c 100644 --- a/cli/azd/cmd/extension.go +++ b/cli/azd/cmd/extension.go @@ -12,13 +12,13 @@ import ( "text/tabwriter" "github.com/Masterminds/semver/v3" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" - uxlib "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + uxlib "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/extensions.go b/cli/azd/cmd/extensions.go index 2944b516788..712e70379c4 100644 --- a/cli/azd/cmd/extensions.go +++ b/cli/azd/cmd/extensions.go @@ -9,16 +9,16 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal/grpcserver" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal/grpcserver" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/ux" "github.com/fatih/color" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/figspec_test.go b/cli/azd/cmd/figspec_test.go index 0a613bd9e37..6f0314d5a91 100644 --- a/cli/azd/cmd/figspec_test.go +++ b/cli/azd/cmd/figspec_test.go @@ -6,8 +6,8 @@ package cmd import ( "testing" - "github.com/azure/azure-dev/cli/azd/internal/figspec" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/internal/figspec" + "github.com/azure/azure-dev/test/snapshot" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/github_copilot_registration.go b/cli/azd/cmd/github_copilot_registration.go index 0d7d5ec6dc7..be9d124bc92 100644 --- a/cli/azd/cmd/github_copilot_registration.go +++ b/cli/azd/cmd/github_copilot_registration.go @@ -6,8 +6,8 @@ package cmd import ( - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/llm" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/llm" ) // registerGitHubCopilotProvider registers the GitHub Copilot LLM provider diff --git a/cli/azd/cmd/github_copilot_registration_stub.go b/cli/azd/cmd/github_copilot_registration_stub.go index 0f2fff577d5..7423d0cae1d 100644 --- a/cli/azd/cmd/github_copilot_registration_stub.go +++ b/cli/azd/cmd/github_copilot_registration_stub.go @@ -6,7 +6,7 @@ package cmd import ( - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/pkg/ioc" ) // registerGitHubCopilotProvider is a no-op when GitHub Copilot is not enabled diff --git a/cli/azd/cmd/hooks.go b/cli/azd/cmd/hooks.go index 15ef0b858f6..f4ff528656b 100644 --- a/cli/azd/cmd/hooks.go +++ b/cli/azd/cmd/hooks.go @@ -8,17 +8,17 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "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/project" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/tools" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/infra.go b/cli/azd/cmd/infra.go index f229dbc71b8..fcf7a99557b 100644 --- a/cli/azd/cmd/infra.go +++ b/cli/azd/cmd/infra.go @@ -4,9 +4,9 @@ package cmd import ( - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/infra_create.go b/cli/azd/cmd/infra_create.go index 9945395685e..36c4c7fe2f1 100644 --- a/cli/azd/cmd/infra_create.go +++ b/cli/azd/cmd/infra_create.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/infra_delete.go b/cli/azd/cmd/infra_delete.go index d821fc005d9..9f6505d1c70 100644 --- a/cli/azd/cmd/infra_delete.go +++ b/cli/azd/cmd/infra_delete.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/infra_generate.go b/cli/azd/cmd/infra_generate.go index 697e85915c5..4453b66a48b 100644 --- a/cli/azd/cmd/infra_generate.go +++ b/cli/azd/cmd/infra_generate.go @@ -11,15 +11,15 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/otiai10/copy" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cli/azd/cmd/init.go b/cli/azd/cmd/init.go index b55f8bd36fd..757b53594d3 100644 --- a/cli/azd/cmd/init.go +++ b/cli/azd/cmd/init.go @@ -13,30 +13,30 @@ import ( "time" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/agent" - "github.com/azure/azure-dev/cli/azd/internal/agent/consent" - "github.com/azure/azure-dev/cli/azd/internal/agent/feedback" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - "github.com/azure/azure-dev/cli/azd/internal/repository" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/llm" - "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/project" - "github.com/azure/azure-dev/cli/azd/pkg/templates" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/agent" + "github.com/azure/azure-dev/internal/agent/consent" + "github.com/azure/azure-dev/internal/agent/feedback" + "github.com/azure/azure-dev/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/repository" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/llm" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/templates" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/pkg/workflow" "github.com/fatih/color" "github.com/joho/godotenv" "github.com/mark3labs/mcp-go/mcp" diff --git a/cli/azd/cmd/mcp.go b/cli/azd/cmd/mcp.go index 89c21236caf..0ce01fd5e37 100644 --- a/cli/azd/cmd/mcp.go +++ b/cli/azd/cmd/mcp.go @@ -13,20 +13,20 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/agent/consent" - "github.com/azure/azure-dev/cli/azd/internal/grpcserver" - "github.com/azure/azure-dev/cli/azd/internal/mcp" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/agent/consent" + "github.com/azure/azure-dev/internal/grpcserver" + "github.com/azure/azure-dev/internal/mcp" + "github.com/azure/azure-dev/internal/mcp/tools" + "github.com/azure/azure-dev/internal/telemetry" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" "github.com/drone/envsubst" "github.com/fatih/color" mmcp "github.com/mark3labs/mcp-go/mcp" diff --git a/cli/azd/cmd/middleware/debug.go b/cli/azd/cmd/middleware/debug.go index 19d29a4627e..d725a1cc46d 100644 --- a/cli/azd/cmd/middleware/debug.go +++ b/cli/azd/cmd/middleware/debug.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/input" ) // Adds support to easily debug and attach a debugger to AZD for development purposes diff --git a/cli/azd/cmd/middleware/error.go b/cli/azd/cmd/middleware/error.go index a32399dc415..73e192b89ab 100644 --- a/cli/azd/cmd/middleware/error.go +++ b/cli/azd/cmd/middleware/error.go @@ -9,21 +9,21 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/agent" - "github.com/azure/azure-dev/cli/azd/internal/agent/feedback" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/events" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/llm" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - uxlib "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/agent" + "github.com/azure/azure-dev/internal/agent/feedback" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/events" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/internal/tracing/resource" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/llm" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" + uxlib "github.com/azure/azure-dev/pkg/ux" "go.opentelemetry.io/otel/codes" ) diff --git a/cli/azd/cmd/middleware/experimentation.go b/cli/azd/cmd/middleware/experimentation.go index 7cf319cda77..acc49e24cef 100644 --- a/cli/azd/cmd/middleware/experimentation.go +++ b/cli/azd/cmd/middleware/experimentation.go @@ -10,11 +10,11 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/experimentation" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/experimentation" ) type ExperimentationMiddleware struct { diff --git a/cli/azd/cmd/middleware/extensions.go b/cli/azd/cmd/middleware/extensions.go index 85768d9f828..43e1bb359c6 100644 --- a/cli/azd/cmd/middleware/extensions.go +++ b/cli/azd/cmd/middleware/extensions.go @@ -13,12 +13,12 @@ import ( "sync" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal/grpcserver" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal/grpcserver" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output" "github.com/fatih/color" ) diff --git a/cli/azd/cmd/middleware/hooks.go b/cli/azd/cmd/middleware/hooks.go index 1d2a657c815..b33bab92cb5 100644 --- a/cli/azd/cmd/middleware/hooks.go +++ b/cli/azd/cmd/middleware/hooks.go @@ -8,15 +8,15 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" ) type HooksMiddleware struct { diff --git a/cli/azd/cmd/middleware/hooks_test.go b/cli/azd/cmd/middleware/hooks_test.go index b1c350f4b35..e33c5bda1e6 100644 --- a/cli/azd/cmd/middleware/hooks_test.go +++ b/cli/azd/cmd/middleware/hooks_test.go @@ -10,16 +10,16 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/middleware/login_guard.go b/cli/azd/cmd/middleware/login_guard.go index 1692a5de94d..5f4e6a0f2a1 100644 --- a/cli/azd/cmd/middleware/login_guard.go +++ b/cli/azd/cmd/middleware/login_guard.go @@ -7,13 +7,13 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal/tracing/resource" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/workflow" ) type CurrentUserAuthManager interface { diff --git a/cli/azd/cmd/middleware/login_guard_test.go b/cli/azd/cmd/middleware/login_guard_test.go index 50cda0d41b4..71784f12abc 100644 --- a/cli/azd/cmd/middleware/login_guard_test.go +++ b/cli/azd/cmd/middleware/login_guard_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/workflow" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/middleware/middleware.go b/cli/azd/cmd/middleware/middleware.go index ab413c50052..9a72d22e00d 100644 --- a/cli/azd/cmd/middleware/middleware.go +++ b/cli/azd/cmd/middleware/middleware.go @@ -10,8 +10,8 @@ import ( "log" "slices" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/ioc" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/middleware/middleware_test.go b/cli/azd/cmd/middleware/middleware_test.go index cc7da658414..685687a0565 100644 --- a/cli/azd/cmd/middleware/middleware_test.go +++ b/cli/azd/cmd/middleware/middleware_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/middleware/telemetry.go b/cli/azd/cmd/middleware/telemetry.go index 4a4c967f92d..32940b6a4ae 100644 --- a/cli/azd/cmd/middleware/telemetry.go +++ b/cli/azd/cmd/middleware/telemetry.go @@ -9,16 +9,16 @@ import ( "log" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/events" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/platform" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/events" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/platform" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/middleware/telemetry_test.go b/cli/azd/cmd/middleware/telemetry_test.go index dd924ffca89..205968b2869 100644 --- a/cli/azd/cmd/middleware/telemetry_test.go +++ b/cli/azd/cmd/middleware/telemetry_test.go @@ -7,10 +7,10 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/platform" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/middleware/ux.go b/cli/azd/cmd/middleware/ux.go index 725d4b66f77..ec17b0ca4b2 100644 --- a/cli/azd/cmd/middleware/ux.go +++ b/cli/azd/cmd/middleware/ux.go @@ -8,14 +8,14 @@ import ( "errors" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" ) type UxMiddleware struct { diff --git a/cli/azd/cmd/monitor.go b/cli/azd/cmd/monitor.go index 83def5dd308..550dab7d5fc 100644 --- a/cli/azd/cmd/monitor.go +++ b/cli/azd/cmd/monitor.go @@ -8,19 +8,19 @@ import ( "errors" "fmt" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/package.go b/cli/azd/cmd/package.go index 4e42a5f6c8a..0e3c53820de 100644 --- a/cli/azd/cmd/package.go +++ b/cli/azd/cmd/package.go @@ -9,14 +9,14 @@ import ( "io" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/pipeline.go b/cli/azd/cmd/pipeline.go index 1bd591f2c13..df1e930510e 100644 --- a/cli/azd/cmd/pipeline.go +++ b/cli/azd/cmd/pipeline.go @@ -8,17 +8,17 @@ import ( "fmt" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/pipeline" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/pipeline" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/restore.go b/cli/azd/cmd/restore.go index bea9dc31b77..abddd101c70 100644 --- a/cli/azd/cmd/restore.go +++ b/cli/azd/cmd/restore.go @@ -9,16 +9,16 @@ import ( "io" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/root.go b/cli/azd/cmd/root.go index c317f7f99ba..eec56024cd3 100644 --- a/cli/azd/cmd/root.go +++ b/cli/azd/cmd/root.go @@ -10,22 +10,22 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" // Importing for infrastructure provider plugin registrations - "github.com/azure/azure-dev/cli/azd/pkg/azd" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/internal/cmd/add" - "github.com/azure/azure-dev/cli/azd/internal/cmd/show" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/azd" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/platform" + + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/internal/cmd/add" + "github.com/azure/azure-dev/internal/cmd/show" + "github.com/azure/azure-dev/internal/telemetry" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/telemetry.go b/cli/azd/cmd/telemetry.go index 60c86c0655c..c56be44f002 100644 --- a/cli/azd/cmd/telemetry.go +++ b/cli/azd/cmd/telemetry.go @@ -6,9 +6,9 @@ package cmd import ( "context" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/telemetry" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/templates.go b/cli/azd/cmd/templates.go index 90a253627cb..58b1077c636 100644 --- a/cli/azd/cmd/templates.go +++ b/cli/azd/cmd/templates.go @@ -10,11 +10,11 @@ import ( "io" "strings" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/templates" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/templates" "github.com/spf13/cobra" ) diff --git a/cli/azd/cmd/testdata/TestUsage-azd-ai-agent.snap b/cli/azd/cmd/testdata/TestUsage-azd-ai-agent.snap new file mode 100644 index 00000000000..bdd562da18d --- /dev/null +++ b/cli/azd/cmd/testdata/TestUsage-azd-ai-agent.snap @@ -0,0 +1,16 @@ + +This extension provides custom commands for working with agents using Azure Developer CLI. + +Usage + azd ai agent [flags] + +Global Flags + -C, --cwd string : Sets the current working directory. + --debug : Enables debugging and diagnostics logging. + --docs : Opens the documentation for azd ai agent in your web browser. + -h, --help : Gets help for agent. + --no-prompt : Accepts the default value instead of prompting, or it fails if there is no default. + +Find a bug? Want to let us know how we're doing? Fill out this brief survey: https://aka.ms/azure-dev/hats. + + diff --git a/cli/azd/cmd/up.go b/cli/azd/cmd/up.go index df9f8bea434..2ac5d342cb2 100644 --- a/cli/azd/cmd/up.go +++ b/cli/azd/cmd/up.go @@ -10,18 +10,18 @@ import ( "time" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/infra/provisioning/bicep" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/workflow" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/usage_test.go b/cli/azd/cmd/usage_test.go index b0686134e55..a0a5bf3ad82 100644 --- a/cli/azd/cmd/usage_test.go +++ b/cli/azd/cmd/usage_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/test/snapshot" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/cmd/util.go b/cli/azd/cmd/util.go index 3641f0c4db5..a20c13ff66a 100644 --- a/cli/azd/cmd/util.go +++ b/cli/azd/cmd/util.go @@ -13,11 +13,11 @@ import ( "time" "github.com/AlecAivazis/survey/v2" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - azdExec "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/tracing" + azdExec "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/project" "github.com/cli/browser" ) diff --git a/cli/azd/cmd/version.go b/cli/azd/cmd/version.go index fb464321fc2..ef69bf05b2b 100644 --- a/cli/azd/cmd/version.go +++ b/cli/azd/cmd/version.go @@ -8,11 +8,11 @@ import ( "fmt" "io" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/cmd/vs_server.go b/cli/azd/cmd/vs_server.go index 8322424890c..85547850d6d 100644 --- a/cli/azd/cmd/vs_server.go +++ b/cli/azd/cmd/vs_server.go @@ -21,11 +21,11 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/vsrpc" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/vsrpc" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/ioc" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/docs/docgen.go b/cli/azd/docs/docgen.go index e08eb2a4adc..c2fe661e220 100644 --- a/cli/azd/docs/docgen.go +++ b/cli/azd/docs/docgen.go @@ -15,7 +15,7 @@ import ( "strings" "time" - azd "github.com/azure/azure-dev/cli/azd/cmd" + azd "github.com/azure/azure-dev/cmd" "github.com/fatih/color" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/azure.coding-agent/go.sum b/cli/azd/extensions/azure.coding-agent/go.sum index 2132125684d..1659ab4acd7 100644 --- a/cli/azd/extensions/azure.coding-agent/go.sum +++ b/cli/azd/extensions/azure.coding-agent/go.sum @@ -83,6 +83,7 @@ github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/drone/envsubst v1.0.3 h1:PCIBwNDYjs50AsLZPYdfhSATKaRg/FJmDc2D6+C2x8g= @@ -169,6 +170,7 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= diff --git a/cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd/start.go b/cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd/start.go index e5e80fa7411..e207425f15b 100644 --- a/cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd/start.go +++ b/cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd/start.go @@ -15,13 +15,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure/ai" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/util" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/extensions/microsoft.azd.ai.builder/internal/pkg/azure" + "github.com/azure/azure-dev/extensions/microsoft.azd.ai.builder/internal/pkg/azure/ai" + "github.com/azure/azure-dev/extensions/microsoft.azd.ai.builder/internal/pkg/qna" + "github.com/azure/azure-dev/extensions/microsoft.azd.ai.builder/internal/pkg/util" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure/ai/model_catalog.go b/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure/ai/model_catalog.go index 71bc76d1f17..f1934fe25eb 100644 --- a/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure/ai/model_catalog.go +++ b/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure/ai/model_catalog.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/azure" + "github.com/azure/azure-dev/extensions/microsoft.azd.ai.builder/internal/pkg/azure" ) type AiModel struct { diff --git a/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/decision_tree.go b/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/decision_tree.go index 1b968e0c74e..b4edb1cab0c 100644 --- a/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/decision_tree.go +++ b/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/decision_tree.go @@ -10,7 +10,7 @@ import ( "log" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // DecisionTree represents the entire decision tree structure. diff --git a/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/prompt.go b/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/prompt.go index 8347169ad5c..2f093fbc550 100644 --- a/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/prompt.go +++ b/cli/azd/extensions/microsoft.azd.ai.builder/internal/pkg/qna/prompt.go @@ -6,7 +6,7 @@ package qna import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" ) type TextPrompt struct { diff --git a/cli/azd/extensions/microsoft.azd.ai.builder/main.go b/cli/azd/extensions/microsoft.azd.ai.builder/main.go index a2b2b81eaeb..3db6236b2ff 100644 --- a/cli/azd/extensions/microsoft.azd.ai.builder/main.go +++ b/cli/azd/extensions/microsoft.azd.ai.builder/main.go @@ -7,7 +7,7 @@ import ( "context" "os" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd" + "github.com/azure/azure-dev/extensions/microsoft.azd.ai.builder/internal/cmd" "github.com/fatih/color" ) diff --git a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/context.go b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/context.go index 7a42dd59760..46830f7c7bf 100644 --- a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/context.go +++ b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/context.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" "github.com/fatih/color" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/listen.go b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/listen.go index 3e33f030734..ce927cffa66 100644 --- a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/listen.go +++ b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/listen.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.demo/internal/project" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/extensions/microsoft.azd.demo/internal/project" + "github.com/azure/azure-dev/pkg/azdext" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/mcp.go b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/mcp.go index 81ab21c125c..2fe8de164e1 100644 --- a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/mcp.go +++ b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/mcp.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" "github.com/spf13/cobra" diff --git a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/prompt.go b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/prompt.go index e6db7f2d06c..38a5fbdd607 100644 --- a/cli/azd/extensions/microsoft.azd.demo/internal/cmd/prompt.go +++ b/cli/azd/extensions/microsoft.azd.demo/internal/cmd/prompt.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" "github.com/fatih/color" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.demo/internal/project/framework_service_demo.go b/cli/azd/extensions/microsoft.azd.demo/internal/project/framework_service_demo.go index d2bef7a5ba0..f697f9707b6 100644 --- a/cli/azd/extensions/microsoft.azd.demo/internal/project/framework_service_demo.go +++ b/cli/azd/extensions/microsoft.azd.demo/internal/project/framework_service_demo.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" ) // Ensure DemoFrameworkServiceProvider implements FrameworkServiceProvider interface diff --git a/cli/azd/extensions/microsoft.azd.demo/internal/project/service_target_demo.go b/cli/azd/extensions/microsoft.azd.demo/internal/project/service_target_demo.go index 6133c722be0..1b00c035711 100644 --- a/cli/azd/extensions/microsoft.azd.demo/internal/project/service_target_demo.go +++ b/cli/azd/extensions/microsoft.azd.demo/internal/project/service_target_demo.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" ) // Ensure DemoServiceTargetProvider implements ServiceTargetProvider interface diff --git a/cli/azd/extensions/microsoft.azd.demo/main.go b/cli/azd/extensions/microsoft.azd.demo/main.go index b013bd28a0b..3d25d80cc13 100644 --- a/cli/azd/extensions/microsoft.azd.demo/main.go +++ b/cli/azd/extensions/microsoft.azd.demo/main.go @@ -7,7 +7,7 @@ import ( "context" "os" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.demo/internal/cmd" + "github.com/azure/azure-dev/extensions/microsoft.azd.demo/internal/cmd" "github.com/fatih/color" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/build.go b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/build.go index 1034b7b721c..e21a1290b0f 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/build.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/build.go @@ -13,12 +13,12 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/models" - "github.com/azure/azure-dev/cli/azd/pkg/common" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/models" + "github.com/azure/azure-dev/pkg/common" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/init.go b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/init.go index 3badaba2275..18e0a6628c7 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/init.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/init.go @@ -16,14 +16,14 @@ import ( "strings" "text/template" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/models" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/resources" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/common" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/models" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/resources" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/common" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" "go.yaml.in/yaml/v3" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/pack.go b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/pack.go index 2533e890a24..60ae1c53b7b 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/pack.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/pack.go @@ -11,12 +11,12 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/models" - "github.com/azure/azure-dev/cli/azd/pkg/common" - "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/pkg/ux" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/models" + "github.com/azure/azure-dev/pkg/common" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/publish.go b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/publish.go index 475b9859b51..1cc1a48f675 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/publish.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/publish.go @@ -13,14 +13,14 @@ import ( "strings" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/github" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/models" - "github.com/azure/azure-dev/cli/azd/pkg/common" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "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/pkg/ux" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/github" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/models" + "github.com/azure/azure-dev/pkg/common" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/release.go b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/release.go index b18591c273c..b2166830a09 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/release.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/release.go @@ -11,13 +11,13 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/github" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/models" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/common" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/github" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/models" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/common" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/watch.go b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/watch.go index 64563e5eabd..179f5d4ec8b 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/watch.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/cmd/watch.go @@ -10,7 +10,7 @@ import ( "path/filepath" "time" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" "github.com/bmatcuk/doublestar/v4" "github.com/fatih/color" "github.com/fsnotify/fsnotify" diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/github/github.go b/cli/azd/extensions/microsoft.azd.extensions/internal/github/github.go index 1444ff63c45..a3fff238a11 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/github/github.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/github/github.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/pkg/common" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/pkg/common" ) var ( diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema.go b/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema.go index db1b0e727bf..c0b3a6d6c87 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/output" "go.yaml.in/yaml/v3" ) diff --git a/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema_test.go b/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema_test.go index a9ae454d94a..d41d0bed56c 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema_test.go +++ b/cli/azd/extensions/microsoft.azd.extensions/internal/models/extension_schema_test.go @@ -6,8 +6,8 @@ package models import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/test/snapshot" "github.com/stretchr/testify/require" "go.yaml.in/yaml/v3" diff --git a/cli/azd/extensions/microsoft.azd.extensions/main.go b/cli/azd/extensions/microsoft.azd.extensions/main.go index baf5a11045d..42eb0fb657a 100644 --- a/cli/azd/extensions/microsoft.azd.extensions/main.go +++ b/cli/azd/extensions/microsoft.azd.extensions/main.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal" - "github.com/azure/azure-dev/cli/azd/extensions/microsoft.azd.extensions/internal/cmd" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal" + "github.com/azure/azure-dev/extensions/microsoft.azd.extensions/internal/cmd" "github.com/fatih/color" ) diff --git a/go.mod b/cli/azd/go.mod similarity index 100% rename from go.mod rename to cli/azd/go.mod diff --git a/go.sum b/cli/azd/go.sum similarity index 100% rename from go.sum rename to cli/azd/go.sum diff --git a/cli/azd/internal/agent/agent.go b/cli/azd/internal/agent/agent.go index 6bd3b69f4d2..235134dc17f 100644 --- a/cli/azd/internal/agent/agent.go +++ b/cli/azd/internal/agent/agent.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/logging" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/logging" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/tmc/langchaingo/agents" "github.com/tmc/langchaingo/callbacks" "github.com/tmc/langchaingo/llms" diff --git a/cli/azd/internal/agent/agent_factory.go b/cli/azd/internal/agent/agent_factory.go index b6a23f981c0..a0416a6a596 100644 --- a/cli/azd/internal/agent/agent_factory.go +++ b/cli/azd/internal/agent/agent_factory.go @@ -9,15 +9,15 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/internal/agent/consent" - "github.com/azure/azure-dev/cli/azd/internal/agent/logging" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - localtools "github.com/azure/azure-dev/cli/azd/internal/agent/tools" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - mcptools "github.com/azure/azure-dev/cli/azd/internal/agent/tools/mcp" - "github.com/azure/azure-dev/cli/azd/internal/mcp" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/llm" + "github.com/azure/azure-dev/internal/agent/consent" + "github.com/azure/azure-dev/internal/agent/logging" + "github.com/azure/azure-dev/internal/agent/security" + localtools "github.com/azure/azure-dev/internal/agent/tools" + "github.com/azure/azure-dev/internal/agent/tools/common" + mcptools "github.com/azure/azure-dev/internal/agent/tools/mcp" + "github.com/azure/azure-dev/internal/mcp" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/llm" ) // AgentFactory is responsible for creating agent instances diff --git a/cli/azd/internal/agent/consent/checker.go b/cli/azd/internal/agent/consent/checker.go index 00ec5a7ad78..c0144c2db43 100644 --- a/cli/azd/internal/agent/consent/checker.go +++ b/cli/azd/internal/agent/consent/checker.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/consent/consent_wrapper_tool.go b/cli/azd/internal/agent/consent/consent_wrapper_tool.go index 4bde700e958..ad0367ae81d 100644 --- a/cli/azd/internal/agent/consent/consent_wrapper_tool.go +++ b/cli/azd/internal/agent/consent/consent_wrapper_tool.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/internal/agent/tools/common" + "github.com/azure/azure-dev/pkg/input" "github.com/mark3labs/mcp-go/mcp" "github.com/tmc/langchaingo/tools" ) diff --git a/cli/azd/internal/agent/consent/manager.go b/cli/azd/internal/agent/consent/manager.go index 1f713bf5d10..c126630644f 100644 --- a/cli/azd/internal/agent/consent/manager.go +++ b/cli/azd/internal/agent/consent/manager.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" + "github.com/azure/azure-dev/internal/agent/tools/common" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" ) const ( diff --git a/cli/azd/internal/agent/consent/types.go b/cli/azd/internal/agent/consent/types.go index 7b7a8ba118f..b5d60b2bdf4 100644 --- a/cli/azd/internal/agent/consent/types.go +++ b/cli/azd/internal/agent/consent/types.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/conversational_agent.go b/cli/azd/internal/agent/conversational_agent.go index 15a8cdd994b..70cc49a54c3 100644 --- a/cli/azd/internal/agent/conversational_agent.go +++ b/cli/azd/internal/agent/conversational_agent.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - uxlib "github.com/azure/azure-dev/cli/azd/pkg/ux" - "github.com/azure/azure-dev/cli/azd/pkg/watch" + "github.com/azure/azure-dev/internal/agent/tools/common" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + uxlib "github.com/azure/azure-dev/pkg/ux" + "github.com/azure/azure-dev/pkg/watch" "github.com/fatih/color" "github.com/tmc/langchaingo/agents" "github.com/tmc/langchaingo/chains" diff --git a/cli/azd/internal/agent/feedback/feedback.go b/cli/azd/internal/agent/feedback/feedback.go index 14efa3afadb..e11c12a3c83 100644 --- a/cli/azd/internal/agent/feedback/feedback.go +++ b/cli/azd/internal/agent/feedback/feedback.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/agent" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - uxlib "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/internal/agent" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + uxlib "github.com/azure/azure-dev/pkg/ux" "github.com/fatih/color" ) diff --git a/cli/azd/internal/agent/tools/dev/command_executor.go b/cli/azd/internal/agent/tools/dev/command_executor.go index b142a4ca4ce..f95a541ffc6 100644 --- a/cli/azd/internal/agent/tools/dev/command_executor.go +++ b/cli/azd/internal/agent/tools/dev/command_executor.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/dev/loader.go b/cli/azd/internal/agent/tools/dev/loader.go index a67e4ca5b05..8be7d633f9f 100644 --- a/cli/azd/internal/agent/tools/dev/loader.go +++ b/cli/azd/internal/agent/tools/dev/loader.go @@ -6,7 +6,7 @@ package dev import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" ) // DevToolLoader loads development-related tools diff --git a/cli/azd/internal/agent/tools/io/change_directory.go b/cli/azd/internal/agent/tools/io/change_directory.go index cf6a6cde83a..e08f2d48709 100644 --- a/cli/azd/internal/agent/tools/io/change_directory.go +++ b/cli/azd/internal/agent/tools/io/change_directory.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/change_directory_test.go b/cli/azd/internal/agent/tools/io/change_directory_test.go index 60ffdb01907..af55c20e864 100644 --- a/cli/azd/internal/agent/tools/io/change_directory_test.go +++ b/cli/azd/internal/agent/tools/io/change_directory_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/copy_file.go b/cli/azd/internal/agent/tools/io/copy_file.go index f2c5a032485..9887706749f 100644 --- a/cli/azd/internal/agent/tools/io/copy_file.go +++ b/cli/azd/internal/agent/tools/io/copy_file.go @@ -11,8 +11,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/copy_file_test.go b/cli/azd/internal/agent/tools/io/copy_file_test.go index 103c33e47f0..46332c921c1 100644 --- a/cli/azd/internal/agent/tools/io/copy_file_test.go +++ b/cli/azd/internal/agent/tools/io/copy_file_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/create_directory.go b/cli/azd/internal/agent/tools/io/create_directory.go index b6d8b4c21b8..af432dccca3 100644 --- a/cli/azd/internal/agent/tools/io/create_directory.go +++ b/cli/azd/internal/agent/tools/io/create_directory.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/create_directory_test.go b/cli/azd/internal/agent/tools/io/create_directory_test.go index b0fa67dc5f8..115f03f28fa 100644 --- a/cli/azd/internal/agent/tools/io/create_directory_test.go +++ b/cli/azd/internal/agent/tools/io/create_directory_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/current_directory.go b/cli/azd/internal/agent/tools/io/current_directory.go index 64961b72c97..9dca267b949 100644 --- a/cli/azd/internal/agent/tools/io/current_directory.go +++ b/cli/azd/internal/agent/tools/io/current_directory.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/delete_directory.go b/cli/azd/internal/agent/tools/io/delete_directory.go index 406d1a8b8a2..92223891822 100644 --- a/cli/azd/internal/agent/tools/io/delete_directory.go +++ b/cli/azd/internal/agent/tools/io/delete_directory.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/delete_directory_test.go b/cli/azd/internal/agent/tools/io/delete_directory_test.go index d609f11b046..7534100f8c2 100644 --- a/cli/azd/internal/agent/tools/io/delete_directory_test.go +++ b/cli/azd/internal/agent/tools/io/delete_directory_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/delete_file.go b/cli/azd/internal/agent/tools/io/delete_file.go index 82e0f79c5e2..63361151c14 100644 --- a/cli/azd/internal/agent/tools/io/delete_file.go +++ b/cli/azd/internal/agent/tools/io/delete_file.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/delete_file_test.go b/cli/azd/internal/agent/tools/io/delete_file_test.go index 15eb1ead88f..95e6b3ed9df 100644 --- a/cli/azd/internal/agent/tools/io/delete_file_test.go +++ b/cli/azd/internal/agent/tools/io/delete_file_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/directory_list.go b/cli/azd/internal/agent/tools/io/directory_list.go index 72c129d5f7c..7345b86b93f 100644 --- a/cli/azd/internal/agent/tools/io/directory_list.go +++ b/cli/azd/internal/agent/tools/io/directory_list.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/directory_list_test.go b/cli/azd/internal/agent/tools/io/directory_list_test.go index ee9c6155138..281519971e6 100644 --- a/cli/azd/internal/agent/tools/io/directory_list_test.go +++ b/cli/azd/internal/agent/tools/io/directory_list_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/file_info.go b/cli/azd/internal/agent/tools/io/file_info.go index 3402255e77e..ee64af25754 100644 --- a/cli/azd/internal/agent/tools/io/file_info.go +++ b/cli/azd/internal/agent/tools/io/file_info.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/file_info_test.go b/cli/azd/internal/agent/tools/io/file_info_test.go index 39ed72858e8..02ac9c0ba36 100644 --- a/cli/azd/internal/agent/tools/io/file_info_test.go +++ b/cli/azd/internal/agent/tools/io/file_info_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/file_search.go b/cli/azd/internal/agent/tools/io/file_search.go index 21595d4fe42..7d3e72e2165 100644 --- a/cli/azd/internal/agent/tools/io/file_search.go +++ b/cli/azd/internal/agent/tools/io/file_search.go @@ -9,8 +9,8 @@ import ( "fmt" "sort" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/bmatcuk/doublestar/v4" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/loader.go b/cli/azd/internal/agent/tools/io/loader.go index f2d448d0486..b8ebafe3c7a 100644 --- a/cli/azd/internal/agent/tools/io/loader.go +++ b/cli/azd/internal/agent/tools/io/loader.go @@ -6,8 +6,8 @@ package io import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" ) // IoToolsLoader loads IO-related tools diff --git a/cli/azd/internal/agent/tools/io/move_file.go b/cli/azd/internal/agent/tools/io/move_file.go index 61e70174fa0..0c0bc6a947f 100644 --- a/cli/azd/internal/agent/tools/io/move_file.go +++ b/cli/azd/internal/agent/tools/io/move_file.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/move_file_test.go b/cli/azd/internal/agent/tools/io/move_file_test.go index 2464d40a1bf..767be865b41 100644 --- a/cli/azd/internal/agent/tools/io/move_file_test.go +++ b/cli/azd/internal/agent/tools/io/move_file_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/read_file.go b/cli/azd/internal/agent/tools/io/read_file.go index ec2cd71345c..ee688b7f0ac 100644 --- a/cli/azd/internal/agent/tools/io/read_file.go +++ b/cli/azd/internal/agent/tools/io/read_file.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/io/read_file_test.go b/cli/azd/internal/agent/tools/io/read_file_test.go index dbcd563c07e..cc56ac72a8c 100644 --- a/cli/azd/internal/agent/tools/io/read_file_test.go +++ b/cli/azd/internal/agent/tools/io/read_file_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/agent/tools/io/test_helpers.go b/cli/azd/internal/agent/tools/io/test_helpers.go index 99fef89b3d3..84148ededec 100644 --- a/cli/azd/internal/agent/tools/io/test_helpers.go +++ b/cli/azd/internal/agent/tools/io/test_helpers.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/security" ) // mustMarshalJSON is a test helper function to marshal request structs to JSON strings diff --git a/cli/azd/internal/agent/tools/io/write_file.go b/cli/azd/internal/agent/tools/io/write_file.go index 620465cae9a..72b65d10681 100644 --- a/cli/azd/internal/agent/tools/io/write_file.go +++ b/cli/azd/internal/agent/tools/io/write_file.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/cli/azd/internal/agent/tools/loader.go b/cli/azd/internal/agent/tools/loader.go index e8ee4e7bfc6..cec1d3c8844 100644 --- a/cli/azd/internal/agent/tools/loader.go +++ b/cli/azd/internal/agent/tools/loader.go @@ -6,10 +6,10 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/agent/security" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/dev" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/io" + "github.com/azure/azure-dev/internal/agent/security" + "github.com/azure/azure-dev/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/dev" + "github.com/azure/azure-dev/internal/agent/tools/io" ) // LocalToolsLoader manages loading tools from multiple local tool categories diff --git a/cli/azd/internal/agent/tools/mcp/elicitation_handler.go b/cli/azd/internal/agent/tools/mcp/elicitation_handler.go index 931ad7a17aa..a85eb54c9f4 100644 --- a/cli/azd/internal/agent/tools/mcp/elicitation_handler.go +++ b/cli/azd/internal/agent/tools/mcp/elicitation_handler.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/consent" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/internal/agent/consent" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ux" "github.com/mark3labs/mcp-go/client" "github.com/mark3labs/mcp-go/mcp" "github.com/santhosh-tekuri/jsonschema/v6" diff --git a/cli/azd/internal/agent/tools/mcp/loader.go b/cli/azd/internal/agent/tools/mcp/loader.go index 0359f707c42..676b15ea62e 100644 --- a/cli/azd/internal/agent/tools/mcp/loader.go +++ b/cli/azd/internal/agent/tools/mcp/loader.go @@ -9,8 +9,8 @@ import ( _ "embed" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" - "github.com/azure/azure-dev/cli/azd/internal/mcp" + "github.com/azure/azure-dev/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/mcp" ) //go:embed mcp.json diff --git a/cli/azd/internal/agent/tools/mcp/sampling_handler.go b/cli/azd/internal/agent/tools/mcp/sampling_handler.go index c3edc0d0bab..67d737fdda3 100644 --- a/cli/azd/internal/agent/tools/mcp/sampling_handler.go +++ b/cli/azd/internal/agent/tools/mcp/sampling_handler.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/internal/agent/consent" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/llm" + "github.com/azure/azure-dev/internal/agent/consent" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/llm" "github.com/fatih/color" "github.com/mark3labs/mcp-go/client" "github.com/mark3labs/mcp-go/mcp" diff --git a/cli/azd/internal/agent/tools/mcp/tool_adapter.go b/cli/azd/internal/agent/tools/mcp/tool_adapter.go index 51e39443d70..773819651aa 100644 --- a/cli/azd/internal/agent/tools/mcp/tool_adapter.go +++ b/cli/azd/internal/agent/tools/mcp/tool_adapter.go @@ -8,7 +8,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/agent/tools/common" + "github.com/azure/azure-dev/internal/agent/tools/common" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/appdetect/appdetect.go b/cli/azd/internal/appdetect/appdetect.go index afc30910b40..f223898aea2 100644 --- a/cli/azd/internal/appdetect/appdetect.go +++ b/cli/azd/internal/appdetect/appdetect.go @@ -12,9 +12,9 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/maven" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/maven" "github.com/bmatcuk/doublestar/v4" ) diff --git a/cli/azd/internal/appdetect/appdetect_test.go b/cli/azd/internal/appdetect/appdetect_test.go index 2182293a5ba..db65a8f2155 100644 --- a/cli/azd/internal/appdetect/appdetect_test.go +++ b/cli/azd/internal/appdetect/appdetect_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/bmatcuk/doublestar/v4" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/appdetect/docker_test.go b/cli/azd/internal/appdetect/docker_test.go index 83f9561e853..b802fcefc53 100644 --- a/cli/azd/internal/appdetect/docker_test.go +++ b/cli/azd/internal/appdetect/docker_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/internal/appdetect/dotnet.go b/cli/azd/internal/appdetect/dotnet.go index f4a93328733..ea2a056eb36 100644 --- a/cli/azd/internal/appdetect/dotnet.go +++ b/cli/azd/internal/appdetect/dotnet.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) type dotNetDetector struct { diff --git a/cli/azd/internal/appdetect/dotnet_apphost.go b/cli/azd/internal/appdetect/dotnet_apphost.go index 999cb264512..97cabbd63a2 100644 --- a/cli/azd/internal/appdetect/dotnet_apphost.go +++ b/cli/azd/internal/appdetect/dotnet_apphost.go @@ -11,7 +11,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) type dotNetAppHostDetector struct { diff --git a/cli/azd/internal/appdetect/dotnet_apphost_test.go b/cli/azd/internal/appdetect/dotnet_apphost_test.go index 77d33c66951..de147f1f8cd 100644 --- a/cli/azd/internal/appdetect/dotnet_apphost_test.go +++ b/cli/azd/internal/appdetect/dotnet_apphost_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/appdetect/java.go b/cli/azd/internal/appdetect/java.go index eebca28c02d..b740d2e79f7 100644 --- a/cli/azd/internal/appdetect/java.go +++ b/cli/azd/internal/appdetect/java.go @@ -13,7 +13,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/tools/maven" + "github.com/azure/azure-dev/pkg/tools/maven" ) type javaDetector struct { diff --git a/cli/azd/internal/appdetect/java_test.go b/cli/azd/internal/appdetect/java_test.go index c448a2bcfa4..42e98482b85 100644 --- a/cli/azd/internal/appdetect/java_test.go +++ b/cli/azd/internal/appdetect/java_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools/maven" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools/maven" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/internal/cmd/add/add.go b/cli/azd/internal/cmd/add/add.go index 092bf878873..246ff15a2d6 100644 --- a/cli/azd/internal/cmd/add/add.go +++ b/cli/azd/internal/cmd/add/add.go @@ -16,23 +16,23 @@ import ( "dario.cat/mergo" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" - "github.com/azure/azure-dev/cli/azd/pkg/yamlnode" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/workflow" + "github.com/azure/azure-dev/pkg/yamlnode" "github.com/braydonk/yaml" "github.com/spf13/cobra" ) diff --git a/cli/azd/internal/cmd/add/add_configure.go b/cli/azd/internal/cmd/add/add_configure.go index 7eb7ea5a518..db679bd3ca7 100644 --- a/cli/azd/internal/cmd/add/add_configure.go +++ b/cli/azd/internal/cmd/add/add_configure.go @@ -10,10 +10,10 @@ import ( "strings" "unicode" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/project" ) // DbMap is a map of supported database dependencies. diff --git a/cli/azd/internal/cmd/add/add_configure_existing.go b/cli/azd/internal/cmd/add/add_configure_existing.go index 0b07d636366..0780a9ce6a6 100644 --- a/cli/azd/internal/cmd/add/add_configure_existing.go +++ b/cli/azd/internal/cmd/add/add_configure_existing.go @@ -7,9 +7,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/project" ) // ConfigureExisting prompts the user to configure details for an existing resource. diff --git a/cli/azd/internal/cmd/add/add_configure_host.go b/cli/azd/internal/cmd/add/add_configure_host.go index 594eaa0a607..72dc165c938 100644 --- a/cli/azd/internal/cmd/add/add_configure_host.go +++ b/cli/azd/internal/cmd/add/add_configure_host.go @@ -14,14 +14,14 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" ) // LanguageMap is a map of supported languages. diff --git a/cli/azd/internal/cmd/add/add_configure_messaging.go b/cli/azd/internal/cmd/add/add_configure_messaging.go index d227d2c2f99..9051d71b13a 100644 --- a/cli/azd/internal/cmd/add/add_configure_messaging.go +++ b/cli/azd/internal/cmd/add/add_configure_messaging.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/project" ) func fillEventHubs( diff --git a/cli/azd/internal/cmd/add/add_configure_storage.go b/cli/azd/internal/cmd/add/add_configure_storage.go index 5d1b670294f..68bbb6640ef 100644 --- a/cli/azd/internal/cmd/add/add_configure_storage.go +++ b/cli/azd/internal/cmd/add/add_configure_storage.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/project" ) const ( diff --git a/cli/azd/internal/cmd/add/add_preview.go b/cli/azd/internal/cmd/add/add_preview.go index 51efa17ac2c..db6d2a515d1 100644 --- a/cli/azd/internal/cmd/add/add_preview.go +++ b/cli/azd/internal/cmd/add/add_preview.go @@ -14,12 +14,12 @@ import ( "strings" "text/tabwriter" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/project" "github.com/fatih/color" ) diff --git a/cli/azd/internal/cmd/add/add_select.go b/cli/azd/internal/cmd/add/add_select.go index da468d6fd43..3921170a6d8 100644 --- a/cli/azd/internal/cmd/add/add_select.go +++ b/cli/azd/internal/cmd/add/add_select.go @@ -13,11 +13,11 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/project" ) // resourceSelection prompts the user to select a given resource type, returning the resulting resource configuration. diff --git a/cli/azd/internal/cmd/add/add_select_ai.go b/cli/azd/internal/cmd/add/add_select_ai.go index 7917577e7a0..83e28283568 100644 --- a/cli/azd/internal/cmd/add/add_select_ai.go +++ b/cli/azd/internal/cmd/add/add_select_ai.go @@ -13,13 +13,13 @@ import ( "strings" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/azureutil" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/pkg/azureutil" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" ) func (a *AddAction) selectSearch( diff --git a/cli/azd/internal/cmd/add/add_test.go b/cli/azd/internal/cmd/add/add_test.go index 997288c96eb..60d010a79bf 100644 --- a/cli/azd/internal/cmd/add/add_test.go +++ b/cli/azd/internal/cmd/add/add_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/project" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/cmd/add/diff.go b/cli/azd/internal/cmd/add/diff.go index e279b81d6e8..00d39f7f3ab 100644 --- a/cli/azd/internal/cmd/add/diff.go +++ b/cli/azd/internal/cmd/add/diff.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/pkg/project" "github.com/braydonk/yaml" "github.com/fatih/color" dmp "github.com/sergi/go-diff/diffmatchpatch" diff --git a/cli/azd/internal/cmd/add/util.go b/cli/azd/internal/cmd/add/util.go index 42999451a08..4e8f1f59b0b 100644 --- a/cli/azd/internal/cmd/add/util.go +++ b/cli/azd/internal/cmd/add/util.go @@ -14,12 +14,12 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" ) func validateServiceName(name string, prj *project.ProjectConfig) error { diff --git a/cli/azd/internal/cmd/cmd_help.go b/cli/azd/internal/cmd/cmd_help.go index b86c7656149..e7d4eb7a180 100644 --- a/cli/azd/internal/cmd/cmd_help.go +++ b/cli/azd/internal/cmd/cmd_help.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // NonPersistentGlobalFlags are flags that appear on all commands but are generated per-command diff --git a/cli/azd/internal/cmd/deploy.go b/cli/azd/internal/cmd/deploy.go index 9669efc9197..76698cdb440 100644 --- a/cli/azd/internal/cmd/deploy.go +++ b/cli/azd/internal/cmd/deploy.go @@ -13,21 +13,21 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/internal/cmd/errors.go b/cli/azd/internal/cmd/errors.go index 629f2aa62c9..361b8a4d725 100644 --- a/cli/azd/internal/cmd/errors.go +++ b/cli/azd/internal/cmd/errors.go @@ -13,12 +13,12 @@ import ( "github.com/AlecAivazis/survey/v2/terminal" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/extensions" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" ) diff --git a/cli/azd/internal/cmd/errors_test.go b/cli/azd/internal/cmd/errors_test.go index 9e14a098181..88e16c91ad3 100644 --- a/cli/azd/internal/cmd/errors_test.go +++ b/cli/azd/internal/cmd/errors_test.go @@ -10,11 +10,11 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks/mocktracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks/mocktracing" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" ) diff --git a/cli/azd/internal/cmd/provision.go b/cli/azd/internal/cmd/provision.go index 4f3d4250953..8b7cf4d8e5b 100644 --- a/cli/azd/internal/cmd/provision.go +++ b/cli/azd/internal/cmd/provision.go @@ -13,18 +13,18 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.uber.org/multierr" diff --git a/cli/azd/internal/cmd/publish.go b/cli/azd/internal/cmd/publish.go index 39cdbd6f3dc..aed9e629649 100644 --- a/cli/azd/internal/cmd/publish.go +++ b/cli/azd/internal/cmd/publish.go @@ -15,22 +15,22 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "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/project" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/tools/docker" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/internal/cmd/show/show.go b/cli/azd/internal/cmd/show/show.go index 1bf5d907ff7..1375812ec69 100644 --- a/cli/azd/internal/cmd/show/show.go +++ b/cli/azd/internal/cmd/show/show.go @@ -19,23 +19,23 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v3" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "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/project" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/internal/cmd/show/show_resource.go b/cli/azd/internal/cmd/show/show_resource.go index a7683bd6745..272b370abec 100644 --- a/cli/azd/internal/cmd/show/show_resource.go +++ b/cli/azd/internal/cmd/show/show_resource.go @@ -11,14 +11,14 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/braydonk/yaml" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/yamlnode" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/yamlnode" ) type showResource struct { diff --git a/cli/azd/internal/cmd/util.go b/cli/azd/internal/cmd/util.go index 8ab1cfaae61..7d0a59adac9 100644 --- a/cli/azd/internal/cmd/util.go +++ b/cli/azd/internal/cmd/util.go @@ -11,10 +11,10 @@ import ( "strconv" "time" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/project" ) func getResourceGroupFollowUp( diff --git a/cli/azd/internal/figspec/spec_builder.go b/cli/azd/internal/figspec/spec_builder.go index ed13415e477..79332dc2100 100644 --- a/cli/azd/internal/figspec/spec_builder.go +++ b/cli/azd/internal/figspec/spec_builder.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/internal/cmd" + "github.com/azure/azure-dev/internal/cmd" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cli/azd/internal/grpcserver/account_service.go b/cli/azd/internal/grpcserver/account_service.go index fcfb3243068..bec6dd63b4e 100644 --- a/cli/azd/internal/grpcserver/account_service.go +++ b/cli/azd/internal/grpcserver/account_service.go @@ -6,8 +6,8 @@ package grpcserver import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azdext" ) type accountService struct { diff --git a/cli/azd/internal/grpcserver/compose_service.go b/cli/azd/internal/grpcserver/compose_service.go index 2d84d2a3bc2..b75fcc58e93 100644 --- a/cli/azd/internal/grpcserver/compose_service.go +++ b/cli/azd/internal/grpcserver/compose_service.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cli/azd/internal/grpcserver/compose_service_test.go b/cli/azd/internal/grpcserver/compose_service_test.go index 748dd108e77..9760c7eb5e9 100644 --- a/cli/azd/internal/grpcserver/compose_service_test.go +++ b/cli/azd/internal/grpcserver/compose_service_test.go @@ -10,13 +10,13 @@ import ( "math/big" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/grpcserver/container_service.go b/cli/azd/internal/grpcserver/container_service.go index bffe0f857a9..78b7533b6b8 100644 --- a/cli/azd/internal/grpcserver/container_service.go +++ b/cli/azd/internal/grpcserver/container_service.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" ) type containerService struct { diff --git a/cli/azd/internal/grpcserver/deployment_service.go b/cli/azd/internal/grpcserver/deployment_service.go index 795de3e5f2e..eacad7c5ff1 100644 --- a/cli/azd/internal/grpcserver/deployment_service.go +++ b/cli/azd/internal/grpcserver/deployment_service.go @@ -6,13 +6,13 @@ package grpcserver import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra/provisioning/bicep" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" ) type deploymentService struct { diff --git a/cli/azd/internal/grpcserver/environment_service.go b/cli/azd/internal/grpcserver/environment_service.go index ad0b684d00f..88c49d7a11a 100644 --- a/cli/azd/internal/grpcserver/environment_service.go +++ b/cli/azd/internal/grpcserver/environment_service.go @@ -8,10 +8,10 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/lazy" ) type environmentService struct { diff --git a/cli/azd/internal/grpcserver/environment_service_test.go b/cli/azd/internal/grpcserver/environment_service_test.go index d9e6263fab2..b1417f2173c 100644 --- a/cli/azd/internal/grpcserver/environment_service_test.go +++ b/cli/azd/internal/grpcserver/environment_service_test.go @@ -7,13 +7,13 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/grpcserver/event_service.go b/cli/azd/internal/grpcserver/event_service.go index 83f160e8b3e..4e56a69d91e 100644 --- a/cli/azd/internal/grpcserver/event_service.go +++ b/cli/azd/internal/grpcserver/event_service.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cli/azd/internal/grpcserver/event_service_test.go b/cli/azd/internal/grpcserver/event_service_test.go index b110d420fa7..0e5a4a8c36f 100644 --- a/cli/azd/internal/grpcserver/event_service_test.go +++ b/cli/azd/internal/grpcserver/event_service_test.go @@ -7,14 +7,14 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/internal/grpcserver/extension_claims.go b/cli/azd/internal/grpcserver/extension_claims.go index ea550cb6137..397b5f65440 100644 --- a/cli/azd/internal/grpcserver/extension_claims.go +++ b/cli/azd/internal/grpcserver/extension_claims.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/pkg/extensions" "github.com/golang-jwt/jwt/v5" ) diff --git a/cli/azd/internal/grpcserver/extension_claims_test.go b/cli/azd/internal/grpcserver/extension_claims_test.go index e85fd45acbc..53701a1fe04 100644 --- a/cli/azd/internal/grpcserver/extension_claims_test.go +++ b/cli/azd/internal/grpcserver/extension_claims_test.go @@ -6,7 +6,7 @@ package grpcserver import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/pkg/extensions" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/grpcserver/extension_service.go b/cli/azd/internal/grpcserver/extension_service.go index 77b503ebabc..92294c3ca5f 100644 --- a/cli/azd/internal/grpcserver/extension_service.go +++ b/cli/azd/internal/grpcserver/extension_service.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/extensions" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cli/azd/internal/grpcserver/framework_service.go b/cli/azd/internal/grpcserver/framework_service.go index a2418574c5c..94e0c38f5ac 100644 --- a/cli/azd/internal/grpcserver/framework_service.go +++ b/cli/azd/internal/grpcserver/framework_service.go @@ -10,12 +10,12 @@ import ( "log" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/project" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cli/azd/internal/grpcserver/project_service.go b/cli/azd/internal/grpcserver/project_service.go index 04ffadc9ad1..6d64259bd07 100644 --- a/cli/azd/internal/grpcserver/project_service.go +++ b/cli/azd/internal/grpcserver/project_service.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" ) type projectService struct { diff --git a/cli/azd/internal/grpcserver/project_service_test.go b/cli/azd/internal/grpcserver/project_service_test.go index ff55a66ef13..8c1b955aab6 100644 --- a/cli/azd/internal/grpcserver/project_service_test.go +++ b/cli/azd/internal/grpcserver/project_service_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/grpcserver/prompt_service.go b/cli/azd/internal/grpcserver/prompt_service.go index a78adbaa2eb..6a3d2d72995 100644 --- a/cli/azd/internal/grpcserver/prompt_service.go +++ b/cli/azd/internal/grpcserver/prompt_service.go @@ -9,11 +9,11 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/ux" ) type promptService struct { diff --git a/cli/azd/internal/grpcserver/server.go b/cli/azd/internal/grpcserver/server.go index fc1873b0c31..85700bb8c8e 100644 --- a/cli/azd/internal/grpcserver/server.go +++ b/cli/azd/internal/grpcserver/server.go @@ -10,7 +10,7 @@ import ( "log" "net" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/pkg/azdext" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/cli/azd/internal/grpcserver/server_test.go b/cli/azd/internal/grpcserver/server_test.go index 0697ed33307..832af19aaa1 100644 --- a/cli/azd/internal/grpcserver/server_test.go +++ b/cli/azd/internal/grpcserver/server_test.go @@ -11,8 +11,8 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/extensions" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cli/azd/internal/grpcserver/service_target_service.go b/cli/azd/internal/grpcserver/service_target_service.go index 09242fb38f5..034ece5f58b 100644 --- a/cli/azd/internal/grpcserver/service_target_service.go +++ b/cli/azd/internal/grpcserver/service_target_service.go @@ -10,15 +10,15 @@ import ( "log" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cli/azd/internal/grpcserver/user_config_service.go b/cli/azd/internal/grpcserver/user_config_service.go index a6ee464ec92..e1315284c79 100644 --- a/cli/azd/internal/grpcserver/user_config_service.go +++ b/cli/azd/internal/grpcserver/user_config_service.go @@ -8,8 +8,8 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/config" ) // configService is the implementation of ConfigServiceServer. diff --git a/cli/azd/internal/grpcserver/user_config_service_test.go b/cli/azd/internal/grpcserver/user_config_service_test.go index a2ba66d87f4..f7cffb669a4 100644 --- a/cli/azd/internal/grpcserver/user_config_service_test.go +++ b/cli/azd/internal/grpcserver/user_config_service_test.go @@ -8,9 +8,9 @@ import ( "encoding/json" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/grpcserver/workflow_service.go b/cli/azd/internal/grpcserver/workflow_service.go index 1092fa44b86..579bd7a9266 100644 --- a/cli/azd/internal/grpcserver/workflow_service.go +++ b/cli/azd/internal/grpcserver/workflow_service.go @@ -6,8 +6,8 @@ package grpcserver import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/workflow" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cli/azd/internal/grpcserver/workflow_service_test.go b/cli/azd/internal/grpcserver/workflow_service_test.go index 7b4dac39446..d48c192166c 100644 --- a/cli/azd/internal/grpcserver/workflow_service_test.go +++ b/cli/azd/internal/grpcserver/workflow_service_test.go @@ -8,9 +8,9 @@ import ( "errors" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/workflow" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/mcp/host.go b/cli/azd/internal/mcp/host.go index b20215ee850..d670da1fb15 100644 --- a/cli/azd/internal/mcp/host.go +++ b/cli/azd/internal/mcp/host.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/internal/tracing" + "github.com/azure/azure-dev/internal/tracing" "github.com/mark3labs/mcp-go/client" "github.com/mark3labs/mcp-go/client/transport" "github.com/mark3labs/mcp-go/mcp" diff --git a/cli/azd/internal/mcp/tools/azd_architecture_planning.go b/cli/azd/internal/mcp/tools/azd_architecture_planning.go index c36e1135421..14e0ff1367b 100644 --- a/cli/azd/internal/mcp/tools/azd_architecture_planning.go +++ b/cli/azd/internal/mcp/tools/azd_architecture_planning.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_azure_yaml_generation.go b/cli/azd/internal/mcp/tools/azd_azure_yaml_generation.go index 2c17db27e9b..083e5a11e7b 100644 --- a/cli/azd/internal/mcp/tools/azd_azure_yaml_generation.go +++ b/cli/azd/internal/mcp/tools/azd_azure_yaml_generation.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_discovery_analysis.go b/cli/azd/internal/mcp/tools/azd_discovery_analysis.go index 54022ebeabf..4abce436890 100644 --- a/cli/azd/internal/mcp/tools/azd_discovery_analysis.go +++ b/cli/azd/internal/mcp/tools/azd_discovery_analysis.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_docker_generation.go b/cli/azd/internal/mcp/tools/azd_docker_generation.go index 9377f315857..80f69740628 100644 --- a/cli/azd/internal/mcp/tools/azd_docker_generation.go +++ b/cli/azd/internal/mcp/tools/azd_docker_generation.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_error_troubleshooting.go b/cli/azd/internal/mcp/tools/azd_error_troubleshooting.go index 514a9afe94d..d259f239250 100644 --- a/cli/azd/internal/mcp/tools/azd_error_troubleshooting.go +++ b/cli/azd/internal/mcp/tools/azd_error_troubleshooting.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_iac_generation_rules.go b/cli/azd/internal/mcp/tools/azd_iac_generation_rules.go index bb3ed31c912..80f7385e942 100644 --- a/cli/azd/internal/mcp/tools/azd_iac_generation_rules.go +++ b/cli/azd/internal/mcp/tools/azd_iac_generation_rules.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_infrastructure_generation.go b/cli/azd/internal/mcp/tools/azd_infrastructure_generation.go index fb2112e49a1..9c3571455a9 100644 --- a/cli/azd/internal/mcp/tools/azd_infrastructure_generation.go +++ b/cli/azd/internal/mcp/tools/azd_infrastructure_generation.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_plan_init.go b/cli/azd/internal/mcp/tools/azd_plan_init.go index 43b11957a01..63a0f461313 100644 --- a/cli/azd/internal/mcp/tools/azd_plan_init.go +++ b/cli/azd/internal/mcp/tools/azd_plan_init.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/mcp/tools/azd_project_validation.go b/cli/azd/internal/mcp/tools/azd_project_validation.go index 84ea31119e2..4a8d1c2a6f6 100644 --- a/cli/azd/internal/mcp/tools/azd_project_validation.go +++ b/cli/azd/internal/mcp/tools/azd_project_validation.go @@ -6,7 +6,7 @@ package tools import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mcp/tools/prompts" + "github.com/azure/azure-dev/internal/mcp/tools/prompts" "github.com/mark3labs/mcp-go/mcp" "github.com/mark3labs/mcp-go/server" ) diff --git a/cli/azd/internal/repository/app_init.go b/cli/azd/internal/repository/app_init.go index 7264ae6fa7b..d87b4c8013f 100644 --- a/cli/azd/internal/repository/app_init.go +++ b/cli/azd/internal/repository/app_init.go @@ -13,20 +13,20 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/cmd/add" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/cmd/add" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" "github.com/otiai10/copy" ) diff --git a/cli/azd/internal/repository/app_init_test.go b/cli/azd/internal/repository/app_init_test.go index 7cc9fd3e453..e437ee1c396 100644 --- a/cli/azd/internal/repository/app_init_test.go +++ b/cli/azd/internal/repository/app_init_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/project" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/repository/detect_confirm.go b/cli/azd/internal/repository/detect_confirm.go index 45b6f990314..a84c2556c67 100644 --- a/cli/azd/internal/repository/detect_confirm.go +++ b/cli/azd/internal/repository/detect_confirm.go @@ -16,13 +16,13 @@ import ( "time" "github.com/AlecAivazis/survey/v2/terminal" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/cmd/add" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/cmd/add" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" "github.com/fatih/color" "go.opentelemetry.io/otel/attribute" ) diff --git a/cli/azd/internal/repository/detect_confirm_apphost.go b/cli/azd/internal/repository/detect_confirm_apphost.go index 240880cada4..dd65b94e7fe 100644 --- a/cli/azd/internal/repository/detect_confirm_apphost.go +++ b/cli/azd/internal/repository/detect_confirm_apphost.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "go.opentelemetry.io/otel/attribute" ) diff --git a/cli/azd/internal/repository/detect_confirm_test.go b/cli/azd/internal/repository/detect_confirm_test.go index b2b9b4016c9..694d8963535 100644 --- a/cli/azd/internal/repository/detect_confirm_test.go +++ b/cli/azd/internal/repository/detect_confirm_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/repository/infra_confirm.go b/cli/azd/internal/repository/infra_confirm.go index 0f8e771b59f..65e6bd5ba7c 100644 --- a/cli/azd/internal/repository/infra_confirm.go +++ b/cli/azd/internal/repository/infra_confirm.go @@ -10,12 +10,12 @@ import ( "regexp" "strings" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/cmd/add" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/cmd/add" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output/ux" ) // A regex that matches against "likely" well-formed database names diff --git a/cli/azd/internal/repository/infra_confirm_test.go b/cli/azd/internal/repository/infra_confirm_test.go index 2235c64ad17..876085c71e6 100644 --- a/cli/azd/internal/repository/infra_confirm_test.go +++ b/cli/azd/internal/repository/infra_confirm_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/input" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/repository/initializer.go b/cli/azd/internal/repository/initializer.go index 0bf1eff3d39..37fc9a041fa 100644 --- a/cli/azd/internal/repository/initializer.go +++ b/cli/azd/internal/repository/initializer.go @@ -16,19 +16,19 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/templates" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/templates" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/git" "github.com/joho/godotenv" "github.com/otiai10/copy" ) diff --git a/cli/azd/internal/repository/initializer_test.go b/cli/azd/internal/repository/initializer_test.go index dbe8fd0ee5e..50e031fd26d 100644 --- a/cli/azd/internal/repository/initializer_test.go +++ b/cli/azd/internal/repository/initializer_test.go @@ -15,23 +15,23 @@ import ( "testing" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/templates" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockexec" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/platform" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/templates" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/mocks/mockexec" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/internal/repository/prompt_util.go b/cli/azd/internal/repository/prompt_util.go index 33ee08b7cf9..51dbb0ce271 100644 --- a/cli/azd/internal/repository/prompt_util.go +++ b/cli/azd/internal/repository/prompt_util.go @@ -12,7 +12,7 @@ import ( "strings" "text/tabwriter" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/input" ) // tabWrite transforms tabbed output into formatted strings with a given minimal padding. diff --git a/cli/azd/internal/runcontext/cloudshell_test.go b/cli/azd/internal/runcontext/cloudshell_test.go index af09b245048..e9504e97637 100644 --- a/cli/azd/internal/runcontext/cloudshell_test.go +++ b/cli/azd/internal/runcontext/cloudshell_test.go @@ -6,7 +6,7 @@ package runcontext import ( "testing" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/scaffold/resource_expr_eval.go b/cli/azd/internal/scaffold/resource_expr_eval.go index 18c05d101d3..0ce34213c86 100644 --- a/cli/azd/internal/scaffold/resource_expr_eval.go +++ b/cli/azd/internal/scaffold/resource_expr_eval.go @@ -12,7 +12,7 @@ import ( "maps" - "github.com/azure/azure-dev/cli/azd/pkg/yamlnode" + "github.com/azure/azure-dev/pkg/yamlnode" "github.com/braydonk/yaml" "github.com/tidwall/gjson" ) diff --git a/cli/azd/internal/scaffold/scaffold.go b/cli/azd/internal/scaffold/scaffold.go index 87b74b2a937..8659c1a92e0 100644 --- a/cli/azd/internal/scaffold/scaffold.go +++ b/cli/azd/internal/scaffold/scaffold.go @@ -14,8 +14,8 @@ import ( "strings" "text/template" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/resources" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/resources" "github.com/psanford/memfs" ) diff --git a/cli/azd/internal/scaffold/scaffold_test.go b/cli/azd/internal/scaffold/scaffold_test.go index 73946e53bbb..1c5581a12cc 100644 --- a/cli/azd/internal/scaffold/scaffold_test.go +++ b/cli/azd/internal/scaffold/scaffold_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools/bicep" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/otiai10/copy" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/internal/telemetry/notice.go b/cli/azd/internal/telemetry/notice.go index 9798d19386a..3763a982cca 100644 --- a/cli/azd/internal/telemetry/notice.go +++ b/cli/azd/internal/telemetry/notice.go @@ -11,8 +11,8 @@ import ( "path/filepath" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/internal/runcontext" + "github.com/azure/azure-dev/pkg/config" ) func FirstNotice() string { diff --git a/cli/azd/internal/telemetry/notice_test.go b/cli/azd/internal/telemetry/notice_test.go index f7e93a847ef..ae65bf178e5 100644 --- a/cli/azd/internal/telemetry/notice_test.go +++ b/cli/azd/internal/telemetry/notice_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/internal/runcontext" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/internal/telemetry/storage.go b/cli/azd/internal/telemetry/storage.go index d769c46a563..3057dc71a40 100644 --- a/cli/azd/internal/telemetry/storage.go +++ b/cli/azd/internal/telemetry/storage.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/benbjohnson/clock" ) diff --git a/cli/azd/internal/telemetry/storage_exporter.go b/cli/azd/internal/telemetry/storage_exporter.go index 08077b59d56..7510f6e1158 100644 --- a/cli/azd/internal/telemetry/storage_exporter.go +++ b/cli/azd/internal/telemetry/storage_exporter.go @@ -6,7 +6,7 @@ package telemetry import ( "context" - appinsightsexporter "github.com/azure/azure-dev/cli/azd/internal/telemetry/appinsights-exporter" + appinsightsexporter "github.com/azure/azure-dev/internal/telemetry/appinsights-exporter" "go.opentelemetry.io/otel/sdk/trace" "go.uber.org/atomic" ) diff --git a/cli/azd/internal/telemetry/storage_exporter_test.go b/cli/azd/internal/telemetry/storage_exporter_test.go index 9b696f45580..2881ea02c9e 100644 --- a/cli/azd/internal/telemetry/storage_exporter_test.go +++ b/cli/azd/internal/telemetry/storage_exporter_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - appinsightsexporter "github.com/azure/azure-dev/cli/azd/internal/telemetry/appinsights-exporter" + appinsightsexporter "github.com/azure/azure-dev/internal/telemetry/appinsights-exporter" "github.com/microsoft/ApplicationInsights-Go/appinsights/contracts" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/attribute" diff --git a/cli/azd/internal/telemetry/storage_test.go b/cli/azd/internal/telemetry/storage_test.go index 2bf91e9ca26..a1f7b3408ad 100644 --- a/cli/azd/internal/telemetry/storage_test.go +++ b/cli/azd/internal/telemetry/storage_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/benbjohnson/clock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/internal/telemetry/telemetry.go b/cli/azd/internal/telemetry/telemetry.go index 0a00d6b36f2..994d30127fc 100644 --- a/cli/azd/internal/telemetry/telemetry.go +++ b/cli/azd/internal/telemetry/telemetry.go @@ -14,11 +14,11 @@ import ( "sync" "time" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - appinsightsexporter "github.com/azure/azure-dev/cli/azd/internal/telemetry/appinsights-exporter" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/runcontext" + appinsightsexporter "github.com/azure/azure-dev/internal/telemetry/appinsights-exporter" + "github.com/azure/azure-dev/internal/tracing/resource" + "github.com/azure/azure-dev/pkg/config" "github.com/benbjohnson/clock" "github.com/gofrs/flock" "github.com/spf13/pflag" diff --git a/cli/azd/internal/telemetry/telemetry_test.go b/cli/azd/internal/telemetry/telemetry_test.go index 11f125bf2fd..ffb145bd474 100644 --- a/cli/azd/internal/telemetry/telemetry_test.go +++ b/cli/azd/internal/telemetry/telemetry_test.go @@ -8,9 +8,9 @@ import ( "sync" "testing" - "github.com/azure/azure-dev/cli/azd/internal" - appinsightsexporter "github.com/azure/azure-dev/cli/azd/internal/telemetry/appinsights-exporter" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/internal" + appinsightsexporter "github.com/azure/azure-dev/internal/telemetry/appinsights-exporter" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/internal/telemetry/uploader.go b/cli/azd/internal/telemetry/uploader.go index 519e5d9d1c0..d4226ec4678 100644 --- a/cli/azd/internal/telemetry/uploader.go +++ b/cli/azd/internal/telemetry/uploader.go @@ -9,7 +9,7 @@ import ( "log" "time" - appinsightsexporter "github.com/azure/azure-dev/cli/azd/internal/telemetry/appinsights-exporter" + appinsightsexporter "github.com/azure/azure-dev/internal/telemetry/appinsights-exporter" "github.com/benbjohnson/clock" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/internal/telemetry/uploader_test.go b/cli/azd/internal/telemetry/uploader_test.go index 6e9a28878b8..359e5e16035 100644 --- a/cli/azd/internal/telemetry/uploader_test.go +++ b/cli/azd/internal/telemetry/uploader_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - appinsightsexporter "github.com/azure/azure-dev/cli/azd/internal/telemetry/appinsights-exporter" + appinsightsexporter "github.com/azure/azure-dev/internal/telemetry/appinsights-exporter" "github.com/benbjohnson/clock" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/internal/terminal/terminal.go b/cli/azd/internal/terminal/terminal.go index 55f86d12d46..bae0a98e620 100644 --- a/cli/azd/internal/terminal/terminal.go +++ b/cli/azd/internal/terminal/terminal.go @@ -7,7 +7,7 @@ import ( "os" "strconv" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" + "github.com/azure/azure-dev/internal/tracing/resource" "github.com/mattn/go-isatty" ) diff --git a/cli/azd/internal/tracing/attributes.go b/cli/azd/internal/tracing/attributes.go index 040c7479dd2..396f5cd2579 100644 --- a/cli/azd/internal/tracing/attributes.go +++ b/cli/azd/internal/tracing/attributes.go @@ -8,7 +8,7 @@ import ( "slices" "sync" - "github.com/azure/azure-dev/cli/azd/internal/tracing/baggage" + "github.com/azure/azure-dev/internal/tracing/baggage" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "go.uber.org/atomic" diff --git a/cli/azd/internal/tracing/attributes_test.go b/cli/azd/internal/tracing/attributes_test.go index 2fbb9dea973..ae47f30c6cf 100644 --- a/cli/azd/internal/tracing/attributes_test.go +++ b/cli/azd/internal/tracing/attributes_test.go @@ -6,7 +6,7 @@ package tracing import ( "testing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/baggage" + "github.com/azure/azure-dev/internal/tracing/baggage" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/attribute" ) diff --git a/cli/azd/internal/tracing/resource/ci.go b/cli/azd/internal/tracing/resource/ci.go index a2ce7f28e50..542fc324be1 100644 --- a/cli/azd/internal/tracing/resource/ci.go +++ b/cli/azd/internal/tracing/resource/ci.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" + "github.com/azure/azure-dev/internal/tracing/fields" ) // Rules that apply when the specified environment variable is set to "true" (case-insensitive) diff --git a/cli/azd/internal/tracing/resource/exec_environment.go b/cli/azd/internal/tracing/resource/exec_environment.go index e7aaaa07c63..134194f02cc 100644 --- a/cli/azd/internal/tracing/resource/exec_environment.go +++ b/cli/azd/internal/tracing/resource/exec_environment.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/runcontext" + "github.com/azure/azure-dev/internal/tracing/fields" ) func getExecutionEnvironment() string { diff --git a/cli/azd/internal/tracing/resource/installed_by.go b/cli/azd/internal/tracing/resource/installed_by.go index 382a09c338d..69e81cde647 100644 --- a/cli/azd/internal/tracing/resource/installed_by.go +++ b/cli/azd/internal/tracing/resource/installed_by.go @@ -4,8 +4,8 @@ package resource import ( - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/installer" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/installer" ) // Returns a hash of the content of `.installed-by.txt` file in the same directory as diff --git a/cli/azd/internal/tracing/resource/machine_id.go b/cli/azd/internal/tracing/resource/machine_id.go index aca2256132a..ae86e9f88c0 100644 --- a/cli/azd/internal/tracing/resource/machine_id.go +++ b/cli/azd/internal/tracing/resource/machine_id.go @@ -11,9 +11,9 @@ import ( deviceid "github.com/microsoft/go-deviceid" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/osutil" "github.com/google/uuid" ) diff --git a/cli/azd/internal/tracing/resource/resource.go b/cli/azd/internal/tracing/resource/resource.go index d7c071c6c9d..e7ae3f6e3f1 100644 --- a/cli/azd/internal/tracing/resource/resource.go +++ b/cli/azd/internal/tracing/resource/resource.go @@ -8,9 +8,9 @@ import ( "fmt" "runtime" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/osutil/osversion" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/osutil/osversion" "go.opentelemetry.io/otel/sdk/resource" semconv "go.opentelemetry.io/otel/semconv/v1.37.0" ) diff --git a/cli/azd/internal/tracing/tracer.go b/cli/azd/internal/tracing/tracer.go index fd6f6940ef2..7e7a82925dc 100644 --- a/cli/azd/internal/tracing/tracer.go +++ b/cli/azd/internal/tracing/tracer.go @@ -6,7 +6,7 @@ package tracing import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/tracing/baggage" + "github.com/azure/azure-dev/internal/tracing/baggage" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/attribute" diff --git a/cli/azd/internal/tracing/tracing.go b/cli/azd/internal/tracing/tracing.go index 112cee99866..5b55b325eda 100644 --- a/cli/azd/internal/tracing/tracing.go +++ b/cli/azd/internal/tracing/tracing.go @@ -6,7 +6,7 @@ package tracing import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" + "github.com/azure/azure-dev/internal/tracing/fields" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" ) diff --git a/cli/azd/internal/vsrpc/aspire_service.go b/cli/azd/internal/vsrpc/aspire_service.go index baaa1e4e500..aa854343276 100644 --- a/cli/azd/internal/vsrpc/aspire_service.go +++ b/cli/azd/internal/vsrpc/aspire_service.go @@ -10,8 +10,8 @@ import ( "net/http" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) // aspireService is the RPC server for the '/AspireService/v1.0' endpoint. diff --git a/cli/azd/internal/vsrpc/debug_service.go b/cli/azd/internal/vsrpc/debug_service.go index 40dfefadb9d..e2d0e046c7b 100644 --- a/cli/azd/internal/vsrpc/debug_service.go +++ b/cli/azd/internal/vsrpc/debug_service.go @@ -11,8 +11,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" ) // debugService is the RPC server for the '/TestDebugService/v1.0' endpoint. It is only exposed when diff --git a/cli/azd/internal/vsrpc/environment_service.go b/cli/azd/internal/vsrpc/environment_service.go index c4a60324083..e4bd514a278 100644 --- a/cli/azd/internal/vsrpc/environment_service.go +++ b/cli/azd/internal/vsrpc/environment_service.go @@ -9,12 +9,12 @@ import ( "fmt" "net/http" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/project" ) // environmentService is the RPC server for the '/EnvironmentService/v1.0' endpoint. diff --git a/cli/azd/internal/vsrpc/environment_service_create.go b/cli/azd/internal/vsrpc/environment_service_create.go index 7cb31e7171b..04597ed3105 100644 --- a/cli/azd/internal/vsrpc/environment_service_create.go +++ b/cli/azd/internal/vsrpc/environment_service_create.go @@ -12,11 +12,11 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) // CreateEnvironmentAsync is the server implementation of: diff --git a/cli/azd/internal/vsrpc/environment_service_deploy_service.go b/cli/azd/internal/vsrpc/environment_service_deploy_service.go index f407fb12ca0..c2af6459583 100644 --- a/cli/azd/internal/vsrpc/environment_service_deploy_service.go +++ b/cli/azd/internal/vsrpc/environment_service_deploy_service.go @@ -6,10 +6,10 @@ package vsrpc import ( "context" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/pkg/ioc" ) // DeployServiceAsync is the server implementation of: diff --git a/cli/azd/internal/vsrpc/environment_service_load.go b/cli/azd/internal/vsrpc/environment_service_load.go index 80a6cdee71f..c25138992a6 100644 --- a/cli/azd/internal/vsrpc/environment_service_load.go +++ b/cli/azd/internal/vsrpc/environment_service_load.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) // OpenEnvironmentAsync is the server implementation of: diff --git a/cli/azd/internal/vsrpc/environment_service_refresh.go b/cli/azd/internal/vsrpc/environment_service_refresh.go index 473a7108f67..ae3c590daad 100644 --- a/cli/azd/internal/vsrpc/environment_service_refresh.go +++ b/cli/azd/internal/vsrpc/environment_service_refresh.go @@ -9,13 +9,13 @@ import ( "log" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/infra/provisioning/bicep" + "github.com/azure/azure-dev/pkg/project" ) // RefreshEnvironmentAsync is the server implementation of: diff --git a/cli/azd/internal/vsrpc/server.go b/cli/azd/internal/vsrpc/server.go index 5dc1a0a1c86..06034793000 100644 --- a/cli/azd/internal/vsrpc/server.go +++ b/cli/azd/internal/vsrpc/server.go @@ -16,12 +16,12 @@ import ( "sync" "time" - "github.com/azure/azure-dev/cli/azd/internal/cmd" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/events" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/internal/cmd" + "github.com/azure/azure-dev/internal/telemetry" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/events" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/ioc" "github.com/gorilla/websocket" "go.lsp.dev/jsonrpc2" ) diff --git a/cli/azd/internal/vsrpc/server_service.go b/cli/azd/internal/vsrpc/server_service.go index 5fd8563dcf6..e507573f963 100644 --- a/cli/azd/internal/vsrpc/server_service.go +++ b/cli/azd/internal/vsrpc/server_service.go @@ -11,8 +11,8 @@ import ( "net/url" "os" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/internal/telemetry" + "github.com/azure/azure-dev/pkg/httputil" ) // serverService is the RPC server for the '/ServerService/v1.0' endpoint. diff --git a/cli/azd/internal/vsrpc/server_session.go b/cli/azd/internal/vsrpc/server_session.go index 8463d5d50ba..3648a76092c 100644 --- a/cli/azd/internal/vsrpc/server_session.go +++ b/cli/azd/internal/vsrpc/server_session.go @@ -12,13 +12,13 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/output" "github.com/mattn/go-colorable" "go.lsp.dev/jsonrpc2" ) diff --git a/cli/azd/internal/vsrpc/utils.go b/cli/azd/internal/vsrpc/utils.go index 18593ee8cd1..bf1376e1f10 100644 --- a/cli/azd/internal/vsrpc/utils.go +++ b/cli/azd/internal/vsrpc/utils.go @@ -10,10 +10,10 @@ import ( "log" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) // appHostServiceForProject returns the ServiceConfig of the service for the AppHost project for the given azd project. diff --git a/cli/azd/internal/vsrpc/utils_test.go b/cli/azd/internal/vsrpc/utils_test.go index f73754f8e2c..4958b38bf9b 100644 --- a/cli/azd/internal/vsrpc/utils_test.go +++ b/cli/azd/internal/vsrpc/utils_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/project" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/project" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/main.go b/cli/azd/main.go index eda01bc45b7..f8eb7368529 100644 --- a/cli/azd/main.go +++ b/cli/azd/main.go @@ -23,16 +23,16 @@ import ( "time" azcorelog "github.com/Azure/azure-sdk-for-go/sdk/azcore/log" - "github.com/azure/azure-dev/cli/azd/cmd" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/installer" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/oneauth" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/cmd" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/telemetry" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/installer" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/oneauth" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" "github.com/blang/semver/v4" "github.com/mattn/go-colorable" "github.com/spf13/pflag" diff --git a/cli/azd/pkg/account/credentials.go b/cli/azd/pkg/account/credentials.go index 6eda579a5ae..240156a469f 100644 --- a/cli/azd/pkg/account/credentials.go +++ b/cli/azd/pkg/account/credentials.go @@ -7,7 +7,7 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/pkg/auth" + "github.com/azure/azure-dev/pkg/auth" ) // SubscriptionCredentialProvider provides an [azcore.TokenCredential] configured diff --git a/cli/azd/pkg/account/manager.go b/cli/azd/pkg/account/manager.go index 966632f3edc..bfc4a7af5a8 100644 --- a/cli/azd/pkg/account/manager.go +++ b/cli/azd/pkg/account/manager.go @@ -11,7 +11,7 @@ import ( "os" "slices" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" ) // JSON document path locations for default subscription & location diff --git a/cli/azd/pkg/account/manager_test.go b/cli/azd/pkg/account/manager_test.go index ed3015977a9..239796ce50f 100644 --- a/cli/azd/pkg/account/manager_test.go +++ b/cli/azd/pkg/account/manager_test.go @@ -14,13 +14,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockarmresources" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockconfig" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockarmresources" + "github.com/azure/azure-dev/test/mocks/mockconfig" + "github.com/azure/azure-dev/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/account/subscriptions.go b/cli/azd/pkg/account/subscriptions.go index c1226e105eb..0b9a477ff57 100644 --- a/cli/azd/pkg/account/subscriptions.go +++ b/cli/azd/pkg/account/subscriptions.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/compare" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/compare" + "github.com/azure/azure-dev/pkg/convert" ) // SubscriptionsService allows querying of subscriptions and tenants. diff --git a/cli/azd/pkg/account/subscriptions_cache.go b/cli/azd/pkg/account/subscriptions_cache.go index 2a04eb1ca00..b0817d827e4 100644 --- a/cli/azd/pkg/account/subscriptions_cache.go +++ b/cli/azd/pkg/account/subscriptions_cache.go @@ -13,8 +13,8 @@ import ( "path/filepath" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/osutil" ) // The file name of the cache used for storing subscriptions accessible by local accounts. diff --git a/cli/azd/pkg/account/subscriptions_manager.go b/cli/azd/pkg/account/subscriptions_manager.go index 494a89bbdd1..d0ceaea9b54 100644 --- a/cli/azd/pkg/account/subscriptions_manager.go +++ b/cli/azd/pkg/account/subscriptions_manager.go @@ -14,9 +14,9 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/input" "go.uber.org/multierr" ) diff --git a/cli/azd/pkg/account/subscriptions_manager_test.go b/cli/azd/pkg/account/subscriptions_manager_test.go index 311f3ae3e20..5a0d97c86b3 100644 --- a/cli/azd/pkg/account/subscriptions_manager_test.go +++ b/cli/azd/pkg/account/subscriptions_manager_test.go @@ -15,10 +15,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockarmresources" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockarmresources" + "github.com/azure/azure-dev/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/ai/config.go b/cli/azd/pkg/ai/config.go index ac5634760ed..ff0e3144cdb 100644 --- a/cli/azd/pkg/ai/config.go +++ b/cli/azd/pkg/ai/config.go @@ -6,7 +6,7 @@ package ai import ( "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/braydonk/yaml" ) diff --git a/cli/azd/pkg/ai/python_bridge.go b/cli/azd/pkg/ai/python_bridge.go index 1b7dd0fd6e4..80ecb5a1c64 100644 --- a/cli/azd/pkg/ai/python_bridge.go +++ b/cli/azd/pkg/ai/python_bridge.go @@ -10,13 +10,13 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/python" - "github.com/azure/azure-dev/cli/azd/resources" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/python" + "github.com/azure/azure-dev/resources" ) // ScriptPath is a type to represent the path of a Python script diff --git a/cli/azd/pkg/ai/python_bridge_test.go b/cli/azd/pkg/ai/python_bridge_test.go index 2355d8fbe35..d32eefb0b64 100644 --- a/cli/azd/pkg/ai/python_bridge_test.go +++ b/cli/azd/pkg/ai/python_bridge_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools/python" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools/python" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/alpha/alpha_feature.go b/cli/azd/pkg/alpha/alpha_feature.go index 361f50a9339..ef96ecedb0e 100644 --- a/cli/azd/pkg/alpha/alpha_feature.go +++ b/cli/azd/pkg/alpha/alpha_feature.go @@ -8,7 +8,7 @@ import ( "log" "strings" - "github.com/azure/azure-dev/cli/azd/resources" + "github.com/azure/azure-dev/resources" "github.com/braydonk/yaml" ) diff --git a/cli/azd/pkg/alpha/alpha_feature_manager.go b/cli/azd/pkg/alpha/alpha_feature_manager.go index e456c18a90a..433ef6f5a11 100644 --- a/cli/azd/pkg/alpha/alpha_feature_manager.go +++ b/cli/azd/pkg/alpha/alpha_feature_manager.go @@ -11,9 +11,9 @@ import ( "strings" "sync" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" ) // FeatureManager provides operations for handling features within the application which are in alpha mode. diff --git a/cli/azd/pkg/alpha/alpha_feature_test.go b/cli/azd/pkg/alpha/alpha_feature_test.go index fd10b95207f..11516aab69f 100644 --- a/cli/azd/pkg/alpha/alpha_feature_test.go +++ b/cli/azd/pkg/alpha/alpha_feature_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/apphost/aca_ingress.go b/cli/azd/pkg/apphost/aca_ingress.go index d18d7b77f9e..937f2005042 100644 --- a/cli/azd/pkg/apphost/aca_ingress.go +++ b/cli/azd/pkg/apphost/aca_ingress.go @@ -7,7 +7,7 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/pkg/custommaps" + "github.com/azure/azure-dev/pkg/custommaps" ) // buildAcaIngress builds the Azure Container Apps ingress configuration from the provided bindings. diff --git a/cli/azd/pkg/apphost/aca_ingress_test.go b/cli/azd/pkg/apphost/aca_ingress_test.go index 8433e0282f0..af00b8d93e3 100644 --- a/cli/azd/pkg/apphost/aca_ingress_test.go +++ b/cli/azd/pkg/apphost/aca_ingress_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/custommaps" + "github.com/azure/azure-dev/pkg/custommaps" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/pkg/apphost/generate.go b/cli/azd/pkg/apphost/generate.go index 9b3af7fd7c5..9768af370eb 100644 --- a/cli/azd/pkg/apphost/generate.go +++ b/cli/azd/pkg/apphost/generate.go @@ -21,16 +21,16 @@ import ( "text/template" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/custommaps" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "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/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/custommaps" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/resources" "github.com/braydonk/yaml" "github.com/psanford/memfs" ) diff --git a/cli/azd/pkg/apphost/generate_test.go b/cli/azd/pkg/apphost/generate_test.go index a471d98cb5b..531abcdfd7a 100644 --- a/cli/azd/pkg/apphost/generate_test.go +++ b/cli/azd/pkg/apphost/generate_test.go @@ -14,12 +14,12 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/snapshot" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/apphost/generate_types.go b/cli/azd/pkg/apphost/generate_types.go index 2b64363815e..ae624a000d4 100644 --- a/cli/azd/pkg/apphost/generate_types.go +++ b/cli/azd/pkg/apphost/generate_types.go @@ -3,7 +3,7 @@ package apphost -import "github.com/azure/azure-dev/cli/azd/pkg/custommaps" +import "github.com/azure/azure-dev/pkg/custommaps" type genContainerAppEnvironmentServices struct { Type string diff --git a/cli/azd/pkg/apphost/manifest.go b/cli/azd/pkg/apphost/manifest.go index e62b261f12c..f9fe64a74a0 100644 --- a/cli/azd/pkg/apphost/manifest.go +++ b/cli/azd/pkg/apphost/manifest.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/custommaps" - "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/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/custommaps" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools/dotnet" "github.com/psanford/memfs" ) diff --git a/cli/azd/pkg/armmsi/armmsi.go b/cli/azd/pkg/armmsi/armmsi.go index 1c1a7b734a4..dd408c28e5c 100644 --- a/cli/azd/pkg/armmsi/armmsi.go +++ b/cli/azd/pkg/armmsi/armmsi.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) // ArmMsiService provides functionality to interact with Azure Managed Service Identity (MSI) resources. diff --git a/cli/azd/pkg/auth/azd_credential.go b/cli/azd/pkg/auth/azd_credential.go index a5aad642bb4..c43fb554524 100644 --- a/cli/azd/pkg/auth/azd_credential.go +++ b/cli/azd/pkg/auth/azd_credential.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/AzureAD/microsoft-authentication-library-for-go/apps/public" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" + "github.com/azure/azure-dev/pkg/cloud" ) type azdCredential struct { diff --git a/cli/azd/pkg/auth/cloudshell_credential_test.go b/cli/azd/pkg/auth/cloudshell_credential_test.go index ad5b61dc6c9..d087d0e3e29 100644 --- a/cli/azd/pkg/auth/cloudshell_credential_test.go +++ b/cli/azd/pkg/auth/cloudshell_credential_test.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/auth/errors.go b/cli/azd/pkg/auth/errors.go index fcd3149b524..bd877abdf79 100644 --- a/cli/azd/pkg/auth/errors.go +++ b/cli/azd/pkg/auth/errors.go @@ -14,8 +14,8 @@ import ( "slices" msal "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/cloud" ) // ErrNoCurrentUser indicates that the current user is not logged in. diff --git a/cli/azd/pkg/auth/errors_test.go b/cli/azd/pkg/auth/errors_test.go index eb7ea015568..e5efea490f8 100644 --- a/cli/azd/pkg/auth/errors_test.go +++ b/cli/azd/pkg/auth/errors_test.go @@ -13,7 +13,7 @@ import ( "testing" msal "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" + "github.com/azure/azure-dev/pkg/cloud" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/auth/federated_token_client.go b/cli/azd/pkg/auth/federated_token_client.go index 76bb2e3a44c..f8a773a96dc 100644 --- a/cli/azd/pkg/auth/federated_token_client.go +++ b/cli/azd/pkg/auth/federated_token_client.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) // TokenForAudience fetches the federated token from the federated token provider. diff --git a/cli/azd/pkg/auth/federated_token_client_test.go b/cli/azd/pkg/auth/federated_token_client_test.go index 746821655b3..a37a52edea1 100644 --- a/cli/azd/pkg/auth/federated_token_client_test.go +++ b/cli/azd/pkg/auth/federated_token_client_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/auth/file_cache.go b/cli/azd/pkg/auth/file_cache.go index 6ccd1cf7b59..0577134ce9b 100644 --- a/cli/azd/pkg/auth/file_cache.go +++ b/cli/azd/pkg/auth/file_cache.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/gofrs/flock" ) diff --git a/cli/azd/pkg/auth/manager.go b/cli/azd/pkg/auth/manager.go index 1cfcf1073fe..b81958e8fb0 100644 --- a/cli/azd/pkg/auth/manager.go +++ b/cli/azd/pkg/auth/manager.go @@ -22,17 +22,17 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/AzureAD/microsoft-authentication-library-for-go/apps/public" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/oneauth" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/tools/az" + "github.com/azure/azure-dev/internal/runcontext" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/oneauth" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/tools/az" "github.com/cli/browser" ) diff --git a/cli/azd/pkg/auth/manager_test.go b/cli/azd/pkg/auth/manager_test.go index 6dc4b9ab070..17402b22743 100644 --- a/cli/azd/pkg/auth/manager_test.go +++ b/cli/azd/pkg/auth/manager_test.go @@ -18,13 +18,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/AzureAD/microsoft-authentication-library-for-go/apps/public" - "github.com/azure/azure-dev/cli/azd/internal/runcontext" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools/az" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/internal/runcontext" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools/az" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/appconfig.go b/cli/azd/pkg/azapi/appconfig.go index 97909c65eb8..ea4a07f4879 100644 --- a/cli/azd/pkg/azapi/appconfig.go +++ b/cli/azd/pkg/azapi/appconfig.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appconfiguration/armappconfiguration" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/convert" ) type AzCliAppConfig struct { diff --git a/cli/azd/pkg/azapi/azure_client.go b/cli/azd/pkg/azapi/azure_client.go index 15820f335ad..4e752de98ad 100644 --- a/cli/azd/pkg/azapi/azure_client.go +++ b/cli/azd/pkg/azapi/azure_client.go @@ -7,7 +7,7 @@ import ( "errors" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) var ( diff --git a/cli/azd/pkg/azapi/azure_client_functions_test.go b/cli/azd/pkg/azapi/azure_client_functions_test.go index 1ca210ffbfe..28b258dbe95 100644 --- a/cli/azd/pkg/azapi/azure_client_functions_test.go +++ b/cli/azd/pkg/azapi/azure_client_functions_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azsdk" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/azure_client_linuxwebapp_test.go b/cli/azd/pkg/azapi/azure_client_linuxwebapp_test.go index 2d10e363682..e6355ebd487 100644 --- a/cli/azd/pkg/azapi/azure_client_linuxwebapp_test.go +++ b/cli/azd/pkg/azapi/azure_client_linuxwebapp_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azsdk" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/azure_client_staticwebapp_test.go b/cli/azd/pkg/azapi/azure_client_staticwebapp_test.go index ec440391831..e32aa38bd8d 100644 --- a/cli/azd/pkg/azapi/azure_client_staticwebapp_test.go +++ b/cli/azd/pkg/azapi/azure_client_staticwebapp_test.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/azure_client_test.go b/cli/azd/pkg/azapi/azure_client_test.go index 6cc12e20e17..2008394467f 100644 --- a/cli/azd/pkg/azapi/azure_client_test.go +++ b/cli/azd/pkg/azapi/azure_client_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/azure_deployment_error.go b/cli/azd/pkg/azapi/azure_deployment_error.go index 59561401929..bb6541caddf 100644 --- a/cli/azd/pkg/azapi/azure_deployment_error.go +++ b/cli/azd/pkg/azapi/azure_deployment_error.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type DeploymentErrorLine struct { diff --git a/cli/azd/pkg/azapi/cognitive_service_test.go b/cli/azd/pkg/azapi/cognitive_service_test.go index d57b8993f39..b035dd73676 100644 --- a/cli/azd/pkg/azapi/cognitive_service_test.go +++ b/cli/azd/pkg/azapi/cognitive_service_test.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/container_registry.go b/cli/azd/pkg/azapi/container_registry.go index b94c024d4e9..79938a5b4b1 100644 --- a/cli/azd/pkg/azapi/container_registry.go +++ b/cli/azd/pkg/azapi/container_registry.go @@ -20,11 +20,11 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" azruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/httputil" + "github.com/azure/azure-dev/pkg/tools/docker" ) // Credentials for authenticating with a docker registry, diff --git a/cli/azd/pkg/azapi/deployments.go b/cli/azd/pkg/azapi/deployments.go index 3f33218bba7..cc407cf52ed 100644 --- a/cli/azd/pkg/azapi/deployments.go +++ b/cli/azd/pkg/azapi/deployments.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azure" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azure" ) type DeploymentType string diff --git a/cli/azd/pkg/azapi/function_app.go b/cli/azd/pkg/azapi/function_app.go index 160d9d6b4dc..f73d115633c 100644 --- a/cli/azd/pkg/azapi/function_app.go +++ b/cli/azd/pkg/azapi/function_app.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk" + "github.com/azure/azure-dev/pkg/azsdk" ) type AzCliFunctionAppProperties struct { diff --git a/cli/azd/pkg/azapi/managed_clusters.go b/cli/azd/pkg/azapi/managed_clusters.go index eeda65d0347..24aa75032d0 100644 --- a/cli/azd/pkg/azapi/managed_clusters.go +++ b/cli/azd/pkg/azapi/managed_clusters.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) // ManagedClustersService provides actions on top of Azure Kubernetes Service (AKS) Managed Clusters diff --git a/cli/azd/pkg/azapi/managed_hsm.go b/cli/azd/pkg/azapi/managed_hsm.go index 63742f73199..dde368d2a1e 100644 --- a/cli/azd/pkg/azapi/managed_hsm.go +++ b/cli/azd/pkg/azapi/managed_hsm.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/convert" ) type AzCliManagedHSM struct { diff --git a/cli/azd/pkg/azapi/resource_service.go b/cli/azd/pkg/azapi/resource_service.go index aadfdb88e2d..d3016e654a3 100644 --- a/cli/azd/pkg/azapi/resource_service.go +++ b/cli/azd/pkg/azapi/resource_service.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/convert" ) type Resource struct { diff --git a/cli/azd/pkg/azapi/spring_app.go b/cli/azd/pkg/azapi/spring_app.go index 7d37e4d5f7a..7ffdd96a8e7 100644 --- a/cli/azd/pkg/azapi/spring_app.go +++ b/cli/azd/pkg/azapi/spring_app.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appplatform/armappplatform/v2" "github.com/Azure/azure-storage-file-go/azfile" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) // SpringService provides artifacts upload/deploy and query to Azure Spring Apps (ASA) diff --git a/cli/azd/pkg/azapi/stack_deployments.go b/cli/azd/pkg/azapi/stack_deployments.go index c4dc9ddca19..936b66a4bf2 100644 --- a/cli/azd/pkg/azapi/stack_deployments.go +++ b/cli/azd/pkg/azapi/stack_deployments.go @@ -19,15 +19,15 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armdeploymentstacks" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/output" "github.com/benbjohnson/clock" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/pkg/azapi/stack_deployments_test.go b/cli/azd/pkg/azapi/stack_deployments_test.go index 04e190ca769..cba22266287 100644 --- a/cli/azd/pkg/azapi/stack_deployments_test.go +++ b/cli/azd/pkg/azapi/stack_deployments_test.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armdeploymentstacks" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/convert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/standard_deployments.go b/cli/azd/pkg/azapi/standard_deployments.go index 789d983b1e3..7ffa4a85b5d 100644 --- a/cli/azd/pkg/azapi/standard_deployments.go +++ b/cli/azd/pkg/azapi/standard_deployments.go @@ -14,12 +14,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/output" "github.com/benbjohnson/clock" ) diff --git a/cli/azd/pkg/azapi/standard_deployments_test.go b/cli/azd/pkg/azapi/standard_deployments_test.go index 2547766a680..520c814e589 100644 --- a/cli/azd/pkg/azapi/standard_deployments_test.go +++ b/cli/azd/pkg/azapi/standard_deployments_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/pkg/azapi/user_profile.go b/cli/azd/pkg/azapi/user_profile.go index f2bcf49ac58..7c44ba7bbb5 100644 --- a/cli/azd/pkg/azapi/user_profile.go +++ b/cli/azd/pkg/azapi/user_profile.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" azcloud "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/graphsdk" ) // UserProfileService allows querying for user profile information. diff --git a/cli/azd/pkg/azapi/user_profile_test.go b/cli/azd/pkg/azapi/user_profile_test.go index ea6d16b8f0c..2888a7164d4 100644 --- a/cli/azd/pkg/azapi/user_profile_test.go +++ b/cli/azd/pkg/azapi/user_profile_test.go @@ -12,9 +12,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azapi/webapp.go b/cli/azd/pkg/azapi/webapp.go index 61a8b12d639..f7311901185 100644 --- a/cli/azd/pkg/azapi/webapp.go +++ b/cli/azd/pkg/azapi/webapp.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk" + "github.com/azure/azure-dev/pkg/azsdk" ) type AzCliAppServiceProperties struct { diff --git a/cli/azd/pkg/azd/default.go b/cli/azd/pkg/azd/default.go index 5beee6b0efc..339c535a36c 100644 --- a/cli/azd/pkg/azd/default.go +++ b/cli/azd/pkg/azd/default.go @@ -8,21 +8,21 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/cosmosdb" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - infraBicep "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/bicep" - infraTerraform "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/terraform" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/sqldb" - "github.com/azure/azure-dev/cli/azd/pkg/state" - "github.com/azure/azure-dev/cli/azd/pkg/templates" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/tools/terraform" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/cosmosdb" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + infraBicep "github.com/azure/azure-dev/pkg/infra/provisioning/bicep" + infraTerraform "github.com/azure/azure-dev/pkg/infra/provisioning/terraform" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/platform" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/sqldb" + "github.com/azure/azure-dev/pkg/state" + "github.com/azure/azure-dev/pkg/templates" + "github.com/azure/azure-dev/pkg/tools/bicep" + "github.com/azure/azure-dev/pkg/tools/terraform" ) const PlatformKindDefault platform.PlatformKind = "default" diff --git a/cli/azd/pkg/azd/default_test.go b/cli/azd/pkg/azd/default_test.go index 09285d49a96..26a0ebb546f 100644 --- a/cli/azd/pkg/azd/default_test.go +++ b/cli/azd/pkg/azd/default_test.go @@ -6,8 +6,8 @@ package azd import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/ioc" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azdext/debugger.go b/cli/azd/pkg/azdext/debugger.go index e84ff44628e..2ef2562fccf 100644 --- a/cli/azd/pkg/azdext/debugger.go +++ b/cli/azd/pkg/azdext/debugger.go @@ -10,7 +10,7 @@ import ( "os" "strconv" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/pkg/ux" "github.com/golang-jwt/jwt/v5" "google.golang.org/grpc/metadata" ) diff --git a/cli/azd/pkg/azdext/event_manager.go b/cli/azd/pkg/azdext/event_manager.go index 7c6bf03ddee..b8b5b724e73 100644 --- a/cli/azd/pkg/azdext/event_manager.go +++ b/cli/azd/pkg/azdext/event_manager.go @@ -9,7 +9,7 @@ import ( "log" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/grpcbroker" ) type EventManager struct { diff --git a/cli/azd/pkg/azdext/event_message_envelope.go b/cli/azd/pkg/azdext/event_message_envelope.go index 16ae9bc7457..aae5a710eb8 100644 --- a/cli/azd/pkg/azdext/event_message_envelope.go +++ b/cli/azd/pkg/azdext/event_message_envelope.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" ) // EventMessageEnvelope provides message operations for EventMessage diff --git a/cli/azd/pkg/azdext/framework_service_envelope.go b/cli/azd/pkg/azdext/framework_service_envelope.go index b3560d24b69..c70f5ef02ca 100644 --- a/cli/azd/pkg/azdext/framework_service_envelope.go +++ b/cli/azd/pkg/azdext/framework_service_envelope.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/grpcbroker" ) // FrameworkServiceEnvelope provides message operations for FrameworkServiceMessage diff --git a/cli/azd/pkg/azdext/framework_service_manager.go b/cli/azd/pkg/azdext/framework_service_manager.go index 3db5900c15e..cb42360139d 100644 --- a/cli/azd/pkg/azdext/framework_service_manager.go +++ b/cli/azd/pkg/azdext/framework_service_manager.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/grpcbroker" "github.com/google/uuid" ) diff --git a/cli/azd/pkg/azdext/service_target_envelope.go b/cli/azd/pkg/azdext/service_target_envelope.go index 5ed150a618a..f0dcaf0e531 100644 --- a/cli/azd/pkg/azdext/service_target_envelope.go +++ b/cli/azd/pkg/azdext/service_target_envelope.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/grpcbroker" ) // ServiceTargetEnvelope provides message operations for ServiceTargetMessage diff --git a/cli/azd/pkg/azdext/service_target_manager.go b/cli/azd/pkg/azdext/service_target_manager.go index e73103eb5ed..0d2fb29c408 100644 --- a/cli/azd/pkg/azdext/service_target_manager.go +++ b/cli/azd/pkg/azdext/service_target_manager.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/grpcbroker" "github.com/google/uuid" ) diff --git a/cli/azd/pkg/azdo/build_policy.go b/cli/azd/pkg/azdo/build_policy.go index 38802384da4..aa9fde9735c 100644 --- a/cli/azd/pkg/azdo/build_policy.go +++ b/cli/azd/pkg/azdo/build_policy.go @@ -9,7 +9,7 @@ import ( "net/http" "net/url" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/environment" "github.com/google/uuid" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/build" diff --git a/cli/azd/pkg/azdo/pipeline.go b/cli/azd/pkg/azdo/pipeline.go index 65ff6cff449..14a2a47c10a 100644 --- a/cli/azd/pkg/azdo/pipeline.go +++ b/cli/azd/pkg/azdo/pipeline.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/build" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/taskagent" diff --git a/cli/azd/pkg/azdo/project.go b/cli/azd/pkg/azdo/project.go index 400eb0938cf..aaf841cba28 100644 --- a/cli/azd/pkg/azdo/project.go +++ b/cli/azd/pkg/azdo/project.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/core" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/operations" diff --git a/cli/azd/pkg/azdo/repository.go b/cli/azd/pkg/azdo/repository.go index df9f0b9b41f..142de2b0902 100644 --- a/cli/azd/pkg/azdo/repository.go +++ b/cli/azd/pkg/azdo/repository.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/input" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/git" ) diff --git a/cli/azd/pkg/azdo/service_connection.go b/cli/azd/pkg/azdo/service_connection.go index e6c849d333a..4deca25558e 100644 --- a/cli/azd/pkg/azdo/service_connection.go +++ b/cli/azd/pkg/azdo/service_connection.go @@ -8,10 +8,10 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output/ux" "github.com/google/uuid" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/build" diff --git a/cli/azd/pkg/azdo/utils.go b/cli/azd/pkg/azdo/utils.go index 0d1c5be6857..afb16d9dc3a 100644 --- a/cli/azd/pkg/azdo/utils.go +++ b/cli/azd/pkg/azdo/utils.go @@ -8,9 +8,9 @@ import ( "fmt" "os" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" ) // helper method to verify that a configuration exists in the .env file or in system environment variables diff --git a/cli/azd/pkg/azsdk/correlation_policy_test.go b/cli/azd/pkg/azsdk/correlation_policy_test.go index 71a38243fac..d44cc35f3a9 100644 --- a/cli/azd/pkg/azsdk/correlation_policy_test.go +++ b/cli/azd/pkg/azsdk/correlation_policy_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockhttp" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" ) diff --git a/cli/azd/pkg/azsdk/funcapp_host_client.go b/cli/azd/pkg/azsdk/funcapp_host_client.go index d7b3431747d..15a6b4ab9f2 100644 --- a/cli/azd/pkg/azsdk/funcapp_host_client.go +++ b/cli/azd/pkg/azsdk/funcapp_host_client.go @@ -16,7 +16,7 @@ import ( armruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) // FuncAppHostClient contains methods for interacting with the Azure Functions application host, usually located diff --git a/cli/azd/pkg/azsdk/storage/storage_blob_client.go b/cli/azd/pkg/azsdk/storage/storage_blob_client.go index 7b70c9276db..d27736b6fb9 100644 --- a/cli/azd/pkg/azsdk/storage/storage_blob_client.go +++ b/cli/azd/pkg/azsdk/storage/storage_blob_client.go @@ -13,8 +13,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" ) // AccountConfig contains the configuration for connecting to a storage account diff --git a/cli/azd/pkg/azsdk/storage/storage_file_share_service.go b/cli/azd/pkg/azsdk/storage/storage_file_share_service.go index 05b7125cef2..0c7630df7a2 100644 --- a/cli/azd/pkg/azsdk/storage/storage_file_share_service.go +++ b/cli/azd/pkg/azsdk/storage/storage_file_share_service.go @@ -16,7 +16,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/service" "github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/share" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) type FileShareService interface { diff --git a/cli/azd/pkg/azsdk/user_agent_policy_test.go b/cli/azd/pkg/azsdk/user_agent_policy_test.go index 0024f68ac26..4739a908091 100644 --- a/cli/azd/pkg/azsdk/user_agent_policy_test.go +++ b/cli/azd/pkg/azsdk/user_agent_policy_test.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azsdk/zip_deploy_client.go b/cli/azd/pkg/azsdk/zip_deploy_client.go index cdc774c84de..5a14fa58cde 100644 --- a/cli/azd/pkg/azsdk/zip_deploy_client.go +++ b/cli/azd/pkg/azsdk/zip_deploy_client.go @@ -19,7 +19,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" "go.opentelemetry.io/otel/trace" ) diff --git a/cli/azd/pkg/azsdk/zip_deploy_client_test.go b/cli/azd/pkg/azsdk/zip_deploy_client_test.go index d69aaa98176..50de8757216 100644 --- a/cli/azd/pkg/azsdk/zip_deploy_client_test.go +++ b/cli/azd/pkg/azsdk/zip_deploy_client_test.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/azureutil/location.go b/cli/azd/pkg/azureutil/location.go index 28aa3aafdf9..3865cbf1670 100644 --- a/cli/azd/pkg/azureutil/location.go +++ b/cli/azd/pkg/azureutil/location.go @@ -10,9 +10,9 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" ) // PromptLocation asks the user to select a location from a list of supported azure locations for a given subscription. diff --git a/cli/azd/pkg/azureutil/principal.go b/cli/azd/pkg/azureutil/principal.go index 15a9ead1199..b19bf2aa0f1 100644 --- a/cli/azd/pkg/azureutil/principal.go +++ b/cli/azd/pkg/azureutil/principal.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azapi" ) // GetCurrentPrincipalId returns the object id of the current diff --git a/cli/azd/pkg/cmdsubst/secretOrRandomPassword.go b/cli/azd/pkg/cmdsubst/secretOrRandomPassword.go index 774dc0e1ced..127215d8b6c 100644 --- a/cli/azd/pkg/cmdsubst/secretOrRandomPassword.go +++ b/cli/azd/pkg/cmdsubst/secretOrRandomPassword.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/password" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/password" ) const SecretOrRandomPasswordCommandName string = "secretOrRandomPassword" diff --git a/cli/azd/pkg/config/config_test.go b/cli/azd/pkg/config/config_test.go index dc62274f27a..8f0f74963c8 100644 --- a/cli/azd/pkg/config/config_test.go +++ b/cli/azd/pkg/config/config_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/convert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/config/file_config_manager.go b/cli/azd/pkg/config/file_config_manager.go index 388379f9626..ed26f8bc10e 100644 --- a/cli/azd/pkg/config/file_config_manager.go +++ b/cli/azd/pkg/config/file_config_manager.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" ) // FileConfigManager provides the ability to load, parse and save azd configuration files diff --git a/cli/azd/pkg/config/manager.go b/cli/azd/pkg/config/manager.go index 870da9b074c..d0df81948d0 100644 --- a/cli/azd/pkg/config/manager.go +++ b/cli/azd/pkg/config/manager.go @@ -11,7 +11,7 @@ import ( "path/filepath" "runtime" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" ) // Config Manager provides the ability to load, parse and save azd configuration files diff --git a/cli/azd/pkg/config/manager_test.go b/cli/azd/pkg/config/manager_test.go index c3651597528..0ced4bada84 100644 --- a/cli/azd/pkg/config/manager_test.go +++ b/cli/azd/pkg/config/manager_test.go @@ -9,7 +9,7 @@ import ( "runtime" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/containerapps/container_app.go b/cli/azd/pkg/containerapps/container_app.go index d734c15801e..015bbbb3430 100644 --- a/cli/azd/pkg/containerapps/container_app.go +++ b/cli/azd/pkg/containerapps/container_app.go @@ -19,12 +19,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v3" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/output" "github.com/benbjohnson/clock" "github.com/braydonk/yaml" ) diff --git a/cli/azd/pkg/containerapps/container_app_test.go b/cli/azd/pkg/containerapps/container_app_test.go index bd16a51d801..e93dd1368ee 100644 --- a/cli/azd/pkg/containerapps/container_app_test.go +++ b/cli/azd/pkg/containerapps/container_app_test.go @@ -11,8 +11,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockazsdk" "github.com/benbjohnson/clock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/containerregistry/remote_build.go b/cli/azd/pkg/containerregistry/remote_build.go index 96f6f31f5ad..4946b729fa9 100644 --- a/cli/azd/pkg/containerregistry/remote_build.go +++ b/cli/azd/pkg/containerregistry/remote_build.go @@ -21,9 +21,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/account" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/pkg/cosmosdb/cosmosdb.go b/cli/azd/pkg/cosmosdb/cosmosdb.go index 88964a9fbf7..dcba270bd4f 100644 --- a/cli/azd/pkg/cosmosdb/cosmosdb.go +++ b/cli/azd/pkg/cosmosdb/cosmosdb.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) // CosmosDbService is the interface for the CosmosDbService diff --git a/cli/azd/pkg/devcenter/config.go b/cli/azd/pkg/devcenter/config.go index e9f8b55ffba..f125906f700 100644 --- a/cli/azd/pkg/devcenter/config.go +++ b/cli/azd/pkg/devcenter/config.go @@ -6,7 +6,7 @@ package devcenter import ( "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/platform" + "github.com/azure/azure-dev/pkg/platform" ) const ( diff --git a/cli/azd/pkg/devcenter/devcenter_test.go b/cli/azd/pkg/devcenter/devcenter_test.go index 1edd261eedc..6d06fc59d03 100644 --- a/cli/azd/pkg/devcenter/devcenter_test.go +++ b/cli/azd/pkg/devcenter/devcenter_test.go @@ -7,10 +7,10 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcenter/environment_store.go b/cli/azd/pkg/devcenter/environment_store.go index 141eddf3d4f..03715d898f8 100644 --- a/cli/azd/pkg/devcenter/environment_store.go +++ b/cli/azd/pkg/devcenter/environment_store.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" ) const ( diff --git a/cli/azd/pkg/devcenter/environment_store_test.go b/cli/azd/pkg/devcenter/environment_store_test.go index cb978285fdc..ff80015935e 100644 --- a/cli/azd/pkg/devcenter/environment_store_test.go +++ b/cli/azd/pkg/devcenter/environment_store_test.go @@ -9,14 +9,14 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockdevcentersdk" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockdevcentersdk" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcenter/manager.go b/cli/azd/pkg/devcenter/manager.go index 06c8c52abc6..e614f695501 100644 --- a/cli/azd/pkg/devcenter/manager.go +++ b/cli/azd/pkg/devcenter/manager.go @@ -11,11 +11,11 @@ import ( "strings" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" "go.uber.org/multierr" ) diff --git a/cli/azd/pkg/devcenter/manager_test.go b/cli/azd/pkg/devcenter/manager_test.go index 090cbe1f618..18582d54370 100644 --- a/cli/azd/pkg/devcenter/manager_test.go +++ b/cli/azd/pkg/devcenter/manager_test.go @@ -6,8 +6,8 @@ package devcenter import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/infra/provisioning" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcenter/platform.go b/cli/azd/pkg/devcenter/platform.go index 1c929869aca..5dfea942119 100644 --- a/cli/azd/pkg/devcenter/platform.go +++ b/cli/azd/pkg/devcenter/platform.go @@ -10,19 +10,19 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/state" - "github.com/azure/azure-dev/cli/azd/pkg/templates" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/platform" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/state" + "github.com/azure/azure-dev/pkg/templates" ) // Platform manages the Azd configuration of the devcenter platform diff --git a/cli/azd/pkg/devcenter/platform_test.go b/cli/azd/pkg/devcenter/platform_test.go index 392dfa45d94..d57d6a2d7f1 100644 --- a/cli/azd/pkg/devcenter/platform_test.go +++ b/cli/azd/pkg/devcenter/platform_test.go @@ -6,9 +6,9 @@ package devcenter import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/platform" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/platform" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcenter/prompter.go b/cli/azd/pkg/devcenter/prompter.go index 4c0fb42325b..0e12c9bc732 100644 --- a/cli/azd/pkg/devcenter/prompter.go +++ b/cli/azd/pkg/devcenter/prompter.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" ) // Prompter provides a common set of methods for prompting the user for devcenter configuration values diff --git a/cli/azd/pkg/devcenter/prompter_test.go b/cli/azd/pkg/devcenter/prompter_test.go index 17f608545dd..caf2d0d667c 100644 --- a/cli/azd/pkg/devcenter/prompter_test.go +++ b/cli/azd/pkg/devcenter/prompter_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockdevcentersdk" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockdevcentersdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcenter/provision_provider.go b/cli/azd/pkg/devcenter/provision_provider.go index 4428f712ad3..bb5310611dd 100644 --- a/cli/azd/pkg/devcenter/provision_provider.go +++ b/cli/azd/pkg/devcenter/provision_provider.go @@ -14,13 +14,13 @@ import ( "strconv" "time" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" ) const ( diff --git a/cli/azd/pkg/devcenter/provision_provider_test.go b/cli/azd/pkg/devcenter/provision_provider_test.go index cbdb842b052..33fa3323eaf 100644 --- a/cli/azd/pkg/devcenter/provision_provider_test.go +++ b/cli/azd/pkg/devcenter/provision_provider_test.go @@ -11,17 +11,17 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockdevcentersdk" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockdevcentersdk" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcenter/template_source.go b/cli/azd/pkg/devcenter/template_source.go index b936e6ea33c..9e1d22f699f 100644 --- a/cli/azd/pkg/devcenter/template_source.go +++ b/cli/azd/pkg/devcenter/template_source.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/templates" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/templates" "go.uber.org/multierr" ) diff --git a/cli/azd/pkg/devcenter/template_source_test.go b/cli/azd/pkg/devcenter/template_source_test.go index 2cde0069e16..f4bf8365ad5 100644 --- a/cli/azd/pkg/devcenter/template_source_test.go +++ b/cli/azd/pkg/devcenter/template_source_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/pkg/templates" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockdevcentersdk" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/pkg/templates" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockdevcentersdk" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcentersdk/catalog_request_builders.go b/cli/azd/pkg/devcentersdk/catalog_request_builders.go index 9c80eed2a61..f741d229e2d 100644 --- a/cli/azd/pkg/devcentersdk/catalog_request_builders.go +++ b/cli/azd/pkg/devcentersdk/catalog_request_builders.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) // Catalogs diff --git a/cli/azd/pkg/devcentersdk/developer_client.go b/cli/azd/pkg/devcentersdk/developer_client.go index 1bcc831c031..274bd4458ef 100644 --- a/cli/azd/pkg/devcentersdk/developer_client.go +++ b/cli/azd/pkg/devcentersdk/developer_client.go @@ -16,8 +16,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/convert" ) const ( diff --git a/cli/azd/pkg/devcentersdk/developer_client_test.go b/cli/azd/pkg/devcentersdk/developer_client_test.go index 92faa224187..757619f2b52 100644 --- a/cli/azd/pkg/devcentersdk/developer_client_test.go +++ b/cli/azd/pkg/devcentersdk/developer_client_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/tools/az" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/tools/az" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/devcentersdk/environment_definition_request_builders.go b/cli/azd/pkg/devcentersdk/environment_definition_request_builders.go index d795d7e259f..53383ffeb24 100644 --- a/cli/azd/pkg/devcentersdk/environment_definition_request_builders.go +++ b/cli/azd/pkg/devcentersdk/environment_definition_request_builders.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) // EnvironmentDefinitions diff --git a/cli/azd/pkg/devcentersdk/environment_request_builders.go b/cli/azd/pkg/devcentersdk/environment_request_builders.go index e802feddf0f..8bdc133aff0 100644 --- a/cli/azd/pkg/devcentersdk/environment_request_builders.go +++ b/cli/azd/pkg/devcentersdk/environment_request_builders.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) const ( diff --git a/cli/azd/pkg/devcentersdk/environment_type_request_builders.go b/cli/azd/pkg/devcentersdk/environment_type_request_builders.go index 4c1c56583e3..8158d9488f4 100644 --- a/cli/azd/pkg/devcentersdk/environment_type_request_builders.go +++ b/cli/azd/pkg/devcentersdk/environment_type_request_builders.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) // EnvironmentTypes diff --git a/cli/azd/pkg/devcentersdk/outputs_request_builder.go b/cli/azd/pkg/devcentersdk/outputs_request_builder.go index c33d8461f12..1ca4f5484a2 100644 --- a/cli/azd/pkg/devcentersdk/outputs_request_builder.go +++ b/cli/azd/pkg/devcentersdk/outputs_request_builder.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) type OutputsRequestBuilder struct { diff --git a/cli/azd/pkg/devcentersdk/permissions_request_builder.go b/cli/azd/pkg/devcentersdk/permissions_request_builder.go index 450b13bda51..17549977d4a 100644 --- a/cli/azd/pkg/devcentersdk/permissions_request_builder.go +++ b/cli/azd/pkg/devcentersdk/permissions_request_builder.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk" + "github.com/azure/azure-dev/pkg/azsdk" ) type PermissionListRequestBuilder struct { diff --git a/cli/azd/pkg/devcentersdk/project_request_builders.go b/cli/azd/pkg/devcentersdk/project_request_builders.go index db11c139c80..89e6358d62a 100644 --- a/cli/azd/pkg/devcentersdk/project_request_builders.go +++ b/cli/azd/pkg/devcentersdk/project_request_builders.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" + "github.com/azure/azure-dev/pkg/cloud" ) // Projects diff --git a/cli/azd/pkg/entraid/entraid.go b/cli/azd/pkg/entraid/entraid.go index 07f1b0777f9..e3f058eb977 100644 --- a/cli/azd/pkg/entraid/entraid.go +++ b/cli/azd/pkg/entraid/entraid.go @@ -15,10 +15,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/graphsdk" "github.com/google/uuid" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/pkg/entraid/entraid_test.go b/cli/azd/pkg/entraid/entraid_test.go index 94678a87b7f..679bfb171c9 100644 --- a/cli/azd/pkg/entraid/entraid_test.go +++ b/cli/azd/pkg/entraid/entraid_test.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/environment/azdcontext/azdcontext.go b/cli/azd/pkg/environment/azdcontext/azdcontext.go index 1b8f46a8e97..18a1c8ffd2f 100644 --- a/cli/azd/pkg/environment/azdcontext/azdcontext.go +++ b/cli/azd/pkg/environment/azdcontext/azdcontext.go @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/internal/names" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal/names" + "github.com/azure/azure-dev/pkg/osutil" ) const ProjectFileName = "azure.yaml" diff --git a/cli/azd/pkg/environment/data_store.go b/cli/azd/pkg/environment/data_store.go index 4d53a27f477..c16a0d79afd 100644 --- a/cli/azd/pkg/environment/data_store.go +++ b/cli/azd/pkg/environment/data_store.go @@ -6,7 +6,7 @@ package environment import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" + "github.com/azure/azure-dev/pkg/contracts" ) // DataStore is the interface for the interacting with the persistent storage of environments. diff --git a/cli/azd/pkg/environment/environment.go b/cli/azd/pkg/environment/environment.go index 761c024872b..eed96bbe4f6 100644 --- a/cli/azd/pkg/environment/environment.go +++ b/cli/azd/pkg/environment/environment.go @@ -14,7 +14,7 @@ import ( "maps" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" "github.com/joho/godotenv" ) diff --git a/cli/azd/pkg/environment/environment_test.go b/cli/azd/pkg/environment/environment_test.go index fc1f90df283..07cae1c7d09 100644 --- a/cli/azd/pkg/environment/environment_test.go +++ b/cli/azd/pkg/environment/environment_test.go @@ -10,11 +10,11 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "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/ostest" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/ostest" "github.com/joho/godotenv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/environment/local_file_data_store.go b/cli/azd/pkg/environment/local_file_data_store.go index dab3339b56e..2b179614eef 100644 --- a/cli/azd/pkg/environment/local_file_data_store.go +++ b/cli/azd/pkg/environment/local_file_data_store.go @@ -12,11 +12,11 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/environment/azdcontext" "github.com/google/uuid" "github.com/joho/godotenv" ) diff --git a/cli/azd/pkg/environment/local_file_data_store_test.go b/cli/azd/pkg/environment/local_file_data_store_test.go index 39754f7b17a..ced40a7900d 100644 --- a/cli/azd/pkg/environment/local_file_data_store_test.go +++ b/cli/azd/pkg/environment/local_file_data_store_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/environment/manager.go b/cli/azd/pkg/environment/manager.go index 6a38e1c58ad..8350ef47d0c 100644 --- a/cli/azd/pkg/environment/manager.go +++ b/cli/azd/pkg/environment/manager.go @@ -12,11 +12,11 @@ import ( "sync" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/state" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/state" ) // Description is a metadata description of an environment returned for the `azd env list` command diff --git a/cli/azd/pkg/environment/manager_test.go b/cli/azd/pkg/environment/manager_test.go index 1d965545812..cf7241f2908 100644 --- a/cli/azd/pkg/environment/manager_test.go +++ b/cli/azd/pkg/environment/manager_test.go @@ -11,15 +11,15 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/state" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/state" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/environment/mapper_registry.go b/cli/azd/pkg/environment/mapper_registry.go index 51f757f78f4..da6129f5805 100644 --- a/cli/azd/pkg/environment/mapper_registry.go +++ b/cli/azd/pkg/environment/mapper_registry.go @@ -6,8 +6,8 @@ package environment import ( "context" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" ) func init() { diff --git a/cli/azd/pkg/environment/mapper_registry_test.go b/cli/azd/pkg/environment/mapper_registry_test.go index cb6059359f8..67c9c974a3f 100644 --- a/cli/azd/pkg/environment/mapper_registry_test.go +++ b/cli/azd/pkg/environment/mapper_registry_test.go @@ -6,8 +6,8 @@ package environment import ( "testing" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/environment/storage_blob_data_store.go b/cli/azd/pkg/environment/storage_blob_data_store.go index 22b70eabc30..70d2ddf6ff8 100644 --- a/cli/azd/pkg/environment/storage_blob_data_store.go +++ b/cli/azd/pkg/environment/storage_blob_data_store.go @@ -14,11 +14,11 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/contracts" "github.com/google/uuid" "github.com/joho/godotenv" ) diff --git a/cli/azd/pkg/environment/storage_blob_data_store_test.go b/cli/azd/pkg/environment/storage_blob_data_store_test.go index 32aa1afdb36..e95607d7389 100644 --- a/cli/azd/pkg/environment/storage_blob_data_store_test.go +++ b/cli/azd/pkg/environment/storage_blob_data_store_test.go @@ -10,9 +10,9 @@ import ( "io" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/experimentation/assignment.go b/cli/azd/pkg/experimentation/assignment.go index 89c32296fe4..c9a0d0c6604 100644 --- a/cli/azd/pkg/experimentation/assignment.go +++ b/cli/azd/pkg/experimentation/assignment.go @@ -14,10 +14,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/tracing/resource" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/osutil" ) // cacheFileName is the name of the file used to cache assignment information. diff --git a/cli/azd/pkg/experimentation/assignment_test.go b/cli/azd/pkg/experimentation/assignment_test.go index 6e9f65d3cfd..af997fdb96f 100644 --- a/cli/azd/pkg/experimentation/assignment_test.go +++ b/cli/azd/pkg/experimentation/assignment_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/tracing/resource" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/tracing/resource" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks/mockhttp" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/experimentation/client_test.go b/cli/azd/pkg/experimentation/client_test.go index d387fd2301b..1c67bc2e13e 100644 --- a/cli/azd/pkg/experimentation/client_test.go +++ b/cli/azd/pkg/experimentation/client_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks/mockhttp" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/ext/event_dispatcher.go b/cli/azd/pkg/ext/event_dispatcher.go index b77c3501396..db65034b0a3 100644 --- a/cli/azd/pkg/ext/event_dispatcher.go +++ b/cli/azd/pkg/ext/event_dispatcher.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/azure/azure-dev/cli/azd/internal" + "github.com/azure/azure-dev/internal" ) type Event string diff --git a/cli/azd/pkg/ext/event_dispatcher_test.go b/cli/azd/pkg/ext/event_dispatcher_test.go index d0574c65dec..a767e70d4a2 100644 --- a/cli/azd/pkg/ext/event_dispatcher_test.go +++ b/cli/azd/pkg/ext/event_dispatcher_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/internal" + "github.com/azure/azure-dev/internal" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/ext/hooks_manager.go b/cli/azd/pkg/ext/hooks_manager.go index 4d5e9a06558..915014c5ce8 100644 --- a/cli/azd/pkg/ext/hooks_manager.go +++ b/cli/azd/pkg/ext/hooks_manager.go @@ -14,8 +14,8 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/output" ) type HookFilterPredicateFn func(scriptName string, hookConfig *HookConfig) bool diff --git a/cli/azd/pkg/ext/hooks_manager_test.go b/cli/azd/pkg/ext/hooks_manager_test.go index 5be4b0f649b..36257219a05 100644 --- a/cli/azd/pkg/ext/hooks_manager_test.go +++ b/cli/azd/pkg/ext/hooks_manager_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockexec" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks/mockexec" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/ext/hooks_runner.go b/cli/azd/pkg/ext/hooks_runner.go index 66448a581c6..90658f959dd 100644 --- a/cli/azd/pkg/ext/hooks_runner.go +++ b/cli/azd/pkg/ext/hooks_runner.go @@ -10,15 +10,15 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bash" - "github.com/azure/azure-dev/cli/azd/pkg/tools/powershell" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/bash" + "github.com/azure/azure-dev/pkg/tools/powershell" ) // Hooks enable support to invoke integration scripts before & after commands diff --git a/cli/azd/pkg/ext/hooks_runner_test.go b/cli/azd/pkg/ext/hooks_runner_test.go index 3db41883bb6..cc62a5cbb74 100644 --- a/cli/azd/pkg/ext/hooks_runner_test.go +++ b/cli/azd/pkg/ext/hooks_runner_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "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/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/ext/models.go b/cli/azd/pkg/ext/models.go index 91a12b96495..2eece65fd49 100644 --- a/cli/azd/pkg/ext/models.go +++ b/cli/azd/pkg/ext/models.go @@ -11,7 +11,7 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" ) // The type of hooks. Supported values are 'pre' and 'post' diff --git a/cli/azd/pkg/extensions/extension.go b/cli/azd/pkg/extensions/extension.go index 4eb9d1f7704..0179eee7ee7 100644 --- a/cli/azd/pkg/extensions/extension.go +++ b/cli/azd/pkg/extensions/extension.go @@ -9,7 +9,7 @@ import ( "io" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // Extension represents an installed extension. diff --git a/cli/azd/pkg/extensions/file_source.go b/cli/azd/pkg/extensions/file_source.go index 091990184ad..304d688933f 100644 --- a/cli/azd/pkg/extensions/file_source.go +++ b/cli/azd/pkg/extensions/file_source.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" ) // newFileSource creates a new file base registry source. diff --git a/cli/azd/pkg/extensions/manager.go b/cli/azd/pkg/extensions/manager.go index 065c7e5f7f4..a287e6ec3ab 100644 --- a/cli/azd/pkg/extensions/manager.go +++ b/cli/azd/pkg/extensions/manager.go @@ -24,12 +24,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" azruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Masterminds/semver/v3" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/events" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/rzip" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/events" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/rzip" ) const ( diff --git a/cli/azd/pkg/extensions/manager_test.go b/cli/azd/pkg/extensions/manager_test.go index d2a0721b569..e0a305afd1a 100644 --- a/cli/azd/pkg/extensions/manager_test.go +++ b/cli/azd/pkg/extensions/manager_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/extensions/runner.go b/cli/azd/pkg/extensions/runner.go index 16680fad16f..f1ef09f7706 100644 --- a/cli/azd/pkg/extensions/runner.go +++ b/cli/azd/pkg/extensions/runner.go @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" ) type InvokeOptions struct { diff --git a/cli/azd/pkg/extensions/source_manager.go b/cli/azd/pkg/extensions/source_manager.go index 075a3c00c52..2ba8804cc0a 100644 --- a/cli/azd/pkg/extensions/source_manager.go +++ b/cli/azd/pkg/extensions/source_manager.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/ioc" ) // SourceKind represents the type of extension source. diff --git a/cli/azd/pkg/extensions/source_manager_test.go b/cli/azd/pkg/extensions/source_manager_test.go index 29e59f14635..67ecc2410c6 100644 --- a/cli/azd/pkg/extensions/source_manager_test.go +++ b/cli/azd/pkg/extensions/source_manager_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/github/remote.go b/cli/azd/pkg/github/remote.go index d7df95dfc76..8e86c76a213 100644 --- a/cli/azd/pkg/github/remote.go +++ b/cli/azd/pkg/github/remote.go @@ -9,7 +9,7 @@ import ( "fmt" "regexp" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" + "github.com/azure/azure-dev/pkg/tools/git" ) var ErrRemoteHostIsNotGitHub = errors.New("not a github host") diff --git a/cli/azd/pkg/graphsdk/application_request_builders.go b/cli/azd/pkg/graphsdk/application_request_builders.go index 002ea9dcd82..cd6c140d0d7 100644 --- a/cli/azd/pkg/graphsdk/application_request_builders.go +++ b/cli/azd/pkg/graphsdk/application_request_builders.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) type ApplicationListRequestBuilder struct { diff --git a/cli/azd/pkg/graphsdk/application_request_builders_test.go b/cli/azd/pkg/graphsdk/application_request_builders_test.go index 33b33511e9a..218a63af0c5 100644 --- a/cli/azd/pkg/graphsdk/application_request_builders_test.go +++ b/cli/azd/pkg/graphsdk/application_request_builders_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/graphsdk/entity_list_request_builder_test.go b/cli/azd/pkg/graphsdk/entity_list_request_builder_test.go index 95a6ed98735..8d83c32bee4 100644 --- a/cli/azd/pkg/graphsdk/entity_list_request_builder_test.go +++ b/cli/azd/pkg/graphsdk/entity_list_request_builder_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/graphsdk/fic_request_builders.go b/cli/azd/pkg/graphsdk/fic_request_builders.go index 37aa05a3e6f..8cfd189e69b 100644 --- a/cli/azd/pkg/graphsdk/fic_request_builders.go +++ b/cli/azd/pkg/graphsdk/fic_request_builders.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) type FederatedIdentityCredentialListRequestBuilder struct { diff --git a/cli/azd/pkg/graphsdk/fic_request_builders_test.go b/cli/azd/pkg/graphsdk/fic_request_builders_test.go index fa6e9f89e0e..0ad6ea82542 100644 --- a/cli/azd/pkg/graphsdk/fic_request_builders_test.go +++ b/cli/azd/pkg/graphsdk/fic_request_builders_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/graphsdk/graph_client_test.go b/cli/azd/pkg/graphsdk/graph_client_test.go index 1a9ab2d61ba..f320e16ade6 100644 --- a/cli/azd/pkg/graphsdk/graph_client_test.go +++ b/cli/azd/pkg/graphsdk/graph_client_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/graphsdk/me_request_builder.go b/cli/azd/pkg/graphsdk/me_request_builder.go index 82b420f8bed..c142bd962ff 100644 --- a/cli/azd/pkg/graphsdk/me_request_builder.go +++ b/cli/azd/pkg/graphsdk/me_request_builder.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) type MeItemRequestBuilder struct { diff --git a/cli/azd/pkg/graphsdk/me_request_builder_test.go b/cli/azd/pkg/graphsdk/me_request_builder_test.go index 43938eef724..b00fb1919c8 100644 --- a/cli/azd/pkg/graphsdk/me_request_builder_test.go +++ b/cli/azd/pkg/graphsdk/me_request_builder_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/graphsdk/service_principal_request_builders.go b/cli/azd/pkg/graphsdk/service_principal_request_builders.go index ab0ddc3fb79..4402139b382 100644 --- a/cli/azd/pkg/graphsdk/service_principal_request_builders.go +++ b/cli/azd/pkg/graphsdk/service_principal_request_builders.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/httputil" + "github.com/azure/azure-dev/pkg/httputil" ) type ServicePrincipalListRequestBuilder struct { diff --git a/cli/azd/pkg/graphsdk/service_principal_request_builders_test.go b/cli/azd/pkg/graphsdk/service_principal_request_builders_test.go index c90e58e4939..086a9cec3c6 100644 --- a/cli/azd/pkg/graphsdk/service_principal_request_builders_test.go +++ b/cli/azd/pkg/graphsdk/service_principal_request_builders_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockgraphsdk" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockgraphsdk" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/graphsdk/util_test.go b/cli/azd/pkg/graphsdk/util_test.go index 1ad24f3f316..6b80cce7146 100644 --- a/cli/azd/pkg/graphsdk/util_test.go +++ b/cli/azd/pkg/graphsdk/util_test.go @@ -13,8 +13,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/helm/cli.go b/cli/azd/pkg/helm/cli.go index 65791c42dbb..a9628e07b0f 100644 --- a/cli/azd/pkg/helm/cli.go +++ b/cli/azd/pkg/helm/cli.go @@ -10,7 +10,7 @@ import ( "log" "time" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" ) type Cli struct { diff --git a/cli/azd/pkg/helm/cli_test.go b/cli/azd/pkg/helm/cli_test.go index c82d99b6f65..febe2da81ba 100644 --- a/cli/azd/pkg/helm/cli_test.go +++ b/cli/azd/pkg/helm/cli_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/azure_resource_manager.go b/cli/azd/pkg/infra/azure_resource_manager.go index 3887472a516..93b684191c5 100644 --- a/cli/azd/pkg/infra/azure_resource_manager.go +++ b/cli/azd/pkg/infra/azure_resource_manager.go @@ -15,12 +15,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/azureutil" - "github.com/azure/azure-dev/cli/azd/pkg/compare" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/azureutil" + "github.com/azure/azure-dev/pkg/compare" + "github.com/azure/azure-dev/pkg/output" ) type AzureResourceManager struct { diff --git a/cli/azd/pkg/infra/azure_resource_manager_test.go b/cli/azd/pkg/infra/azure_resource_manager_test.go index f3b3d6b1ce5..173da38dde8 100644 --- a/cli/azd/pkg/infra/azure_resource_manager_test.go +++ b/cli/azd/pkg/infra/azure_resource_manager_test.go @@ -17,10 +17,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/deployment_manager.go b/cli/azd/pkg/infra/deployment_manager.go index 459226e1177..17bfaf56caa 100644 --- a/cli/azd/pkg/infra/deployment_manager.go +++ b/cli/azd/pkg/infra/deployment_manager.go @@ -11,9 +11,9 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/input" ) var ( diff --git a/cli/azd/pkg/infra/provisioning/bicep/bicep_provider.go b/cli/azd/pkg/infra/provisioning/bicep/bicep_provider.go index 2406a37040a..4f9dca3a4e5 100644 --- a/cli/azd/pkg/infra/provisioning/bicep/bicep_provider.go +++ b/cli/azd/pkg/infra/provisioning/bicep/bicep_provider.go @@ -24,24 +24,24 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/cmdsubst" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "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/password" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/cmdsubst" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/password" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools/bicep" "github.com/drone/envsubst" ) diff --git a/cli/azd/pkg/infra/provisioning/bicep/bicep_provider_test.go b/cli/azd/pkg/infra/provisioning/bicep/bicep_provider_test.go index 8546692ef40..ef2084ccf02 100644 --- a/cli/azd/pkg/infra/provisioning/bicep/bicep_provider_test.go +++ b/cli/azd/pkg/infra/provisioning/bicep/bicep_provider_test.go @@ -22,22 +22,22 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appconfiguration/armappconfiguration" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools/bicep" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks/mockazapi" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/infra/provisioning/bicep/prompt.go b/cli/azd/pkg/infra/provisioning/bicep/prompt.go index 34865314352..a4b0558b2d2 100644 --- a/cli/azd/pkg/infra/provisioning/bicep/prompt.go +++ b/cli/azd/pkg/infra/provisioning/bicep/prompt.go @@ -15,16 +15,16 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/password" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/password" + "github.com/azure/azure-dev/pkg/prompt" + + "github.com/azure/azure-dev/pkg/infra/provisioning" ) // promptDialogItemForParameter builds the input.PromptDialogItem for the given required parameter. diff --git a/cli/azd/pkg/infra/provisioning/bicep/prompt_test.go b/cli/azd/pkg/infra/provisioning/bicep/prompt_test.go index 5a42527789e..6b73d1e10f2 100644 --- a/cli/azd/pkg/infra/provisioning/bicep/prompt_test.go +++ b/cli/azd/pkg/infra/provisioning/bicep/prompt_test.go @@ -10,15 +10,15 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/provisioning/current_principal_id_provider.go b/cli/azd/pkg/infra/provisioning/current_principal_id_provider.go index 6fed01e918e..be2ff8170b3 100644 --- a/cli/azd/pkg/infra/provisioning/current_principal_id_provider.go +++ b/cli/azd/pkg/infra/provisioning/current_principal_id_provider.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azureutil" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azureutil" + "github.com/azure/azure-dev/pkg/environment" ) type CurrentPrincipalIdProvider interface { diff --git a/cli/azd/pkg/infra/provisioning/deployment.go b/cli/azd/pkg/infra/provisioning/deployment.go index 3e5becc8371..5c5171d1e81 100644 --- a/cli/azd/pkg/infra/provisioning/deployment.go +++ b/cli/azd/pkg/infra/provisioning/deployment.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" ) type Deployment struct { diff --git a/cli/azd/pkg/infra/provisioning/manager.go b/cli/azd/pkg/infra/provisioning/manager.go index 27c59a17dd8..c5467de57b3 100644 --- a/cli/azd/pkg/infra/provisioning/manager.go +++ b/cli/azd/pkg/infra/provisioning/manager.go @@ -12,17 +12,17 @@ import ( "path/filepath" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/prompt" "github.com/braydonk/yaml" ) diff --git a/cli/azd/pkg/infra/provisioning/manager_test.go b/cli/azd/pkg/infra/provisioning/manager_test.go index fa241a787c6..17b5d782670 100644 --- a/cli/azd/pkg/infra/provisioning/manager_test.go +++ b/cli/azd/pkg/infra/provisioning/manager_test.go @@ -9,18 +9,18 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/policy" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/test" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/infra/provisioning/test" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks/mockazapi" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/benbjohnson/clock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/provisioning/options.go b/cli/azd/pkg/infra/provisioning/options.go index 2423114c9ff..cdef03dcafd 100644 --- a/cli/azd/pkg/infra/provisioning/options.go +++ b/cli/azd/pkg/infra/provisioning/options.go @@ -3,7 +3,7 @@ package provisioning -import "github.com/azure/azure-dev/cli/azd/pkg/output" +import "github.com/azure/azure-dev/pkg/output" type ActionOptions struct { // The desired console output format diff --git a/cli/azd/pkg/infra/provisioning/provisioning.go b/cli/azd/pkg/infra/provisioning/provisioning.go index 5a8755cef03..bedb13195a8 100644 --- a/cli/azd/pkg/infra/provisioning/provisioning.go +++ b/cli/azd/pkg/infra/provisioning/provisioning.go @@ -6,7 +6,7 @@ package provisioning import ( "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" + "github.com/azure/azure-dev/pkg/contracts" ) // NewEnvRefreshResultFromState creates a EnvRefreshResult from a provisioning state object, diff --git a/cli/azd/pkg/infra/provisioning/terraform/terraform_provider.go b/cli/azd/pkg/infra/provisioning/terraform/terraform_provider.go index 1776154eff8..4d1379e2d51 100644 --- a/cli/azd/pkg/infra/provisioning/terraform/terraform_provider.go +++ b/cli/azd/pkg/infra/provisioning/terraform/terraform_provider.go @@ -15,14 +15,14 @@ import ( "strings" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/terraform" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/terraform" "github.com/drone/envsubst" "go.opentelemetry.io/otel/trace" ) diff --git a/cli/azd/pkg/infra/provisioning/terraform/terraform_provider_test.go b/cli/azd/pkg/infra/provisioning/terraform/terraform_provider_test.go index 7f1a9a98d41..5d02c9578c6 100644 --- a/cli/azd/pkg/infra/provisioning/terraform/terraform_provider_test.go +++ b/cli/azd/pkg/infra/provisioning/terraform/terraform_provider_test.go @@ -11,19 +11,19 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - terraformTools "github.com/azure/azure-dev/cli/azd/pkg/tools/terraform" - "github.com/azure/azure-dev/cli/azd/test/mocks" - - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockexec" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/prompt" + terraformTools "github.com/azure/azure-dev/pkg/tools/terraform" + "github.com/azure/azure-dev/test/mocks" + + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/mocks/mockexec" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/provisioning/test/test_provider.go b/cli/azd/pkg/infra/provisioning/test/test_provider.go index d5251072f22..16cb6ababa3 100644 --- a/cli/azd/pkg/infra/provisioning/test/test_provider.go +++ b/cli/azd/pkg/infra/provisioning/test/test_provider.go @@ -10,11 +10,11 @@ import ( "context" "errors" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools" ) type TestProvider struct { diff --git a/cli/azd/pkg/infra/provisioning_progress_display.go b/cli/azd/pkg/infra/provisioning_progress_display.go index ca564d0dd75..7c90c7eb61b 100644 --- a/cli/azd/pkg/infra/provisioning_progress_display.go +++ b/cli/azd/pkg/infra/provisioning_progress_display.go @@ -14,11 +14,11 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" ) // ProvisioningProgressDisplay displays interactive progress for an ongoing Azure provisioning operation. diff --git a/cli/azd/pkg/infra/provisioning_progress_display_test.go b/cli/azd/pkg/infra/provisioning_progress_display_test.go index 4c6b5289776..0950f9f03f9 100644 --- a/cli/azd/pkg/infra/provisioning_progress_display_test.go +++ b/cli/azd/pkg/infra/provisioning_progress_display_test.go @@ -16,9 +16,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/scope.go b/cli/azd/pkg/infra/scope.go index 44d1f6a0aed..28427ffa040 100644 --- a/cli/azd/pkg/infra/scope.go +++ b/cli/azd/pkg/infra/scope.go @@ -7,9 +7,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" ) type Scope interface { diff --git a/cli/azd/pkg/infra/scope_test.go b/cli/azd/pkg/infra/scope_test.go index 94bb5a8d0a6..7634ea03679 100644 --- a/cli/azd/pkg/infra/scope_test.go +++ b/cli/azd/pkg/infra/scope_test.go @@ -16,10 +16,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/infra/util.go b/cli/azd/pkg/infra/util.go index ab773bfbfda..9dd30d847d0 100644 --- a/cli/azd/pkg/infra/util.go +++ b/cli/azd/pkg/infra/util.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/environment" ) // ResourceId returns the resource ID for the corresponding name. diff --git a/cli/azd/pkg/input/console.go b/cli/azd/pkg/input/console.go index bcca5db1827..f9c051c41a0 100644 --- a/cli/azd/pkg/input/console.go +++ b/cli/azd/pkg/input/console.go @@ -24,10 +24,10 @@ import ( surveyterm "github.com/AlecAivazis/survey/v2/terminal" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" tm "github.com/buger/goterm" "github.com/nathan-fiscaletti/consolesize-go" "github.com/theckman/yacspin" diff --git a/cli/azd/pkg/input/console_test.go b/cli/azd/pkg/input/console_test.go index d9b7d532cda..0e7b382c64c 100644 --- a/cli/azd/pkg/input/console_test.go +++ b/cli/azd/pkg/input/console_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/input/progress_log_test.go b/cli/azd/pkg/input/progress_log_test.go index b09dc381003..1dbe66b596d 100644 --- a/cli/azd/pkg/input/progress_log_test.go +++ b/cli/azd/pkg/input/progress_log_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/test/snapshot" "github.com/bradleyjkemp/cupaloy/v2" tm "github.com/buger/goterm" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/ioc/container_test.go b/cli/azd/pkg/ioc/container_test.go index 5440c0fc582..7039f9d25c2 100644 --- a/cli/azd/pkg/ioc/container_test.go +++ b/cli/azd/pkg/ioc/container_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/environment/azdcontext" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/keyvault/keyvault.go b/cli/azd/pkg/keyvault/keyvault.go index f567a62d8bd..3ca59c6b275 100644 --- a/cli/azd/pkg/keyvault/keyvault.go +++ b/cli/azd/pkg/keyvault/keyvault.go @@ -16,9 +16,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault" "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/convert" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/convert" ) var ErrAzCliSecretNotFound = errors.New("secret not found") diff --git a/cli/azd/pkg/kubelogin/cli.go b/cli/azd/pkg/kubelogin/cli.go index 53b82791a7e..2b020719ccb 100644 --- a/cli/azd/pkg/kubelogin/cli.go +++ b/cli/azd/pkg/kubelogin/cli.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" ) // Cli is a wrapper around the kubelogin CLI diff --git a/cli/azd/pkg/kustomize/cli.go b/cli/azd/pkg/kustomize/cli.go index 5863f9ed225..6d6617c240c 100644 --- a/cli/azd/pkg/kustomize/cli.go +++ b/cli/azd/pkg/kustomize/cli.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" ) // Cli is a wrapper around the kustomize cli diff --git a/cli/azd/pkg/kustomize/cli_test.go b/cli/azd/pkg/kustomize/cli_test.go index 47df15732e5..36fbc3145f1 100644 --- a/cli/azd/pkg/kustomize/cli_test.go +++ b/cli/azd/pkg/kustomize/cli_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/kustomize/config.go b/cli/azd/pkg/kustomize/config.go index a73f3d75e67..fecce9c29e9 100644 --- a/cli/azd/pkg/kustomize/config.go +++ b/cli/azd/pkg/kustomize/config.go @@ -3,7 +3,7 @@ package kustomize -import "github.com/azure/azure-dev/cli/azd/pkg/osutil" +import "github.com/azure/azure-dev/pkg/osutil" type Config struct { Directory osutil.ExpandableString `yaml:"dir"` diff --git a/cli/azd/pkg/llm/azure_openai.go b/cli/azd/pkg/llm/azure_openai.go index 76dfb7f467f..7e6cb0bd68e 100644 --- a/cli/azd/pkg/llm/azure_openai.go +++ b/cli/azd/pkg/llm/azure_openai.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" "github.com/tmc/langchaingo/llms" "github.com/tmc/langchaingo/llms/openai" ) diff --git a/cli/azd/pkg/llm/github_copilot.go b/cli/azd/pkg/llm/github_copilot.go index 472afd80b97..ce2fd01ef27 100644 --- a/cli/azd/pkg/llm/github_copilot.go +++ b/cli/azd/pkg/llm/github_copilot.go @@ -19,9 +19,9 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" "github.com/tmc/langchaingo/llms" "github.com/tmc/langchaingo/llms/openai" ) diff --git a/cli/azd/pkg/llm/manager.go b/cli/azd/pkg/llm/manager.go index cc66d010204..b5d1dd22925 100644 --- a/cli/azd/pkg/llm/manager.go +++ b/cli/azd/pkg/llm/manager.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/config" "github.com/tmc/langchaingo/callbacks" "github.com/tmc/langchaingo/llms" ) diff --git a/cli/azd/pkg/llm/model_factory.go b/cli/azd/pkg/llm/model_factory.go index 552eaf1b5b0..f09b6de0097 100644 --- a/cli/azd/pkg/llm/model_factory.go +++ b/cli/azd/pkg/llm/model_factory.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/ioc" ) // ModelFactory creates model containers using registered model providers diff --git a/cli/azd/pkg/llm/ollama.go b/cli/azd/pkg/llm/ollama.go index 80a787dd047..36186026a83 100644 --- a/cli/azd/pkg/llm/ollama.go +++ b/cli/azd/pkg/llm/ollama.go @@ -6,7 +6,7 @@ package llm import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" "github.com/tmc/langchaingo/llms" "github.com/tmc/langchaingo/llms/ollama" ) diff --git a/cli/azd/pkg/oneauth/oneauth_windows.go b/cli/azd/pkg/oneauth/oneauth_windows.go index c815f8faf87..70513377276 100644 --- a/cli/azd/pkg/oneauth/oneauth_windows.go +++ b/cli/azd/pkg/oneauth/oneauth_windows.go @@ -45,7 +45,7 @@ import ( "time" "unsafe" - "github.com/azure/azure-dev/cli/azd/internal" + "github.com/azure/azure-dev/internal" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" diff --git a/cli/azd/pkg/osutil/file_test.go b/cli/azd/pkg/osutil/file_test.go index f9d54ca5576..fbd3556c9a0 100644 --- a/cli/azd/pkg/osutil/file_test.go +++ b/cli/azd/pkg/osutil/file_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/pkg/output/colors.go b/cli/azd/pkg/output/colors.go index 6763e9243ab..7fee0d218dc 100644 --- a/cli/azd/pkg/output/colors.go +++ b/cli/azd/pkg/output/colors.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/internal/terminal" + "github.com/azure/azure-dev/internal/terminal" "github.com/charmbracelet/glamour" "github.com/fatih/color" "github.com/nathan-fiscaletti/consolesize-go" diff --git a/cli/azd/pkg/output/json.go b/cli/azd/pkg/output/json.go index 222aa2ba508..22cc5ce99cd 100644 --- a/cli/azd/pkg/output/json.go +++ b/cli/azd/pkg/output/json.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" + "github.com/azure/azure-dev/pkg/contracts" "github.com/mattn/go-colorable" ) diff --git a/cli/azd/pkg/output/parameter.go b/cli/azd/pkg/output/parameter.go index d6998b07899..c6c264098ed 100644 --- a/cli/azd/pkg/output/parameter.go +++ b/cli/azd/pkg/output/parameter.go @@ -13,7 +13,7 @@ import ( const ( outputFlagName = "output" - supportedFormatterAnnotation = "github.com/azure/azure-dev/cli/azd/pkg/output/supportedOutputFormatters" + supportedFormatterAnnotation = "github.com/azure/azure-dev/pkg/output/supportedOutputFormatters" ) func AddOutputFlag(f *pflag.FlagSet, s *string, supportedFormats []Format, defaultFormat Format) { diff --git a/cli/azd/pkg/output/ux/action_result.go b/cli/azd/pkg/output/ux/action_result.go index 546f5118164..083b6d66739 100644 --- a/cli/azd/pkg/output/ux/action_result.go +++ b/cli/azd/pkg/output/ux/action_result.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type ActionResult struct { diff --git a/cli/azd/pkg/output/ux/action_result_test.go b/cli/azd/pkg/output/ux/action_result_test.go index dc5420c39a6..1aa45f9927c 100644 --- a/cli/azd/pkg/output/ux/action_result_test.go +++ b/cli/azd/pkg/output/ux/action_result_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/output/ux/created_repo_value.go b/cli/azd/pkg/output/ux/created_repo_value.go index 3887fb30328..75f8a91c340 100644 --- a/cli/azd/pkg/output/ux/created_repo_value.go +++ b/cli/azd/pkg/output/ux/created_repo_value.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type GitHubValueKind string diff --git a/cli/azd/pkg/output/ux/displayed_resource.go b/cli/azd/pkg/output/ux/displayed_resource.go index 578e921a5d6..aed72d97a9d 100644 --- a/cli/azd/pkg/output/ux/displayed_resource.go +++ b/cli/azd/pkg/output/ux/displayed_resource.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) const ( diff --git a/cli/azd/pkg/output/ux/done.go b/cli/azd/pkg/output/ux/done.go index 84daf4d1a63..ec68c4c3b17 100644 --- a/cli/azd/pkg/output/ux/done.go +++ b/cli/azd/pkg/output/ux/done.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type DoneMessage struct { diff --git a/cli/azd/pkg/output/ux/environment_details.go b/cli/azd/pkg/output/ux/environment_details.go index 85b9ec44170..1873b18c06e 100644 --- a/cli/azd/pkg/output/ux/environment_details.go +++ b/cli/azd/pkg/output/ux/environment_details.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type EnvironmentDetails struct { diff --git a/cli/azd/pkg/output/ux/environment_details_test.go b/cli/azd/pkg/output/ux/environment_details_test.go index baa4c904464..5fed0806216 100644 --- a/cli/azd/pkg/output/ux/environment_details_test.go +++ b/cli/azd/pkg/output/ux/environment_details_test.go @@ -6,7 +6,7 @@ package ux import ( "testing" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/test/snapshot" ) func TestEnvironmentDetails(t *testing.T) { diff --git a/cli/azd/pkg/output/ux/logged_in.go b/cli/azd/pkg/output/ux/logged_in.go index 59decaf2c4d..8fcc00c5c7c 100644 --- a/cli/azd/pkg/output/ux/logged_in.go +++ b/cli/azd/pkg/output/ux/logged_in.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) const cLoginSuccessMessage = "Logged in to Azure" diff --git a/cli/azd/pkg/output/ux/multiline_message.go b/cli/azd/pkg/output/ux/multiline_message.go index a7d6890b5ad..b5e6fd9fd6a 100644 --- a/cli/azd/pkg/output/ux/multiline_message.go +++ b/cli/azd/pkg/output/ux/multiline_message.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type MultilineMessage struct { diff --git a/cli/azd/pkg/output/ux/preview_provision.go b/cli/azd/pkg/output/ux/preview_provision.go index 49559a2555f..76aeba2a052 100644 --- a/cli/azd/pkg/output/ux/preview_provision.go +++ b/cli/azd/pkg/output/ux/preview_provision.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/output" "github.com/fatih/color" ) diff --git a/cli/azd/pkg/output/ux/preview_provision_test.go b/cli/azd/pkg/output/ux/preview_provision_test.go index aa1cd122bc9..76befbd1571 100644 --- a/cli/azd/pkg/output/ux/preview_provision_test.go +++ b/cli/azd/pkg/output/ux/preview_provision_test.go @@ -6,7 +6,7 @@ package ux import ( "testing" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/test/snapshot" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/output/ux/show.go b/cli/azd/pkg/output/ux/show.go index f68a7a72a82..122a76dfeb0 100644 --- a/cli/azd/pkg/output/ux/show.go +++ b/cli/azd/pkg/output/ux/show.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" "github.com/fatih/color" ) diff --git a/cli/azd/pkg/output/ux/show_test.go b/cli/azd/pkg/output/ux/show_test.go index 53ebe5e76b2..12e53fb296c 100644 --- a/cli/azd/pkg/output/ux/show_test.go +++ b/cli/azd/pkg/output/ux/show_test.go @@ -6,7 +6,7 @@ package ux import ( "testing" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/test/snapshot" ) func TestShow(t *testing.T) { diff --git a/cli/azd/pkg/output/ux/skipped.go b/cli/azd/pkg/output/ux/skipped.go index aa7e2866924..dfd1889d772 100644 --- a/cli/azd/pkg/output/ux/skipped.go +++ b/cli/azd/pkg/output/ux/skipped.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type SkippedMessage struct { diff --git a/cli/azd/pkg/output/ux/title.go b/cli/azd/pkg/output/ux/title.go index 705f7b750a6..2fda63b7c28 100644 --- a/cli/azd/pkg/output/ux/title.go +++ b/cli/azd/pkg/output/ux/title.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type MessageTitle struct { diff --git a/cli/azd/pkg/output/ux/uxitem.go b/cli/azd/pkg/output/ux/uxitem.go index 00bd743fa4c..f8648829b71 100644 --- a/cli/azd/pkg/output/ux/uxitem.go +++ b/cli/azd/pkg/output/ux/uxitem.go @@ -6,7 +6,7 @@ package ux import ( "encoding/json" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type UxItem interface { diff --git a/cli/azd/pkg/output/ux/warning.go b/cli/azd/pkg/output/ux/warning.go index 0ea24fc236a..a36ec9f624c 100644 --- a/cli/azd/pkg/output/ux/warning.go +++ b/cli/azd/pkg/output/ux/warning.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // Warning message with hidable prefix "WARNING: " diff --git a/cli/azd/pkg/output/ux/warning_alt.go b/cli/azd/pkg/output/ux/warning_alt.go index 705d8cbc00a..b45e19ccaf1 100644 --- a/cli/azd/pkg/output/ux/warning_alt.go +++ b/cli/azd/pkg/output/ux/warning_alt.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // Warning message with the prefix "(!) Warning: " diff --git a/cli/azd/pkg/pipeline/azdo_provider.go b/cli/azd/pkg/pipeline/azdo_provider.go index 24bdbafdc6c..e36fd224b42 100644 --- a/cli/azd/pkg/pipeline/azdo_provider.go +++ b/cli/azd/pkg/pipeline/azdo_provider.go @@ -11,17 +11,17 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/azdo" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" + "github.com/azure/azure-dev/pkg/azdo" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/git" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" "github.com/microsoft/azure-devops-go-api/azuredevops/v7/build" azdoGit "github.com/microsoft/azure-devops-go-api/azuredevops/v7/git" diff --git a/cli/azd/pkg/pipeline/azdo_provider_test.go b/cli/azd/pkg/pipeline/azdo_provider_test.go index deced61800d..af0823f04b3 100644 --- a/cli/azd/pkg/pipeline/azdo_provider_test.go +++ b/cli/azd/pkg/pipeline/azdo_provider_test.go @@ -8,14 +8,14 @@ import ( "errors" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azdo" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/azdo" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/mocks/mockinput" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/pipeline/github_provider.go b/cli/azd/pkg/pipeline/github_provider.go index ea86925ce77..0bf923b9ad9 100644 --- a/cli/azd/pkg/pipeline/github_provider.go +++ b/cli/azd/pkg/pipeline/github_provider.go @@ -17,18 +17,18 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - githubRemote "github.com/azure/azure-dev/cli/azd/pkg/github" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + githubRemote "github.com/azure/azure-dev/pkg/github" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/pkg/tools/github" ) // GitHubScmProvider implements ScmProvider using GitHub as the provider diff --git a/cli/azd/pkg/pipeline/github_provider_test.go b/cli/azd/pkg/pipeline/github_provider_test.go index 08588a328f6..f0282fa44d5 100644 --- a/cli/azd/pkg/pipeline/github_provider_test.go +++ b/cli/azd/pkg/pipeline/github_provider_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/pkg/tools/github" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/pipeline/pipeline.go b/cli/azd/pkg/pipeline/pipeline.go index fd6cd8fb23b..382c5de5293 100644 --- a/cli/azd/pkg/pipeline/pipeline.go +++ b/cli/azd/pkg/pipeline/pipeline.go @@ -12,10 +12,10 @@ import ( "slices" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/tools" ) // subareaProvider defines the base behavior from any pipeline provider diff --git a/cli/azd/pkg/pipeline/pipeline_manager.go b/cli/azd/pkg/pipeline/pipeline_manager.go index 20c7317b38f..abae247f368 100644 --- a/cli/azd/pkg/pipeline/pipeline_manager.go +++ b/cli/azd/pkg/pipeline/pipeline_manager.go @@ -18,25 +18,25 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" msi "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi" - "github.com/azure/azure-dev/cli/azd/pkg/armmsi" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "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/pkg/output/ux" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/resources" + "github.com/azure/azure-dev/pkg/armmsi" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/resources" "github.com/google/uuid" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/pkg/pipeline/pipeline_manager_test.go b/cli/azd/pkg/pipeline/pipeline_manager_test.go index d3f5320c4be..f841cc26de3 100644 --- a/cli/azd/pkg/pipeline/pipeline_manager_test.go +++ b/cli/azd/pkg/pipeline/pipeline_manager_test.go @@ -11,25 +11,25 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/armmsi" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/entraid" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/git" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/armmsi" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/entraid" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/git" + "github.com/azure/azure-dev/pkg/tools/github" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/snapshot" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/cli/azd/pkg/platform/platform.go b/cli/azd/pkg/platform/platform.go index c6a8dbfb241..d38b4642dd3 100644 --- a/cli/azd/pkg/platform/platform.go +++ b/cli/azd/pkg/platform/platform.go @@ -6,7 +6,7 @@ package platform import ( "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/pkg/ioc" ) var ( diff --git a/cli/azd/pkg/platform/platform_test.go b/cli/azd/pkg/platform/platform_test.go index 3667f6d302a..6bd4581714d 100644 --- a/cli/azd/pkg/platform/platform_test.go +++ b/cli/azd/pkg/platform/platform_test.go @@ -6,7 +6,7 @@ package platform import ( "testing" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" + "github.com/azure/azure-dev/pkg/ioc" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/platform/provider.go b/cli/azd/pkg/platform/provider.go index 721f0c51693..1966b49d618 100644 --- a/cli/azd/pkg/platform/provider.go +++ b/cli/azd/pkg/platform/provider.go @@ -3,7 +3,7 @@ package platform -import "github.com/azure/azure-dev/cli/azd/pkg/ioc" +import "github.com/azure/azure-dev/pkg/ioc" // Provider is an interface for a platform provider type Provider interface { diff --git a/cli/azd/pkg/project/ai_helper.go b/cli/azd/pkg/project/ai_helper.go index 9e4579e3a05..4d60d64bbdf 100644 --- a/cli/azd/pkg/project/ai_helper.go +++ b/cli/azd/pkg/project/ai_helper.go @@ -18,11 +18,11 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/ai" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/ai" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" "github.com/benbjohnson/clock" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/pkg/project/ai_helper_test.go b/cli/azd/pkg/project/ai_helper_test.go index b1d2874b818..c1231831715 100644 --- a/cli/azd/pkg/project/ai_helper_test.go +++ b/cli/azd/pkg/project/ai_helper_test.go @@ -16,13 +16,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/pkg/ai" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockai" + "github.com/azure/azure-dev/pkg/ai" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockai" "github.com/google/uuid" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/project/artifact.go b/cli/azd/pkg/project/artifact.go index 6e971a985e9..8970eac3d1c 100644 --- a/cli/azd/pkg/project/artifact.go +++ b/cli/azd/pkg/project/artifact.go @@ -11,7 +11,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // ArtifactKind represents well-known artifact types in the Azure Developer CLI diff --git a/cli/azd/pkg/project/container_helper.go b/cli/azd/pkg/project/container_helper.go index ea3c5d20746..fcfbff50c96 100644 --- a/cli/azd/pkg/project/container_helper.go +++ b/cli/azd/pkg/project/container_helper.go @@ -17,26 +17,26 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/appdetect" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/events" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/containerregistry" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/pack" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/appdetect" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/events" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/containerregistry" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/pack" "github.com/benbjohnson/clock" "github.com/sethvargo/go-retry" "go.opentelemetry.io/otel/trace" diff --git a/cli/azd/pkg/project/container_helper_test.go b/cli/azd/pkg/project/container_helper_test.go index eebba6e2ebd..2f69ad5de3d 100644 --- a/cli/azd/pkg/project/container_helper_test.go +++ b/cli/azd/pkg/project/container_helper_test.go @@ -14,17 +14,17 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/benbjohnson/clock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cli/azd/pkg/project/dockerfile_builder_test.go b/cli/azd/pkg/project/dockerfile_builder_test.go index 29889068ea1..587722e3200 100644 --- a/cli/azd/pkg/project/dockerfile_builder_test.go +++ b/cli/azd/pkg/project/dockerfile_builder_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/test/snapshot" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/dotnet_importer.go b/cli/azd/pkg/project/dotnet_importer.go index fd8315b9fa9..b031d1234a2 100644 --- a/cli/azd/pkg/project/dotnet_importer.go +++ b/cli/azd/pkg/project/dotnet_importer.go @@ -14,16 +14,16 @@ import ( "strings" "sync" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/dotnet" "github.com/psanford/memfs" ) diff --git a/cli/azd/pkg/project/dotnet_importer_test.go b/cli/azd/pkg/project/dotnet_importer_test.go index 1a6d8cc3f2c..18a1f01ba3f 100644 --- a/cli/azd/pkg/project/dotnet_importer_test.go +++ b/cli/azd/pkg/project/dotnet_importer_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/apphost" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/framework_service.go b/cli/azd/pkg/project/framework_service.go index 5f3ee8473db..69a4370f032 100644 --- a/cli/azd/pkg/project/framework_service.go +++ b/cli/azd/pkg/project/framework_service.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/tools" ) type ServiceLanguageKind string diff --git a/cli/azd/pkg/project/framework_service_custom.go b/cli/azd/pkg/project/framework_service_custom.go index 02575a633a5..3102cb3a962 100644 --- a/cli/azd/pkg/project/framework_service_custom.go +++ b/cli/azd/pkg/project/framework_service_custom.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) type customProject struct { diff --git a/cli/azd/pkg/project/framework_service_docker.go b/cli/azd/pkg/project/framework_service_docker.go index 5a90f0c3876..155a9106855 100644 --- a/cli/azd/pkg/project/framework_service_docker.go +++ b/cli/azd/pkg/project/framework_service_docker.go @@ -10,14 +10,14 @@ import ( "path/filepath" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/docker" ) type DockerProjectOptions struct { diff --git a/cli/azd/pkg/project/framework_service_docker_test.go b/cli/azd/pkg/project/framework_service_docker_test.go index 4177bcb1a44..52a14910f9c 100644 --- a/cli/azd/pkg/project/framework_service_docker_test.go +++ b/cli/azd/pkg/project/framework_service_docker_test.go @@ -12,20 +12,20 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/npm" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockarmresources" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/npm" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockarmresources" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/benbjohnson/clock" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/project/framework_service_dotnet.go b/cli/azd/pkg/project/framework_service_dotnet.go index 5d3024b22bd..f263168c38a 100644 --- a/cli/azd/pkg/project/framework_service_dotnet.go +++ b/cli/azd/pkg/project/framework_service_dotnet.go @@ -11,11 +11,11 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/dotnet" ) const ( diff --git a/cli/azd/pkg/project/framework_service_dotnet_test.go b/cli/azd/pkg/project/framework_service_dotnet_test.go index a030f36466d..2311ddcd6d6 100644 --- a/cli/azd/pkg/project/framework_service_dotnet_test.go +++ b/cli/azd/pkg/project/framework_service_dotnet_test.go @@ -12,14 +12,14 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/framework_service_external.go b/cli/azd/pkg/project/framework_service_external.go index c21ea44b008..9f608a143ac 100644 --- a/cli/azd/pkg/project/framework_service_external.go +++ b/cli/azd/pkg/project/framework_service_external.go @@ -8,13 +8,13 @@ import ( "errors" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/tools" "github.com/google/uuid" ) diff --git a/cli/azd/pkg/project/framework_service_maven.go b/cli/azd/pkg/project/framework_service_maven.go index 127022c86a1..eccb3d8dd68 100644 --- a/cli/azd/pkg/project/framework_service_maven.go +++ b/cli/azd/pkg/project/framework_service_maven.go @@ -11,11 +11,11 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/javac" - "github.com/azure/azure-dev/cli/azd/pkg/tools/maven" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/javac" + "github.com/azure/azure-dev/pkg/tools/maven" "github.com/otiai10/copy" ) diff --git a/cli/azd/pkg/project/framework_service_maven_test.go b/cli/azd/pkg/project/framework_service_maven_test.go index 3fceb2a7669..bb894b2ab77 100644 --- a/cli/azd/pkg/project/framework_service_maven_test.go +++ b/cli/azd/pkg/project/framework_service_maven_test.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/javac" - "github.com/azure/azure-dev/cli/azd/pkg/tools/maven" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/javac" + "github.com/azure/azure-dev/pkg/tools/maven" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/framework_service_noop.go b/cli/azd/pkg/project/framework_service_noop.go index 13559f8f296..8e70b939bd3 100644 --- a/cli/azd/pkg/project/framework_service_noop.go +++ b/cli/azd/pkg/project/framework_service_noop.go @@ -6,9 +6,9 @@ package project import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) // NewNoOpProject creates a new instance of a no-op project, which implements the FrameworkService interface diff --git a/cli/azd/pkg/project/framework_service_npm.go b/cli/azd/pkg/project/framework_service_npm.go index c5221f4e8e3..aadcad2577c 100644 --- a/cli/azd/pkg/project/framework_service_npm.go +++ b/cli/azd/pkg/project/framework_service_npm.go @@ -9,10 +9,10 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/npm" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/npm" ) type npmProject struct { diff --git a/cli/azd/pkg/project/framework_service_npm_test.go b/cli/azd/pkg/project/framework_service_npm_test.go index adaa378f0f5..e7fe1123cd9 100644 --- a/cli/azd/pkg/project/framework_service_npm_test.go +++ b/cli/azd/pkg/project/framework_service_npm_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/npm" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/npm" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/framework_service_python.go b/cli/azd/pkg/project/framework_service_python.go index e9606dbd511..1bfab69b3ca 100644 --- a/cli/azd/pkg/project/framework_service_python.go +++ b/cli/azd/pkg/project/framework_service_python.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/python" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/python" ) type pythonProject struct { diff --git a/cli/azd/pkg/project/framework_service_python_test.go b/cli/azd/pkg/project/framework_service_python_test.go index f9df5c196e3..dc77000d8f1 100644 --- a/cli/azd/pkg/project/framework_service_python_test.go +++ b/cli/azd/pkg/project/framework_service_python_test.go @@ -11,13 +11,13 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/python" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/python" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/framework_service_swa.go b/cli/azd/pkg/project/framework_service_swa.go index 026487f588a..2d2c898cc44 100644 --- a/cli/azd/pkg/project/framework_service_swa.go +++ b/cli/azd/pkg/project/framework_service_swa.go @@ -6,12 +6,12 @@ package project import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/swa" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/swa" ) type swaProject struct { diff --git a/cli/azd/pkg/project/importer.go b/cli/azd/pkg/project/importer.go index 10fcca2451a..ddf46db077b 100644 --- a/cli/azd/pkg/project/importer.go +++ b/cli/azd/pkg/project/importer.go @@ -14,7 +14,7 @@ import ( "strings" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/infra/provisioning" ) type ImportManager struct { diff --git a/cli/azd/pkg/project/importer_test.go b/cli/azd/pkg/project/importer_test.go index dc2af3497c7..58d88d0d1c0 100644 --- a/cli/azd/pkg/project/importer_test.go +++ b/cli/azd/pkg/project/importer_test.go @@ -12,17 +12,17 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/lazy" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/lazy" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/braydonk/yaml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cli/azd/pkg/project/mapper_registry.go b/cli/azd/pkg/project/mapper_registry.go index c9e5eb9dd1d..9375c8895d2 100644 --- a/cli/azd/pkg/project/mapper_registry.go +++ b/cli/azd/pkg/project/mapper_registry.go @@ -8,11 +8,11 @@ import ( "encoding/json" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/cli/azd/pkg/project/mapper_registry_test.go b/cli/azd/pkg/project/mapper_registry_test.go index 60cb2b2a0a2..e06725be45b 100644 --- a/cli/azd/pkg/project/mapper_registry_test.go +++ b/cli/azd/pkg/project/mapper_registry_test.go @@ -8,10 +8,10 @@ import ( "fmt" "testing" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/osutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/structpb" diff --git a/cli/azd/pkg/project/project.go b/cli/azd/pkg/project/project.go index a4b94cc3e8a..360b7f4eba7 100644 --- a/cli/azd/pkg/project/project.go +++ b/cli/azd/pkg/project/project.go @@ -14,13 +14,13 @@ import ( "strings" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" "github.com/blang/semver/v4" "github.com/braydonk/yaml" ) diff --git a/cli/azd/pkg/project/project_config.go b/cli/azd/pkg/project/project_config.go index ccb50cd74cf..40f9ad24027 100644 --- a/cli/azd/pkg/project/project_config.go +++ b/cli/azd/pkg/project/project_config.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/platform" - "github.com/azure/azure-dev/cli/azd/pkg/state" - "github.com/azure/azure-dev/cli/azd/pkg/workflow" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/platform" + "github.com/azure/azure-dev/pkg/state" + "github.com/azure/azure-dev/pkg/workflow" ) // ProjectConfig is the top level object serialized into an azure.yaml file. diff --git a/cli/azd/pkg/project/project_config_test.go b/cli/azd/pkg/project/project_config_test.go index ca6688abf9d..e39774a40f2 100644 --- a/cli/azd/pkg/project/project_config_test.go +++ b/cli/azd/pkg/project/project_config_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "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/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/snapshot" "github.com/braydonk/yaml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/project/project_manager.go b/cli/azd/pkg/project/project_manager.go index e939f3da5f9..75ef84a2e62 100644 --- a/cli/azd/pkg/project/project_manager.go +++ b/cli/azd/pkg/project/project_manager.go @@ -9,11 +9,11 @@ import ( "fmt" "os" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/tools" ) const ( diff --git a/cli/azd/pkg/project/project_test.go b/cli/azd/pkg/project/project_test.go index b2f3cc964d0..ca9bd933f25 100644 --- a/cli/azd/pkg/project/project_test.go +++ b/cli/azd/pkg/project/project_test.go @@ -11,17 +11,17 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "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/mocks/mockarmresources" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockarmresources" + "github.com/azure/azure-dev/test/mocks/mockazapi" + "github.com/azure/azure-dev/test/snapshot" "github.com/braydonk/yaml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/project/project_utils.go b/cli/azd/pkg/project/project_utils.go index 67e6a83bcf9..30a319d4b32 100644 --- a/cli/azd/pkg/project/project_utils.go +++ b/cli/azd/pkg/project/project_utils.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/pkg/rzip" + "github.com/azure/azure-dev/pkg/rzip" "github.com/denormal/go-gitignore" ) diff --git a/cli/azd/pkg/project/resource_manager.go b/cli/azd/pkg/project/resource_manager.go index 8ca8a2cdbf7..2f7438b568a 100644 --- a/cli/azd/pkg/project/resource_manager.go +++ b/cli/azd/pkg/project/resource_manager.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/azureutil" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/azureutil" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/osutil" ) // ResourceManager provides a layer to query for Azure resource for azd project and services diff --git a/cli/azd/pkg/project/resource_manager_test.go b/cli/azd/pkg/project/resource_manager_test.go index d7f30e3a91f..14616b13527 100644 --- a/cli/azd/pkg/project/resource_manager_test.go +++ b/cli/azd/pkg/project/resource_manager_test.go @@ -12,12 +12,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "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/mocks/mockazapi" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/scaffold_gen.go b/cli/azd/pkg/project/scaffold_gen.go index 002a672b493..9b93e360fbc 100644 --- a/cli/azd/pkg/project/scaffold_gen.go +++ b/cli/azd/pkg/project/scaffold_gen.go @@ -13,11 +13,11 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" "github.com/psanford/memfs" ) diff --git a/cli/azd/pkg/project/scaffold_gen_test.go b/cli/azd/pkg/project/scaffold_gen_test.go index 85cf4125075..d23309ab904 100644 --- a/cli/azd/pkg/project/scaffold_gen_test.go +++ b/cli/azd/pkg/project/scaffold_gen_test.go @@ -6,7 +6,7 @@ package project import ( "testing" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" + "github.com/azure/azure-dev/internal/scaffold" ) func Test_genBicepParamsFromEnvSubst(t *testing.T) { diff --git a/cli/azd/pkg/project/service_config.go b/cli/azd/pkg/project/service_config.go index 16c0791f3e1..84604449ed7 100644 --- a/cli/azd/pkg/project/service_config.go +++ b/cli/azd/pkg/project/service_config.go @@ -6,10 +6,10 @@ package project import ( "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/osutil" ) type ServiceConfig struct { diff --git a/cli/azd/pkg/project/service_config_test.go b/cli/azd/pkg/project/service_config_test.go index 03496bfbbdb..90d825f698b 100644 --- a/cli/azd/pkg/project/service_config_test.go +++ b/cli/azd/pkg/project/service_config_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/service_manager.go b/cli/azd/pkg/project/service_manager.go index 15fb5fc1bad..80afcd482bf 100644 --- a/cli/azd/pkg/project/service_manager.go +++ b/cli/azd/pkg/project/service_manager.go @@ -14,16 +14,16 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/swa" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/swa" ) const ( diff --git a/cli/azd/pkg/project/service_manager_test.go b/cli/azd/pkg/project/service_manager_test.go index 4551973b062..765fba024ed 100644 --- a/cli/azd/pkg/project/service_manager_test.go +++ b/cli/azd/pkg/project/service_manager_test.go @@ -11,20 +11,20 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockarmresources" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockarmresources" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/service_target.go b/cli/azd/pkg/project/service_target.go index 2ed744f289d..ea553fb2511 100644 --- a/cli/azd/pkg/project/service_target.go +++ b/cli/azd/pkg/project/service_target.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) type ServiceTargetKind string diff --git a/cli/azd/pkg/project/service_target_ai_endpoint.go b/cli/azd/pkg/project/service_target_ai_endpoint.go index 349a0ba2694..49655c6f86f 100644 --- a/cli/azd/pkg/project/service_target_ai_endpoint.go +++ b/cli/azd/pkg/project/service_target_ai_endpoint.go @@ -8,11 +8,11 @@ import ( "fmt" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/ai" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/ai" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) // aiEndpointTarget is a ServiceTarget implementation for deploying to Azure ML online endpoints diff --git a/cli/azd/pkg/project/service_target_ai_endpoint_test.go b/cli/azd/pkg/project/service_target_ai_endpoint_test.go index 64c4faf5869..3b070044742 100644 --- a/cli/azd/pkg/project/service_target_ai_endpoint_test.go +++ b/cli/azd/pkg/project/service_target_ai_endpoint_test.go @@ -11,13 +11,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/pkg/ai" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" + "github.com/azure/azure-dev/pkg/ai" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockenv" "github.com/google/uuid" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/project/service_target_aks.go b/cli/azd/pkg/project/service_target_aks.go index cb1ec930283..4a128ee4e19 100644 --- a/cli/azd/pkg/project/service_target_aks.go +++ b/cli/azd/pkg/project/service_target_aks.go @@ -14,21 +14,21 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/convert" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/ext" - "github.com/azure/azure-dev/cli/azd/pkg/helm" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/kubelogin" - "github.com/azure/azure-dev/cli/azd/pkg/kustomize" - "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/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/kubectl" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/convert" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/ext" + "github.com/azure/azure-dev/pkg/helm" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/kubelogin" + "github.com/azure/azure-dev/pkg/kustomize" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/kubectl" "github.com/sethvargo/go-retry" ) diff --git a/cli/azd/pkg/project/service_target_aks_test.go b/cli/azd/pkg/project/service_target_aks_test.go index 0c94f8fa0b3..7463621d116 100644 --- a/cli/azd/pkg/project/service_target_aks_test.go +++ b/cli/azd/pkg/project/service_target_aks_test.go @@ -18,27 +18,27 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v2" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/containerregistry" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/helm" - "github.com/azure/azure-dev/cli/azd/pkg/kubelogin" - "github.com/azure/azure-dev/cli/azd/pkg/kustomize" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/pkg/tools/kubectl" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/containerregistry" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/helm" + "github.com/azure/azure-dev/pkg/kubelogin" + "github.com/azure/azure-dev/pkg/kustomize" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/pkg/tools/kubectl" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks/mockazsdk" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/ostest" "github.com/benbjohnson/clock" "github.com/braydonk/yaml" "github.com/stretchr/testify/mock" diff --git a/cli/azd/pkg/project/service_target_appservice.go b/cli/azd/pkg/project/service_target_appservice.go index 1701dca376b..db6443b0b58 100644 --- a/cli/azd/pkg/project/service_target_appservice.go +++ b/cli/azd/pkg/project/service_target_appservice.go @@ -9,11 +9,11 @@ import ( "os" "strings" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) type appServiceTarget struct { diff --git a/cli/azd/pkg/project/service_target_appservice_test.go b/cli/azd/pkg/project/service_target_appservice_test.go index 65a438217c6..298eebca101 100644 --- a/cli/azd/pkg/project/service_target_appservice_test.go +++ b/cli/azd/pkg/project/service_target_appservice_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/service_target_containerapp.go b/cli/azd/pkg/project/service_target_containerapp.go index 9ba14ff8910..b36eaf66e6d 100644 --- a/cli/azd/pkg/project/service_target_containerapp.go +++ b/cli/azd/pkg/project/service_target_containerapp.go @@ -12,18 +12,18 @@ import ( "path/filepath" "strconv" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/containerapps" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/containerapps" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra/provisioning" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/bicep" + "github.com/azure/azure-dev/pkg/tools/docker" ) type containerAppTarget struct { diff --git a/cli/azd/pkg/project/service_target_containerapp_test.go b/cli/azd/pkg/project/service_target_containerapp_test.go index 08915efd730..0c3afd32e02 100644 --- a/cli/azd/pkg/project/service_target_containerapp_test.go +++ b/cli/azd/pkg/project/service_target_containerapp_test.go @@ -13,22 +13,22 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v3" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/containerapps" - "github.com/azure/azure-dev/cli/azd/pkg/containerregistry" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/tools/docker" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockenv" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/containerapps" + "github.com/azure/azure-dev/pkg/containerregistry" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/tools/docker" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks/mockazapi" + "github.com/azure/azure-dev/test/mocks/mockazsdk" + "github.com/azure/azure-dev/test/mocks/mockenv" + "github.com/azure/azure-dev/test/ostest" "github.com/benbjohnson/clock" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/cli/azd/pkg/project/service_target_dotnet_containerapp.go b/cli/azd/pkg/project/service_target_dotnet_containerapp.go index 249be97e389..37d7240abca 100644 --- a/cli/azd/pkg/project/service_target_dotnet_containerapp.go +++ b/cli/azd/pkg/project/service_target_dotnet_containerapp.go @@ -17,22 +17,22 @@ import ( "text/template" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/internal/scaffold" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/apphost" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/containerapps" - "github.com/azure/azure-dev/cli/azd/pkg/cosmosdb" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/keyvault" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/sqldb" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/internal/scaffold" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/apphost" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/containerapps" + "github.com/azure/azure-dev/pkg/cosmosdb" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/keyvault" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/sqldb" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/bicep" + "github.com/azure/azure-dev/pkg/tools/dotnet" "github.com/drone/envsubst" ) diff --git a/cli/azd/pkg/project/service_target_dotnet_containerapp_test.go b/cli/azd/pkg/project/service_target_dotnet_containerapp_test.go index 4729a9b3163..99609fecb4d 100644 --- a/cli/azd/pkg/project/service_target_dotnet_containerapp_test.go +++ b/cli/azd/pkg/project/service_target_dotnet_containerapp_test.go @@ -8,7 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" + "github.com/azure/azure-dev/pkg/azapi" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/service_target_external.go b/cli/azd/pkg/project/service_target_external.go index 4a33b50f3ec..b7be8e48fd4 100644 --- a/cli/azd/pkg/project/service_target_external.go +++ b/cli/azd/pkg/project/service_target_external.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azdext" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/extensions" - "github.com/azure/azure-dev/cli/azd/pkg/grpcbroker" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/prompt" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azdext" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/extensions" + "github.com/azure/azure-dev/pkg/grpcbroker" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/prompt" + "github.com/azure/azure-dev/pkg/tools" "github.com/google/uuid" ) diff --git a/cli/azd/pkg/project/service_target_functionapp.go b/cli/azd/pkg/project/service_target_functionapp.go index 920d0586770..fce907e0575 100644 --- a/cli/azd/pkg/project/service_target_functionapp.go +++ b/cli/azd/pkg/project/service_target_functionapp.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) // functionAppTarget specifies an Azure Function to deploy to. diff --git a/cli/azd/pkg/project/service_target_functionapp_test.go b/cli/azd/pkg/project/service_target_functionapp_test.go index 81669d550c6..7164bd8b889 100644 --- a/cli/azd/pkg/project/service_target_functionapp_test.go +++ b/cli/azd/pkg/project/service_target_functionapp_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/service_target_springapp.go b/cli/azd/pkg/project/service_target_springapp.go index 89497ca3cad..37b3014f530 100644 --- a/cli/azd/pkg/project/service_target_springapp.go +++ b/cli/azd/pkg/project/service_target_springapp.go @@ -10,11 +10,11 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" ) const ( diff --git a/cli/azd/pkg/project/service_target_springapp_test.go b/cli/azd/pkg/project/service_target_springapp_test.go index a79060449cc..72f4523a2eb 100644 --- a/cli/azd/pkg/project/service_target_springapp_test.go +++ b/cli/azd/pkg/project/service_target_springapp_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/project/service_target_staticwebapp.go b/cli/azd/pkg/project/service_target_staticwebapp.go index 8e6af8197f9..66a0b28f60d 100644 --- a/cli/azd/pkg/project/service_target_staticwebapp.go +++ b/cli/azd/pkg/project/service_target_staticwebapp.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/internal/mapper" - "github.com/azure/azure-dev/cli/azd/pkg/async" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/swa" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/internal/mapper" + "github.com/azure/azure-dev/pkg/async" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/swa" ) // TODO: Enhance for multi-environment support diff --git a/cli/azd/pkg/project/service_target_staticwebapp_test.go b/cli/azd/pkg/project/service_target_staticwebapp_test.go index cda46d14669..99314461239 100644 --- a/cli/azd/pkg/project/service_target_staticwebapp_test.go +++ b/cli/azd/pkg/project/service_target_staticwebapp_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/environment" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/prompt/azure_context_test.go b/cli/azd/pkg/prompt/azure_context_test.go index 741480b53b9..d255a8f2677 100644 --- a/cli/azd/pkg/prompt/azure_context_test.go +++ b/cli/azd/pkg/prompt/azure_context_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azapi" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/prompt/azure_resource_list_test.go b/cli/azd/pkg/prompt/azure_resource_list_test.go index 7096c4d20b5..d048adb8f46 100644 --- a/cli/azd/pkg/prompt/azure_resource_list_test.go +++ b/cli/azd/pkg/prompt/azure_resource_list_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/prompt/prompt_models.go b/cli/azd/pkg/prompt/prompt_models.go index 7e27d6eba5e..3fac45c9c98 100644 --- a/cli/azd/pkg/prompt/prompt_models.go +++ b/cli/azd/pkg/prompt/prompt_models.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" + "github.com/azure/azure-dev/pkg/azapi" ) // Azure Scope contains the high level metadata about an Azure deployment. diff --git a/cli/azd/pkg/prompt/prompt_service.go b/cli/azd/pkg/prompt/prompt_service.go index 6c6c87095e7..624830f43c7 100644 --- a/cli/azd/pkg/prompt/prompt_service.go +++ b/cli/azd/pkg/prompt/prompt_service.go @@ -14,13 +14,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux" ) var ( diff --git a/cli/azd/pkg/prompt/prompt_service_test.go b/cli/azd/pkg/prompt/prompt_service_test.go index 4448cd33e5f..caceeeea3d3 100644 --- a/cli/azd/pkg/prompt/prompt_service_test.go +++ b/cli/azd/pkg/prompt/prompt_service_test.go @@ -6,13 +6,13 @@ package prompt import ( "testing" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockauth" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockazapi" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/mocks/mockauth" + "github.com/azure/azure-dev/test/mocks/mockazapi" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/prompt/prompter.go b/cli/azd/pkg/prompt/prompter.go index 3baa83c8eb0..674b73b54f7 100644 --- a/cli/azd/pkg/prompt/prompter.go +++ b/cli/azd/pkg/prompt/prompter.go @@ -14,14 +14,14 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/azureutil" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/stringutil" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/azureutil" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/stringutil" ) type LocationFilterPredicate func(loc account.Location) bool diff --git a/cli/azd/pkg/prompt/prompter_test.go b/cli/azd/pkg/prompt/prompter_test.go index 93882531949..cf8ec7f00f0 100644 --- a/cli/azd/pkg/prompt/prompter_test.go +++ b/cli/azd/pkg/prompt/prompter_test.go @@ -7,12 +7,12 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/account" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" + "github.com/azure/azure-dev/pkg/account" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/rzip/rzip_test.go b/cli/azd/pkg/rzip/rzip_test.go index 537a8d63186..6ef7372f319 100644 --- a/cli/azd/pkg/rzip/rzip_test.go +++ b/cli/azd/pkg/rzip/rzip_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/rzip" + "github.com/azure/azure-dev/pkg/rzip" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/sqldb/sqldb.go b/cli/azd/pkg/sqldb/sqldb.go index c5c6ea0ec83..7d4707da654 100644 --- a/cli/azd/pkg/sqldb/sqldb.go +++ b/cli/azd/pkg/sqldb/sqldb.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/sql/armsql/v2" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) // SqlDbService is the interface for the SqlDbService diff --git a/cli/azd/pkg/templates/awesome_source.go b/cli/azd/pkg/templates/awesome_source.go index 70b9251d9b6..248a286edeb 100644 --- a/cli/azd/pkg/templates/awesome_source.go +++ b/cli/azd/pkg/templates/awesome_source.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" - "github.com/azure/azure-dev/cli/azd/pkg/github" + "github.com/azure/azure-dev/pkg/github" ) type awesomeAzdTemplate struct { diff --git a/cli/azd/pkg/templates/awesome_source_test.go b/cli/azd/pkg/templates/awesome_source_test.go index 307cad7e491..e7fcb0732a2 100644 --- a/cli/azd/pkg/templates/awesome_source_test.go +++ b/cli/azd/pkg/templates/awesome_source_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/templates/file_source.go b/cli/azd/pkg/templates/file_source.go index 26989df64a7..438c71e85cf 100644 --- a/cli/azd/pkg/templates/file_source.go +++ b/cli/azd/pkg/templates/file_source.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/config" + "github.com/azure/azure-dev/pkg/config" ) // newFileTemplateSource creates a new template source from a file. diff --git a/cli/azd/pkg/templates/file_source_test.go b/cli/azd/pkg/templates/file_source_test.go index 036c10f5433..a60cc295881 100644 --- a/cli/azd/pkg/templates/file_source_test.go +++ b/cli/azd/pkg/templates/file_source_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/osutil" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/templates/gh_source.go b/cli/azd/pkg/templates/gh_source.go index e268c6dab34..ff94dcc2df3 100644 --- a/cli/azd/pkg/templates/gh_source.go +++ b/cli/azd/pkg/templates/gh_source.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/tools/github" ) // newGhTemplateSource creates a new template source from a Github repository. diff --git a/cli/azd/pkg/templates/gh_source_test.go b/cli/azd/pkg/templates/gh_source_test.go index 326b56dec33..a645d2ae821 100644 --- a/cli/azd/pkg/templates/gh_source_test.go +++ b/cli/azd/pkg/templates/gh_source_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools/github" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/templates/path.go b/cli/azd/pkg/templates/path.go index 3bf77e70bfb..5c2b54c4ecb 100644 --- a/cli/azd/pkg/templates/path.go +++ b/cli/azd/pkg/templates/path.go @@ -8,7 +8,7 @@ import ( "log" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) // Absolute returns an absolute template path, given a possibly relative template path. An absolute path also corresponds to diff --git a/cli/azd/pkg/templates/source_manager.go b/cli/azd/pkg/templates/source_manager.go index e66bee3dd49..ca926d171dc 100644 --- a/cli/azd/pkg/templates/source_manager.go +++ b/cli/azd/pkg/templates/source_manager.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" - "github.com/azure/azure-dev/cli/azd/resources" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/pkg/tools/github" + "github.com/azure/azure-dev/resources" ) const baseConfigKey string = "template.sources" diff --git a/cli/azd/pkg/templates/source_manager_test.go b/cli/azd/pkg/templates/source_manager_test.go index e09acbb3c2c..6f3186e7b8d 100644 --- a/cli/azd/pkg/templates/source_manager_test.go +++ b/cli/azd/pkg/templates/source_manager_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools/github" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/templates/template.go b/cli/azd/pkg/templates/template.go index 655e6889feb..8b855db5cc7 100644 --- a/cli/azd/pkg/templates/template.go +++ b/cli/azd/pkg/templates/template.go @@ -8,7 +8,7 @@ import ( "strings" "text/tabwriter" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" ) type Template struct { diff --git a/cli/azd/pkg/templates/template_manager.go b/cli/azd/pkg/templates/template_manager.go index d7596b232cd..47331fcbc20 100644 --- a/cli/azd/pkg/templates/template_manager.go +++ b/cli/azd/pkg/templates/template_manager.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/input" ) var ( diff --git a/cli/azd/pkg/templates/template_manager_test.go b/cli/azd/pkg/templates/template_manager_test.go index 2d539bc086d..c3c789284f0 100644 --- a/cli/azd/pkg/templates/template_manager_test.go +++ b/cli/azd/pkg/templates/template_manager_test.go @@ -9,9 +9,9 @@ import ( "net/http" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/resources" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/resources" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/templates/url_source_test.go b/cli/azd/pkg/templates/url_source_test.go index 52368c1bcb8..26c9b4a095c 100644 --- a/cli/azd/pkg/templates/url_source_test.go +++ b/cli/azd/pkg/templates/url_source_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/az/az.go b/cli/azd/pkg/tools/az/az.go index e66380dcc07..665926a9943 100644 --- a/cli/azd/pkg/tools/az/az.go +++ b/cli/azd/pkg/tools/az/az.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" ) // NewCli creates a new AzCli instance with the provided command runner. diff --git a/cli/azd/pkg/tools/bash/bash.go b/cli/azd/pkg/tools/bash/bash.go index dcec5c98076..213c6abbe61 100644 --- a/cli/azd/pkg/tools/bash/bash.go +++ b/cli/azd/pkg/tools/bash/bash.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" ) // Creates a new BashScript command runner diff --git a/cli/azd/pkg/tools/bash/bash_test.go b/cli/azd/pkg/tools/bash/bash_test.go index ca93d5d84d2..125375a472a 100644 --- a/cli/azd/pkg/tools/bash/bash_test.go +++ b/cli/azd/pkg/tools/bash/bash_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/bicep/bicep.go b/cli/azd/pkg/tools/bicep/bicep.go index 309566fbb7f..3065f68a02e 100644 --- a/cli/azd/pkg/tools/bicep/bicep.go +++ b/cli/azd/pkg/tools/bicep/bicep.go @@ -15,11 +15,11 @@ import ( "runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/bicep/bicep_test.go b/cli/azd/pkg/tools/bicep/bicep_test.go index fc2c7bece05..a7bc34f2b33 100644 --- a/cli/azd/pkg/tools/bicep/bicep_test.go +++ b/cli/azd/pkg/tools/bicep/bicep_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/mocks/mockinput" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/docker/docker.go b/cli/azd/pkg/tools/docker/docker.go index e06763385b9..f3492dbea31 100644 --- a/cli/azd/pkg/tools/docker/docker.go +++ b/cli/azd/pkg/tools/docker/docker.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/docker/docker_test.go b/cli/azd/pkg/tools/docker/docker_test.go index 34922c78183..e48ec73e9f3 100644 --- a/cli/azd/pkg/tools/docker/docker_test.go +++ b/cli/azd/pkg/tools/docker/docker_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/dotnet/aspire_detection_test.go b/cli/azd/pkg/tools/dotnet/aspire_detection_test.go index 06afe612dc7..75127368393 100644 --- a/cli/azd/pkg/tools/dotnet/aspire_detection_test.go +++ b/cli/azd/pkg/tools/dotnet/aspire_detection_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "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/mocks/mockexec" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockexec" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/dotnet/dotnet.go b/cli/azd/pkg/tools/dotnet/dotnet.go index acc7c5f428f..edb9f67e577 100644 --- a/cli/azd/pkg/tools/dotnet/dotnet.go +++ b/cli/azd/pkg/tools/dotnet/dotnet.go @@ -14,10 +14,10 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/dotnet/dotnet_test.go b/cli/azd/pkg/tools/dotnet/dotnet_test.go index 294b69b5ded..b711a29e229 100644 --- a/cli/azd/pkg/tools/dotnet/dotnet_test.go +++ b/cli/azd/pkg/tools/dotnet/dotnet_test.go @@ -8,7 +8,7 @@ import ( _ "embed" "testing" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/git/git.go b/cli/azd/pkg/tools/git/git.go index 46780ab9769..a7b6ff521d8 100644 --- a/cli/azd/pkg/tools/git/git.go +++ b/cli/azd/pkg/tools/git/git.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/pkg/tools/github" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/pkg/tools/github" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/github/github.go b/cli/azd/pkg/tools/github/github.go index 49040ac26d4..066a5db2296 100644 --- a/cli/azd/pkg/tools/github/github.go +++ b/cli/azd/pkg/tools/github/github.go @@ -21,11 +21,11 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/github/github_test.go b/cli/azd/pkg/tools/github/github_test.go index 2409e88da6c..2011d99e5fa 100644 --- a/cli/azd/pkg/tools/github/github_test.go +++ b/cli/azd/pkg/tools/github/github_test.go @@ -17,11 +17,11 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "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/mocks/mockinput" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/blang/semver/v4" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/javac/javac.go b/cli/azd/pkg/tools/javac/javac.go index 953bbe5db55..7021ceeb1e8 100644 --- a/cli/azd/pkg/tools/javac/javac.go +++ b/cli/azd/pkg/tools/javac/javac.go @@ -12,8 +12,8 @@ import ( osexec "os/exec" "path/filepath" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/javac/javac_test.go b/cli/azd/pkg/tools/javac/javac_test.go index 483d33b4e13..e1067e7030e 100644 --- a/cli/azd/pkg/tools/javac/javac_test.go +++ b/cli/azd/pkg/tools/javac/javac_test.go @@ -12,9 +12,9 @@ import ( "runtime" "testing" - azdexec "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockexec" - "github.com/azure/azure-dev/cli/azd/test/ostest" + azdexec "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks/mockexec" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/kubectl/kube_config.go b/cli/azd/pkg/tools/kubectl/kube_config.go index a17ae4761e4..96e20425f44 100644 --- a/cli/azd/pkg/tools/kubectl/kube_config.go +++ b/cli/azd/pkg/tools/kubectl/kube_config.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" + "github.com/azure/azure-dev/pkg/osutil" "github.com/braydonk/yaml" ) diff --git a/cli/azd/pkg/tools/kubectl/kube_config_test.go b/cli/azd/pkg/tools/kubectl/kube_config_test.go index 90b91191fd0..3748555729c 100644 --- a/cli/azd/pkg/tools/kubectl/kube_config_test.go +++ b/cli/azd/pkg/tools/kubectl/kube_config_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/kubectl/kubectl.go b/cli/azd/pkg/tools/kubectl/kubectl.go index 8d2938d0d95..70d08b81e27 100644 --- a/cli/azd/pkg/tools/kubectl/kubectl.go +++ b/cli/azd/pkg/tools/kubectl/kubectl.go @@ -13,8 +13,8 @@ import ( "strings" "text/template" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" ) var _ tools.ExternalTool = (*Cli)(nil) diff --git a/cli/azd/pkg/tools/kubectl/kubectl_test.go b/cli/azd/pkg/tools/kubectl/kubectl_test.go index 5b971ba3083..13ef7e789b8 100644 --- a/cli/azd/pkg/tools/kubectl/kubectl_test.go +++ b/cli/azd/pkg/tools/kubectl/kubectl_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "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/ostest" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/maven/maven.go b/cli/azd/pkg/tools/maven/maven.go index 7283db5426f..b7fb5a72939 100644 --- a/cli/azd/pkg/tools/maven/maven.go +++ b/cli/azd/pkg/tools/maven/maven.go @@ -17,8 +17,8 @@ import ( osexec "os/exec" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" ) var _ tools.ExternalTool = (*Cli)(nil) diff --git a/cli/azd/pkg/tools/maven/maven_test.go b/cli/azd/pkg/tools/maven/maven_test.go index b1a7b068557..2ca4754da49 100644 --- a/cli/azd/pkg/tools/maven/maven_test.go +++ b/cli/azd/pkg/tools/maven/maven_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/MakeNowJust/heredoc/v2" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockexec" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks/mockexec" + "github.com/azure/azure-dev/test/ostest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/npm/npm.go b/cli/azd/pkg/tools/npm/npm.go index c7166b7db04..9d1d77c0af2 100644 --- a/cli/azd/pkg/tools/npm/npm.go +++ b/cli/azd/pkg/tools/npm/npm.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/pack/pack.go b/cli/azd/pkg/tools/pack/pack.go index 5c82bbcdf87..34784999e10 100644 --- a/cli/azd/pkg/tools/pack/pack.go +++ b/cli/azd/pkg/tools/pack/pack.go @@ -21,11 +21,11 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/pack/pack_test.go b/cli/azd/pkg/tools/pack/pack_test.go index 84b8ef9aebd..5b0ce1570a2 100644 --- a/cli/azd/pkg/tools/pack/pack_test.go +++ b/cli/azd/pkg/tools/pack/pack_test.go @@ -15,10 +15,10 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "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/mocks/mockzip" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockzip" "github.com/blang/semver/v4" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/powershell/powershell.go b/cli/azd/pkg/tools/powershell/powershell.go index 718b6c7ce7b..1cb561f0e8a 100644 --- a/cli/azd/pkg/tools/powershell/powershell.go +++ b/cli/azd/pkg/tools/powershell/powershell.go @@ -9,10 +9,10 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/tools" ) // Creates a new PowershellScript command runner diff --git a/cli/azd/pkg/tools/powershell/powershell_test.go b/cli/azd/pkg/tools/powershell/powershell_test.go index 09279017689..10e7e042f53 100644 --- a/cli/azd/pkg/tools/powershell/powershell_test.go +++ b/cli/azd/pkg/tools/powershell/powershell_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/python/python.go b/cli/azd/pkg/tools/python/python.go index 43a9b5c16a2..f62c5b80296 100644 --- a/cli/azd/pkg/tools/python/python.go +++ b/cli/azd/pkg/tools/python/python.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/python/python_test.go b/cli/azd/pkg/tools/python/python_test.go index d74f30bb750..509616ef79d 100644 --- a/cli/azd/pkg/tools/python/python_test.go +++ b/cli/azd/pkg/tools/python/python_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/script.go b/cli/azd/pkg/tools/script.go index 2526b78bdf3..81c222b0a26 100644 --- a/cli/azd/pkg/tools/script.go +++ b/cli/azd/pkg/tools/script.go @@ -7,7 +7,7 @@ import ( "context" "io" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" ) // ExecOptions provide configuration for how scripts are executed diff --git a/cli/azd/pkg/tools/swa/swa.go b/cli/azd/pkg/tools/swa/swa.go index 9ef6951e9f5..8396c190403 100644 --- a/cli/azd/pkg/tools/swa/swa.go +++ b/cli/azd/pkg/tools/swa/swa.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" ) // swaCliPackage is the npm package (including the version version) we execute with npx to run the SWA CLI. diff --git a/cli/azd/pkg/tools/swa/swa_test.go b/cli/azd/pkg/tools/swa/swa_test.go index 80c96727ed4..1f445304909 100644 --- a/cli/azd/pkg/tools/swa/swa_test.go +++ b/cli/azd/pkg/tools/swa/swa_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/terraform/terraform.go b/cli/azd/pkg/tools/terraform/terraform.go index 02bd09b7c84..fcb60914b0a 100644 --- a/cli/azd/pkg/tools/terraform/terraform.go +++ b/cli/azd/pkg/tools/terraform/terraform.go @@ -9,8 +9,8 @@ import ( "fmt" "log" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/tools" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/tools" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/tools/terraform/terraform_test.go b/cli/azd/pkg/tools/terraform/terraform_test.go index 9d28ed8a34c..e19951e2211 100644 --- a/cli/azd/pkg/tools/terraform/terraform_test.go +++ b/cli/azd/pkg/tools/terraform/terraform_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/pkg/tools/tool.go b/cli/azd/pkg/tools/tool.go index 98d5b5b0b3e..bb26d911363 100644 --- a/cli/azd/pkg/tools/tool.go +++ b/cli/azd/pkg/tools/tool.go @@ -9,7 +9,7 @@ import ( "regexp" "strconv" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" "github.com/blang/semver/v4" ) diff --git a/cli/azd/pkg/ux/confirm.go b/cli/azd/pkg/ux/confirm.go index 5b6ab4b7713..67a1934c6f2 100644 --- a/cli/azd/pkg/ux/confirm.go +++ b/cli/azd/pkg/ux/confirm.go @@ -12,8 +12,8 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux/internal" "dario.cat/mergo" "github.com/eiannone/keyboard" diff --git a/cli/azd/pkg/ux/multi_select.go b/cli/azd/pkg/ux/multi_select.go index c238f4f2454..2d4b0e69e48 100644 --- a/cli/azd/pkg/ux/multi_select.go +++ b/cli/azd/pkg/ux/multi_select.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux/internal" "dario.cat/mergo" "github.com/eiannone/keyboard" diff --git a/cli/azd/pkg/ux/printer.go b/cli/azd/pkg/ux/printer.go index b9331cb1c3b..bfdff5b285f 100644 --- a/cli/azd/pkg/ux/printer.go +++ b/cli/azd/pkg/ux/printer.go @@ -14,7 +14,7 @@ import ( "sync" "syscall" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/pkg/ux/internal" "github.com/nathan-fiscaletti/consolesize-go" ) diff --git a/cli/azd/pkg/ux/prompt.go b/cli/azd/pkg/ux/prompt.go index 89b4b6bfe8a..bce35ba66ad 100644 --- a/cli/azd/pkg/ux/prompt.go +++ b/cli/azd/pkg/ux/prompt.go @@ -9,8 +9,8 @@ import ( "log" "os" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux/internal" "dario.cat/mergo" "github.com/eiannone/keyboard" diff --git a/cli/azd/pkg/ux/select.go b/cli/azd/pkg/ux/select.go index 344378c1258..b8a6ed6f9d7 100644 --- a/cli/azd/pkg/ux/select.go +++ b/cli/azd/pkg/ux/select.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux/internal" "dario.cat/mergo" "github.com/eiannone/keyboard" diff --git a/cli/azd/pkg/ux/spinner.go b/cli/azd/pkg/ux/spinner.go index 9237f514349..a3c1c00fb29 100644 --- a/cli/azd/pkg/ux/spinner.go +++ b/cli/azd/pkg/ux/spinner.go @@ -10,8 +10,8 @@ import ( "time" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/ux/internal" ) // Spinner is a component for displaying a spinner. diff --git a/cli/azd/pkg/ux/task_list.go b/cli/azd/pkg/ux/task_list.go index 23a0115a73c..23a36a1ee7d 100644 --- a/cli/azd/pkg/ux/task_list.go +++ b/cli/azd/pkg/ux/task_list.go @@ -15,8 +15,8 @@ import ( "time" "dario.cat/mergo" - "github.com/azure/azure-dev/cli/azd/pkg/common" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/common" + "github.com/azure/azure-dev/pkg/output" ) // TaskListOptions represents the options for the TaskList component. diff --git a/cli/azd/pkg/ux/ux.go b/cli/azd/pkg/ux/ux.go index 6a176d6db6f..6617dba5890 100644 --- a/cli/azd/pkg/ux/ux.go +++ b/cli/azd/pkg/ux/ux.go @@ -11,8 +11,8 @@ import ( "strings" "unicode/utf8" - "github.com/azure/azure-dev/cli/azd/internal/terminal" - "github.com/azure/azure-dev/cli/azd/pkg/ux/internal" + "github.com/azure/azure-dev/internal/terminal" + "github.com/azure/azure-dev/pkg/ux/internal" "github.com/fatih/color" "github.com/nathan-fiscaletti/consolesize-go" ) diff --git a/cli/azd/pkg/watch/watch.go b/cli/azd/pkg/watch/watch.go index 85a19057f81..207b88d074a 100644 --- a/cli/azd/pkg/watch/watch.go +++ b/cli/azd/pkg/watch/watch.go @@ -11,7 +11,7 @@ import ( "path/filepath" "sync" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" "github.com/bmatcuk/doublestar/v4" "github.com/fatih/color" "github.com/fsnotify/fsnotify" diff --git a/cli/azd/pkg/workflow/runner.go b/cli/azd/pkg/workflow/runner.go index 51a9fc1fc9c..8f7d00a4c0f 100644 --- a/cli/azd/pkg/workflow/runner.go +++ b/cli/azd/pkg/workflow/runner.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/input" + "github.com/azure/azure-dev/pkg/input" ) // AzdCommandRunner abstracts the execution of an azd command given an set of arguments and context. diff --git a/cli/azd/test/azdcli/cli.go b/cli/azd/test/azdcli/cli.go index 55c7e51c10d..9c260bc10a1 100644 --- a/cli/azd/test/azdcli/cli.go +++ b/cli/azd/test/azdcli/cli.go @@ -30,12 +30,12 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/test/ostest" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/test/ostest" + "github.com/azure/azure-dev/test/recording" ) const ( diff --git a/cli/azd/test/azdcli/options.go b/cli/azd/test/azdcli/options.go index 2b4737d20fc..b3411881d24 100644 --- a/cli/azd/test/azdcli/options.go +++ b/cli/azd/test/azdcli/options.go @@ -3,7 +3,7 @@ package azdcli -import "github.com/azure/azure-dev/cli/azd/test/recording" +import "github.com/azure/azure-dev/test/recording" type option struct { Session *recording.Session diff --git a/cli/azd/test/cmdrecord/proxy/main.go b/cli/azd/test/cmdrecord/proxy/main.go index a8250e168ce..dbb174ebad3 100644 --- a/cli/azd/test/cmdrecord/proxy/main.go +++ b/cli/azd/test/cmdrecord/proxy/main.go @@ -15,7 +15,7 @@ import ( "strconv" "strings" - "github.com/azure/azure-dev/cli/azd/test/cmdrecord" + "github.com/azure/azure-dev/test/cmdrecord" "github.com/braydonk/yaml" "gopkg.in/dnaeon/go-vcr.v3/recorder" ) diff --git a/cli/azd/test/functional/aspire_test.go b/cli/azd/test/functional/aspire_test.go index 15b32d4d86e..9771748cead 100644 --- a/cli/azd/test/functional/aspire_test.go +++ b/cli/azd/test/functional/aspire_test.go @@ -13,15 +13,15 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azure" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/pkg/tools/bicep" - "github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" - "github.com/azure/azure-dev/cli/azd/test/recording" - "github.com/azure/azure-dev/cli/azd/test/snapshot" + "github.com/azure/azure-dev/pkg/azure" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/pkg/tools/bicep" + "github.com/azure/azure-dev/pkg/tools/dotnet" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/mocks/mockinput" + "github.com/azure/azure-dev/test/recording" + "github.com/azure/azure-dev/test/snapshot" "github.com/bradleyjkemp/cupaloy/v2" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/auth_test.go b/cli/azd/test/functional/auth_test.go index 19f667aa461..a966df1df91 100644 --- a/cli/azd/test/functional/auth_test.go +++ b/cli/azd/test/functional/auth_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/assert" ) diff --git a/cli/azd/test/functional/cli_test.go b/cli/azd/test/functional/cli_test.go index b88f9965dd9..1bd2c8fb34a 100644 --- a/cli/azd/test/functional/cli_test.go +++ b/cli/azd/test/functional/cli_test.go @@ -27,21 +27,21 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/azure/azure-dev/cli/azd/internal/telemetry" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/devcenter" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/infra" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/internal/telemetry" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/devcenter" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/infra" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/mocks/mockaccount" + "github.com/azure/azure-dev/test/recording" "github.com/benbjohnson/clock" "github.com/joho/godotenv" "github.com/sethvargo/go-retry" diff --git a/cli/azd/test/functional/deploy_test.go b/cli/azd/test/functional/deploy_test.go index 98bd8d45fa3..e2744963ea0 100644 --- a/cli/azd/test/functional/deploy_test.go +++ b/cli/azd/test/functional/deploy_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/deployment_stacks_test.go b/cli/azd/test/functional/deployment_stacks_test.go index 47c2a40b936..c2c1db0d410 100644 --- a/cli/azd/test/functional/deployment_stacks_test.go +++ b/cli/azd/test/functional/deployment_stacks_test.go @@ -15,8 +15,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/recording" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/env_refresh_test.go b/cli/azd/test/functional/env_refresh_test.go index 3a62429b387..9338d28e3ca 100644 --- a/cli/azd/test/functional/env_refresh_test.go +++ b/cli/azd/test/functional/env_refresh_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/recording" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/env_test.go b/cli/azd/test/functional/env_test.go index a9f8519a9ca..d88e9cb6516 100644 --- a/cli/azd/test/functional/env_test.go +++ b/cli/azd/test/functional/env_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/experiment_test.go b/cli/azd/test/functional/experiment_test.go index 77c84170bd3..b1b2174090c 100644 --- a/cli/azd/test/functional/experiment_test.go +++ b/cli/azd/test/functional/experiment_test.go @@ -15,8 +15,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/init_test.go b/cli/azd/test/functional/init_test.go index b284aabc9b7..b8beeeff38a 100644 --- a/cli/azd/test/functional/init_test.go +++ b/cli/azd/test/functional/init_test.go @@ -9,11 +9,11 @@ import ( "regexp" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/initialize_test.go b/cli/azd/test/functional/initialize_test.go index ce89b7f7013..fed7f822282 100644 --- a/cli/azd/test/functional/initialize_test.go +++ b/cli/azd/test/functional/initialize_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/cmd" - "github.com/azure/azure-dev/cli/azd/cmd/actions" - "github.com/azure/azure-dev/cli/azd/cmd/middleware" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/ostest" + "github.com/azure/azure-dev/cmd" + "github.com/azure/azure-dev/cmd/actions" + "github.com/azure/azure-dev/cmd/middleware" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/ostest" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/login_test.go b/cli/azd/test/functional/login_test.go index 4cf687ca76b..37396a55b03 100644 --- a/cli/azd/test/functional/login_test.go +++ b/cli/azd/test/functional/login_test.go @@ -8,8 +8,8 @@ import ( "encoding/json" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/mcp_test.go b/cli/azd/test/functional/mcp_test.go index cdff1bae826..cebe2e36f51 100644 --- a/cli/azd/test/functional/mcp_test.go +++ b/cli/azd/test/functional/mcp_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/test/azdcli" "github.com/mark3labs/mcp-go/client" "github.com/mark3labs/mcp-go/mcp" "github.com/stretchr/testify/assert" diff --git a/cli/azd/test/functional/package_test.go b/cli/azd/test/functional/package_test.go index 9b88904841a..c3772fdb1cb 100644 --- a/cli/azd/test/functional/package_test.go +++ b/cli/azd/test/functional/package_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/publish_test.go b/cli/azd/test/functional/publish_test.go index e983a4b792a..7830737826d 100644 --- a/cli/azd/test/functional/publish_test.go +++ b/cli/azd/test/functional/publish_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/recording" "github.com/joho/godotenv" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/remote_state_test.go b/cli/azd/test/functional/remote_state_test.go index 0740ff33ac5..85c68d93c0b 100644 --- a/cli/azd/test/functional/remote_state_test.go +++ b/cli/azd/test/functional/remote_state_test.go @@ -12,15 +12,15 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/pkg/auth" - "github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/tools/az" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/pkg/auth" + "github.com/azure/azure-dev/pkg/azsdk/storage" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/tools/az" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/recording" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/restore_test.go b/cli/azd/test/functional/restore_test.go index 476b36415de..85b8f7b7a16 100644 --- a/cli/azd/test/functional/restore_test.go +++ b/cli/azd/test/functional/restore_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/show_test.go b/cli/azd/test/functional/show_test.go index 1f5670ab010..aa86ca26c97 100644 --- a/cli/azd/test/functional/show_test.go +++ b/cli/azd/test/functional/show_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/test/azdcli" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/telemetry_test.go b/cli/azd/test/functional/telemetry_test.go index 92a4b68afe3..9c1f1e10e01 100644 --- a/cli/azd/test/functional/telemetry_test.go +++ b/cli/azd/test/functional/telemetry_test.go @@ -15,15 +15,15 @@ import ( "strings" "testing" - "github.com/azure/azure-dev/cli/azd/internal/tracing" - "github.com/azure/azure-dev/cli/azd/internal/tracing/fields" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/pkg/project" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/internal/tracing" + "github.com/azure/azure-dev/internal/tracing/fields" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/pkg/project" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/mocks" "github.com/google/uuid" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" diff --git a/cli/azd/test/functional/up_test.go b/cli/azd/test/functional/up_test.go index 70f1c048768..ff786daa0ae 100644 --- a/cli/azd/test/functional/up_test.go +++ b/cli/azd/test/functional/up_test.go @@ -19,12 +19,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/environment" - "github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/osutil" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/pkg/environment" + "github.com/azure/azure-dev/pkg/environment/azdcontext" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/osutil" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/recording" "github.com/joho/godotenv" "github.com/sethvargo/go-retry" "github.com/stretchr/testify/assert" diff --git a/cli/azd/test/functional/version_test.go b/cli/azd/test/functional/version_test.go index 34f5088bb21..05c54b989b1 100644 --- a/cli/azd/test/functional/version_test.go +++ b/cli/azd/test/functional/version_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/test/azdcli" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/test/azdcli" "github.com/blang/semver/v4" "github.com/stretchr/testify/require" ) diff --git a/cli/azd/test/functional/vs_server_test.go b/cli/azd/test/functional/vs_server_test.go index 8ab6aea7f99..d46d2b5f470 100644 --- a/cli/azd/test/functional/vs_server_test.go +++ b/cli/azd/test/functional/vs_server_test.go @@ -20,10 +20,10 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/pkg/contracts" - "github.com/azure/azure-dev/cli/azd/test/azdcli" - "github.com/azure/azure-dev/cli/azd/test/ostest" - "github.com/azure/azure-dev/cli/azd/test/recording" + "github.com/azure/azure-dev/pkg/contracts" + "github.com/azure/azure-dev/test/azdcli" + "github.com/azure/azure-dev/test/ostest" + "github.com/azure/azure-dev/test/recording" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" "go.lsp.dev/jsonrpc2" diff --git a/cli/azd/test/mocks/mock_context.go b/cli/azd/test/mocks/mock_context.go index 9078fe63e11..dd5ef012b80 100644 --- a/cli/azd/test/mocks/mock_context.go +++ b/cli/azd/test/mocks/mock_context.go @@ -9,16 +9,16 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/azure/azure-dev/cli/azd/internal" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/config" - "github.com/azure/azure-dev/cli/azd/pkg/exec" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/ioc" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockconfig" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockexec" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockinput" + "github.com/azure/azure-dev/internal" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/config" + "github.com/azure/azure-dev/pkg/exec" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/ioc" + "github.com/azure/azure-dev/test/mocks/mockconfig" + "github.com/azure/azure-dev/test/mocks/mockexec" + "github.com/azure/azure-dev/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks/mockinput" "github.com/benbjohnson/clock" ) diff --git a/cli/azd/test/mocks/mockaccount/mock_manager.go b/cli/azd/test/mocks/mockaccount/mock_manager.go index fcbf8e79a87..fe11f20c242 100644 --- a/cli/azd/test/mocks/mockaccount/mock_manager.go +++ b/cli/azd/test/mocks/mockaccount/mock_manager.go @@ -8,7 +8,7 @@ import ( "slices" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" ) type MockAccountManager struct { diff --git a/cli/azd/test/mocks/mockaccount/mock_subscriptions.go b/cli/azd/test/mocks/mockaccount/mock_subscriptions.go index 745ec7e024f..b11cd00216e 100644 --- a/cli/azd/test/mocks/mockaccount/mock_subscriptions.go +++ b/cli/azd/test/mocks/mockaccount/mock_subscriptions.go @@ -6,7 +6,7 @@ package mockaccount import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/account" + "github.com/azure/azure-dev/pkg/account" "github.com/stretchr/testify/mock" ) diff --git a/cli/azd/test/mocks/mockai/deployments.go b/cli/azd/test/mocks/mockai/deployments.go index 88c4c9c83d8..9dd57da9db2 100644 --- a/cli/azd/test/mocks/mockai/deployments.go +++ b/cli/azd/test/mocks/mockai/deployments.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func RegisterGetOnlineDeployment( diff --git a/cli/azd/test/mocks/mockai/endpoints.go b/cli/azd/test/mocks/mockai/endpoints.go index 7a94af195ff..c91cbf7e819 100644 --- a/cli/azd/test/mocks/mockai/endpoints.go +++ b/cli/azd/test/mocks/mockai/endpoints.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func RegisterGetOnlineEndpoint( diff --git a/cli/azd/test/mocks/mockai/environments.go b/cli/azd/test/mocks/mockai/environments.go index 5d33f894cbc..85173e192d6 100644 --- a/cli/azd/test/mocks/mockai/environments.go +++ b/cli/azd/test/mocks/mockai/environments.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func RegisterGetEnvironment( diff --git a/cli/azd/test/mocks/mockai/models.go b/cli/azd/test/mocks/mockai/models.go index 9bca8292080..19a5229d8a5 100644 --- a/cli/azd/test/mocks/mockai/models.go +++ b/cli/azd/test/mocks/mockai/models.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func RegisterGetModel(mockContext *mocks.MockContext, workspaceName string, modelName string, statusCode int) *http.Request { diff --git a/cli/azd/test/mocks/mockai/workspaces.go b/cli/azd/test/mocks/mockai/workspaces.go index 2a626d2ef43..1422ba65413 100644 --- a/cli/azd/test/mocks/mockai/workspaces.go +++ b/cli/azd/test/mocks/mockai/workspaces.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func RegisterGetWorkspaceMock(mockContext *mocks.MockContext, workspaceName string) *http.Request { diff --git a/cli/azd/test/mocks/mockarmresources/mockarmresources.go b/cli/azd/test/mocks/mockarmresources/mockarmresources.go index 7dde2292638..efe074aaf14 100644 --- a/cli/azd/test/mocks/mockarmresources/mockarmresources.go +++ b/cli/azd/test/mocks/mockarmresources/mockarmresources.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockhttp" ) var tagFilterExpression = regexp.MustCompile("tagName eq '(.+)' and tagValue eq '(.*?)'") diff --git a/cli/azd/test/mocks/mockarmresources/subscriptions.go b/cli/azd/test/mocks/mockarmresources/subscriptions.go index c23bdab2ecd..67e05353125 100644 --- a/cli/azd/test/mocks/mockarmresources/subscriptions.go +++ b/cli/azd/test/mocks/mockarmresources/subscriptions.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockhttp" + "github.com/azure/azure-dev/test/mocks/mockhttp" ) func IsListSubscriptions(request *http.Request) bool { diff --git a/cli/azd/test/mocks/mockauth/mock_auth_manager.go b/cli/azd/test/mocks/mockauth/mock_auth_manager.go index 31b1d9ca1a6..fd88278bf7c 100644 --- a/cli/azd/test/mocks/mockauth/mock_auth_manager.go +++ b/cli/azd/test/mocks/mockauth/mock_auth_manager.go @@ -6,7 +6,7 @@ package mockauth import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/auth" + "github.com/azure/azure-dev/pkg/auth" "github.com/stretchr/testify/mock" ) diff --git a/cli/azd/test/mocks/mockazapi/mock_resource_service.go b/cli/azd/test/mocks/mockazapi/mock_resource_service.go index 463724433d0..cea03273a2d 100644 --- a/cli/azd/test/mocks/mockazapi/mock_resource_service.go +++ b/cli/azd/test/mocks/mockazapi/mock_resource_service.go @@ -7,7 +7,7 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" + "github.com/azure/azure-dev/pkg/azapi" "github.com/stretchr/testify/mock" ) diff --git a/cli/azd/test/mocks/mockazapi/mocks.go b/cli/azd/test/mocks/mockazapi/mocks.go index 5ad4c467ac6..e3496e0dd3a 100644 --- a/cli/azd/test/mocks/mockazapi/mocks.go +++ b/cli/azd/test/mocks/mockazapi/mocks.go @@ -7,10 +7,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/azure/azure-dev/cli/azd/pkg/azapi" - "github.com/azure/azure-dev/cli/azd/pkg/cloud" - "github.com/azure/azure-dev/cli/azd/test/mocks" - "github.com/azure/azure-dev/cli/azd/test/mocks/mockaccount" + "github.com/azure/azure-dev/pkg/azapi" + "github.com/azure/azure-dev/pkg/cloud" + "github.com/azure/azure-dev/test/mocks" + "github.com/azure/azure-dev/test/mocks/mockaccount" "github.com/benbjohnson/clock" ) diff --git a/cli/azd/test/mocks/mockazsdk/container_apps.go b/cli/azd/test/mocks/mockazsdk/container_apps.go index ee6285ac29d..60edf91f57f 100644 --- a/cli/azd/test/mocks/mockazsdk/container_apps.go +++ b/cli/azd/test/mocks/mockazsdk/container_apps.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v3" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func MockContainerAppGet( diff --git a/cli/azd/test/mocks/mockazsdk/container_registry.go b/cli/azd/test/mocks/mockazsdk/container_registry.go index a9c2e38c6c8..4ac1d9fed3c 100644 --- a/cli/azd/test/mocks/mockazsdk/container_registry.go +++ b/cli/azd/test/mocks/mockazsdk/container_registry.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/test/mocks" ) func MockContainerRegistryTokenExchange( diff --git a/cli/azd/test/mocks/mockconfig/mock_config.go b/cli/azd/test/mocks/mockconfig/mock_config.go index c98f52ee071..0ecc04e5f62 100644 --- a/cli/azd/test/mocks/mockconfig/mock_config.go +++ b/cli/azd/test/mocks/mockconfig/mock_config.go @@ -3,7 +3,7 @@ package mockconfig -import "github.com/azure/azure-dev/cli/azd/pkg/config" +import "github.com/azure/azure-dev/pkg/config" type MockConfigManager struct { config config.Config diff --git a/cli/azd/test/mocks/mockdevcentersdk/mocks.go b/cli/azd/test/mocks/mockdevcentersdk/mocks.go index c4d5c755fe7..5dd52382a5d 100644 --- a/cli/azd/test/mocks/mockdevcentersdk/mocks.go +++ b/cli/azd/test/mocks/mockdevcentersdk/mocks.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/azure/azure-dev/cli/azd/pkg/devcentersdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/devcentersdk" + "github.com/azure/azure-dev/test/mocks" ) func MockDevCenterGraphQuery(mockContext *mocks.MockContext, devCenters []*devcentersdk.DevCenter) { diff --git a/cli/azd/test/mocks/mockenv/mock_manager.go b/cli/azd/test/mocks/mockenv/mock_manager.go index b3db301cfc7..8dd8db47008 100644 --- a/cli/azd/test/mocks/mockenv/mock_manager.go +++ b/cli/azd/test/mocks/mockenv/mock_manager.go @@ -6,7 +6,7 @@ package mockenv import ( "context" - "github.com/azure/azure-dev/cli/azd/pkg/environment" + "github.com/azure/azure-dev/pkg/environment" "github.com/stretchr/testify/mock" ) diff --git a/cli/azd/test/mocks/mockexec/mock_runner.go b/cli/azd/test/mocks/mockexec/mock_runner.go index 23ca0b3f251..7c75506fd75 100644 --- a/cli/azd/test/mocks/mockexec/mock_runner.go +++ b/cli/azd/test/mocks/mockexec/mock_runner.go @@ -9,7 +9,7 @@ import ( osexec "os/exec" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/exec" + "github.com/azure/azure-dev/pkg/exec" ) type CommandWhenPredicate func(args exec.RunArgs, command string) bool diff --git a/cli/azd/test/mocks/mockgraphsdk/mocks.go b/cli/azd/test/mocks/mockgraphsdk/mocks.go index bbfd1f24583..d798b2f8ef4 100644 --- a/cli/azd/test/mocks/mockgraphsdk/mocks.go +++ b/cli/azd/test/mocks/mockgraphsdk/mocks.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2" - "github.com/azure/azure-dev/cli/azd/pkg/graphsdk" - "github.com/azure/azure-dev/cli/azd/test/mocks" + "github.com/azure/azure-dev/pkg/graphsdk" + "github.com/azure/azure-dev/test/mocks" ) func CreateGraphClient(mockContext *mocks.MockContext) (*graphsdk.GraphClient, error) { diff --git a/cli/azd/test/mocks/mockinput/mock_console.go b/cli/azd/test/mocks/mockinput/mock_console.go index 861cfdbe90a..826859ad7d9 100644 --- a/cli/azd/test/mocks/mockinput/mock_console.go +++ b/cli/azd/test/mocks/mockinput/mock_console.go @@ -9,10 +9,10 @@ import ( "fmt" "io" - "github.com/azure/azure-dev/cli/azd/pkg/alpha" - "github.com/azure/azure-dev/cli/azd/pkg/input" - "github.com/azure/azure-dev/cli/azd/pkg/output" - "github.com/azure/azure-dev/cli/azd/pkg/output/ux" + "github.com/azure/azure-dev/pkg/alpha" + "github.com/azure/azure-dev/pkg/input" + "github.com/azure/azure-dev/pkg/output" + "github.com/azure/azure-dev/pkg/output/ux" ) // A predicate function definition for registering expressions diff --git a/cli/azd/test/recording/recording.go b/cli/azd/test/recording/recording.go index 067698dfa4f..cb72f49169d 100644 --- a/cli/azd/test/recording/recording.go +++ b/cli/azd/test/recording/recording.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/azure/azure-dev/cli/azd/test/cmdrecord" + "github.com/azure/azure-dev/test/cmdrecord" "github.com/braydonk/yaml" "gopkg.in/dnaeon/go-vcr.v3/cassette" "gopkg.in/dnaeon/go-vcr.v3/recorder" diff --git a/cli/azd/test/recording/trim_response.go b/cli/azd/test/recording/trim_response.go index 177e0e21b8f..52ddfa9887c 100644 --- a/cli/azd/test/recording/trim_response.go +++ b/cli/azd/test/recording/trim_response.go @@ -9,7 +9,7 @@ import ( "regexp" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/azure/azure-dev/cli/azd/pkg/azure" + "github.com/azure/azure-dev/pkg/azure" "gopkg.in/dnaeon/go-vcr.v3/cassette" ) diff --git a/cli/azd/tools/avmres/main.go b/cli/azd/tools/avmres/main.go index cfd06774f39..b73f29aaf4c 100644 --- a/cli/azd/tools/avmres/main.go +++ b/cli/azd/tools/avmres/main.go @@ -13,7 +13,7 @@ import ( "slices" "strings" - "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/azure/azure-dev/pkg/output" flag "github.com/spf13/pflag" ) diff --git a/eng/pipelines/templates/steps/template-test-run-job.yml b/eng/pipelines/templates/steps/template-test-run-job.yml index 0a73d6ff2bd..c7c5d480c2e 100644 --- a/eng/pipelines/templates/steps/template-test-run-job.yml +++ b/eng/pipelines/templates/steps/template-test-run-job.yml @@ -63,7 +63,7 @@ steps: displayName: Copy test-templates.sh - bash: | - go build -o ./temp/tfoidc ./cli/azd/test/internal/tfoidc + cd cli/azd && go build -o ../../temp/tfoidc ./test/internal/tfoidc displayName: Build tfoidc env: CGO_ENABLED: 0 diff --git a/eng/scripts/Convert-GoCoverageToCobertura.ps1 b/eng/scripts/Convert-GoCoverageToCobertura.ps1 index eefb4f01514..5062b26cbe8 100644 --- a/eng/scripts/Convert-GoCoverageToCobertura.ps1 +++ b/eng/scripts/Convert-GoCoverageToCobertura.ps1 @@ -51,8 +51,8 @@ function Normalize-GoFilePath { [string]$SourceRoot ) - # Handle Go module paths like "github.com/azure/azure-dev/cli/azd/pkg/test/file.go" - # Convert to relative paths like "cli/azd/pkg/test/file.go" + # Handle Go module paths like "github.com/azure/azure-dev/pkg/test/file.go" + # Convert to relative paths like "pkg/test/file.go" # Common Go module path patterns to normalize $modulePatterns = @( diff --git a/magefile.go b/magefile.go deleted file mode 100644 index 705e3d8492b..00000000000 --- a/magefile.go +++ /dev/null @@ -1,49 +0,0 @@ -//go:build mage -// +build mage - -package main - -import ( - "context" - "fmt" - "os" - "os/exec" - - "github.com/magefile/mage/mg" -) - -type AZD mg.Namespace - -func (a AZD) Build(ctx context.Context) error { - cmdStr, cmd := runIn( - ".", - "go", - "build", - "-o", - "./bin/azd", - "./cli/azd", - ) - fmt.Println(cmdStr) - return cmd() -} - -func (a AZD) Test(ctx context.Context) error { - cmdStr, cmd := runIn( - ".", - "go", - "test", - "./...", - ) - fmt.Println(cmdStr) - return cmd() -} - -func runIn(cwd string, cmd string, args ...string) (string, func() error) { - c := exec.Command(cmd, args...) - c.Dir = cwd - c.Stdout = os.Stdout - c.Stderr = os.Stderr - return c.String(), func() error { - return c.Run() - } -}