Skip to content

Commit

Permalink
DXE-4574 Support for cli v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgwoj
mgwoj committed Jan 30, 2025
1 parent 6788b12 commit c679372
Show file tree
Hide file tree
Showing 46 changed files with 159 additions and 155 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/checks.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: build
on:
push:
branches:
- "*"
pull_request:
branches:
- v1
- master
jobs:
test:
Expand Down
6 changes: 3 additions & 3 deletions cli/app/firstrun.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"runtime"
"strings"

"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/fatih/color"
"github.com/kardianos/osext"
)
Expand Down
14 changes: 7 additions & 7 deletions cli/app/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"strings"
"syscall"

"github.com/akamai/cli/pkg/app"
"github.com/akamai/cli/pkg/commands"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/pkg/version"
"github.com/akamai/cli/v2/pkg/app"
"github.com/akamai/cli/v2/pkg/commands"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/akamai/cli/v2/pkg/version"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/akamai/cli/cli/app"
"github.com/akamai/cli/v2/cli/app"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/akamai/cli
module github.com/akamai/cli/v2

go 1.22

Expand All @@ -18,6 +18,7 @@ require (
github.com/urfave/cli/v2 v2.19.3
golang.org/x/net v0.34.0
golang.org/x/sys v0.29.0
golang.org/x/text v0.21.0
)

require (
Expand Down Expand Up @@ -48,7 +49,6 @@ require (
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
10 changes: 5 additions & 5 deletions pkg/app/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"
"time"

"github.com/akamai/cli/pkg/apphelp"
"github.com/akamai/cli/pkg/autocomplete"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/pkg/version"
"github.com/akamai/cli/v2/pkg/apphelp"
"github.com/akamai/cli/v2/pkg/autocomplete"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/akamai/cli/v2/pkg/version"

"github.com/kardianos/osext"
"github.com/mitchellh/go-homedir"
Expand Down
6 changes: 3 additions & 3 deletions pkg/app/cli_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"regexp"
"testing"

"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/version"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/version"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
6 changes: 3 additions & 3 deletions pkg/apphelp/help.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"io"
"text/template"

"github.com/akamai/cli/pkg/autocomplete"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/autocomplete"
"github.com/akamai/cli/v2/pkg/tools"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/v2/pkg/color"
"github.com/urfave/cli/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/apphelp/help_command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"os"
"testing"

"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
14 changes: 7 additions & 7 deletions pkg/commands/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"strings"
"syscall"

"github.com/akamai/cli/pkg/apphelp"
"github.com/akamai/cli/pkg/autocomplete"
"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/pkg/version"
"github.com/akamai/cli/v2/pkg/apphelp"
"github.com/akamai/cli/v2/pkg/autocomplete"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/akamai/cli/v2/pkg/version"
"github.com/urfave/cli/v2"
"golang.org/x/text/cases"
"golang.org/x/text/language"
Expand Down
8 changes: 4 additions & 4 deletions pkg/commands/command_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"strings"
"time"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/urfave/cli/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/command_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"testing"

"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
12 changes: 6 additions & 6 deletions pkg/commands/command_install.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (
"strings"
"time"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/urfave/cli/v2"
"golang.org/x/text/cases"
"golang.org/x/text/language"
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/command_install_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"strings"
"testing"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
git2 "github.com/go-git/go-git/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
8 changes: 4 additions & 4 deletions pkg/commands/command_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"fmt"
"time"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/urfave/cli/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/commands/command_list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"testing"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
8 changes: 4 additions & 4 deletions pkg/commands/command_search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"strings"
"time"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/urfave/cli/v2"
)

Expand Down
12 changes: 6 additions & 6 deletions pkg/commands/command_search_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"path/filepath"
"testing"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/command_subcommand.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"runtime"
"strings"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/urfave/cli/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/commands/command_subcommand_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"path/filepath"
"testing"

"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"testing"

"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/command_uninstall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"strings"
"time"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/mitchellh/go-homedir"
"github.com/urfave/cli/v2"
)
Expand Down
12 changes: 6 additions & 6 deletions pkg/commands/command_uninstall_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"runtime"
"testing"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
Expand Down
12 changes: 6 additions & 6 deletions pkg/commands/command_update.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"strings"
"time"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/log"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/log"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
gogit "github.com/go-git/go-git/v5"
"github.com/urfave/cli/v2"
)
Expand Down
12 changes: 6 additions & 6 deletions pkg/commands/command_update_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"strings"
"testing"

"github.com/akamai/cli/pkg/color"
"github.com/akamai/cli/pkg/config"
"github.com/akamai/cli/pkg/git"
"github.com/akamai/cli/pkg/packages"
"github.com/akamai/cli/pkg/terminal"
"github.com/akamai/cli/pkg/tools"
"github.com/akamai/cli/v2/pkg/color"
"github.com/akamai/cli/v2/pkg/config"
"github.com/akamai/cli/v2/pkg/git"
"github.com/akamai/cli/v2/pkg/packages"
"github.com/akamai/cli/v2/pkg/terminal"
"github.com/akamai/cli/v2/pkg/tools"
gogit "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object"
Expand Down
Loading

0 comments on commit c679372

Please sign in to comment.