Skip to content

Commit

Permalink
chore: fix v2 mod install (#2347)
Browse files Browse the repository at this point in the history
  • Loading branch information
remyleone authored Jun 13, 2022
1 parent 3df3cb3 commit 7c8337b
Show file tree
Hide file tree
Showing 212 changed files with 322 additions and 322 deletions.
4 changes: 2 additions & 2 deletions cmd/scw-doc-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"os"

"github.com/scaleway/scaleway-cli/internal/docgen"
"github.com/scaleway/scaleway-cli/internal/namespaces"
"github.com/scaleway/scaleway-cli/v2/internal/docgen"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
)

// This command is used to generate markdown documentation for each commands (custom or generated) of the CLI
Expand Down
8 changes: 4 additions & 4 deletions cmd/scw-qa/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"strings"

"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/namespaces"
"github.com/scaleway/scaleway-cli/internal/qa"
"github.com/scaleway/scaleway-cli/internal/tabwriter"
"github.com/scaleway/scaleway-cli/internal/terminal"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
"github.com/scaleway/scaleway-cli/v2/internal/qa"
"github.com/scaleway/scaleway-cli/v2/internal/tabwriter"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/scw/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/hashicorp/go-version"
"github.com/mattn/go-colorable"
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/namespaces"
"github.com/scaleway/scaleway-cli/internal/sentry"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
"github.com/scaleway/scaleway-cli/v2/internal/sentry"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/scw/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"
"testing"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/namespaces"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
)

func Test_MainUsage(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/scaleway/scaleway-cli
module github.com/scaleway/scaleway-cli/v2

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion internal/core/autocomplete.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
)

// AutocompleteSuggestions is a list of words to be set to the shell as autocomplete suggestions.
Expand Down
4 changes: 2 additions & 2 deletions internal/core/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"os"

"github.com/scaleway/scaleway-cli/internal/account"
"github.com/scaleway/scaleway-cli/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/account"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
"github.com/scaleway/scaleway-sdk-go/logger"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/spf13/pflag"
Expand Down
4 changes: 2 additions & 2 deletions internal/core/bootstrap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

"github.com/alecthomas/assert"
"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
)

func TestInterruptError(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/build_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/alecthomas/assert"
"github.com/hashicorp/go-version"
"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/core/cobra_usage_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"text/tabwriter"

"github.com/scaleway/scaleway-cli/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
"github.com/scaleway/scaleway-sdk-go/logger"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/core/cobra_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"strings"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/core/cobra_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
)

type testType struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sort"
"strings"

"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/human"
)

// Command represent a CLI command. From this higher level type we create Cobra command objects.
Expand Down
2 changes: 1 addition & 1 deletion internal/core/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"strings"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-sdk-go/namegenerator"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/core/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/alecthomas/assert"
"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
)

func Test_ApplyDefaultValues(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/human"
)

// CliError is an all-in-one error structure that can be used in commands to return useful errors to the user.
Expand Down
4 changes: 2 additions & 2 deletions internal/core/example.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
)

// Example represents an example for the usage of a CLI command.
Expand Down
4 changes: 2 additions & 2 deletions internal/core/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"text/template"

"github.com/scaleway/scaleway-cli/internal/gofields"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/gofields"
"github.com/scaleway/scaleway-cli/v2/internal/human"
"gopkg.in/yaml.v3"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/core/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"strings"

"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"

"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/terminal"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
"github.com/scaleway/scaleway-sdk-go/strcase"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/core/testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/dnaeon/go-vcr/cassette"
"github.com/dnaeon/go-vcr/recorder"
"github.com/hashicorp/go-version"
args "github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/internal/interactive"
args "github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
"github.com/scaleway/scaleway-sdk-go/api/test/v1"
"github.com/scaleway/scaleway-sdk-go/logger"
"github.com/scaleway/scaleway-sdk-go/scw"
Expand Down
2 changes: 1 addition & 1 deletion internal/core/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-sdk-go/logger"
"github.com/scaleway/scaleway-sdk-go/strcase"
"github.com/scaleway/scaleway-sdk-go/validation"
Expand Down
2 changes: 1 addition & 1 deletion internal/core/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/alecthomas/assert"
"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/args"
)

type Element struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/core/view.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package core

import (
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/human"
)

// View hydrates human.MarshalOpt
Expand Down
2 changes: 1 addition & 1 deletion internal/docgen/docgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"text/template"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/core"
)

type tplData struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/e2e/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package e2e
import (
"testing"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/namespaces/test/v1"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
)

func TestStandardErrors(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/e2e/human_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package e2e
import (
"testing"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/namespaces/test/v1"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
)

func TestTestCommand(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/e2e/sdk_errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"github.com/alecthomas/assert"
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/namespaces/test/v1"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
sdktest "github.com/scaleway/scaleway-sdk-go/api/test/v1"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/human/marshal.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strings"

"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/gofields"
"github.com/scaleway/scaleway-cli/internal/tabwriter"
"github.com/scaleway/scaleway-cli/internal/terminal"
"github.com/scaleway/scaleway-cli/v2/internal/gofields"
"github.com/scaleway/scaleway-cli/v2/internal/tabwriter"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
"github.com/scaleway/scaleway-sdk-go/logger"
"github.com/scaleway/scaleway-sdk-go/strcase"
"golang.org/x/text/cases"
Expand Down
2 changes: 1 addition & 1 deletion internal/human/marshal_func.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/fatih/color"
"github.com/hashicorp/go-version"
"github.com/scaleway/scaleway-cli/internal/terminal"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
"github.com/scaleway/scaleway-sdk-go/scw"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/interactive/print.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"strings"

"github.com/scaleway/scaleway-cli/internal/terminal"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
)

func Print(a ...interface{}) (int, error) {
Expand Down
4 changes: 2 additions & 2 deletions internal/interactive/prompt.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/chzyer/readline"
"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/internal/terminal"
"github.com/scaleway/scaleway-cli/v2/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
)

type PromptPasswordConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/namespaces/account/v2alpha1/account_cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"
"reflect"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/namespaces/account/v2alpha1/custom.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"reflect"
"strings"

"github.com/scaleway/scaleway-cli/internal/args"
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/interactive"
"github.com/scaleway/scaleway-cli/v2/internal/args"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/namespaces/account/v2alpha1/custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"
"testing"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/core"
account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/namespaces/account/v2alpha1/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package account
import (
"fmt"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/core"
)

func installationCanceled(addKeyInstructions string) *core.CliError {
Expand Down
2 changes: 1 addition & 1 deletion internal/namespaces/account/v2alpha1/helpers_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package account

import (
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/core"
)

func addSSHKey(metaKey string, key string) core.BeforeFunc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"
"reflect"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/namespaces/applesilicon/v1alpha1/custom.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package applesilicon

import (
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/human"
applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/namespaces/applesilicon/v1alpha1/custom_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/human"
applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
)
Expand Down
Loading

0 comments on commit 7c8337b

Please sign in to comment.