Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .github/workflows/cli-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,18 @@ test-results/
*.terraform*

# Finder state files
.DS_Store
.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
2 changes: 1 addition & 1 deletion cli/azd/appdetect/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 11 additions & 4 deletions cli/azd/ci-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 ' ')"
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/cmd/actions/action_descriptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/azd/cmd/actions/action_descriptor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cli/azd/cmd/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
24 changes: 12 additions & 12 deletions cli/azd/cmd/auth_login.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions cli/azd/cmd/auth_logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
16 changes: 8 additions & 8 deletions cli/azd/cmd/auth_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions cli/azd/cmd/auth_token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
14 changes: 7 additions & 7 deletions cli/azd/cmd/auto_install.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/cmd/auto_install_multi_namespace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/azd/cmd/auto_install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
18 changes: 9 additions & 9 deletions cli/azd/cmd/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cli/azd/cmd/cmd_help.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions cli/azd/cmd/cobra_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
14 changes: 7 additions & 7 deletions cli/azd/cmd/cobra_builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions cli/azd/cmd/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
14 changes: 7 additions & 7 deletions cli/azd/cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading
Loading