Skip to content

Commit 7c8337b

Browse files
remyleoneremyleone
authored
chore: fix v2 mod install (#2347)
1 parent 3df3cb3 commit 7c8337b

File tree

212 files changed

+322
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+322
-322
lines changed

‎cmd/scw-doc-gen/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"os"
77

8-
"github.com/scaleway/scaleway-cli/internal/docgen"
9-
"github.com/scaleway/scaleway-cli/internal/namespaces"
8+
"github.com/scaleway/scaleway-cli/v2/internal/docgen"
9+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
1010
)
1111

1212
// This command is used to generate markdown documentation for each commands (custom or generated) of the CLI

‎cmd/scw-qa/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"strings"
77

88
"github.com/fatih/color"
9-
"github.com/scaleway/scaleway-cli/internal/namespaces"
10-
"github.com/scaleway/scaleway-cli/internal/qa"
11-
"github.com/scaleway/scaleway-cli/internal/tabwriter"
12-
"github.com/scaleway/scaleway-cli/internal/terminal"
9+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
10+
"github.com/scaleway/scaleway-cli/v2/internal/qa"
11+
"github.com/scaleway/scaleway-cli/v2/internal/tabwriter"
12+
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
1313
)
1414

1515
func main() {

‎cmd/scw/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/hashicorp/go-version"
1010
"github.com/mattn/go-colorable"
11-
"github.com/scaleway/scaleway-cli/internal/core"
12-
"github.com/scaleway/scaleway-cli/internal/namespaces"
13-
"github.com/scaleway/scaleway-cli/internal/sentry"
11+
"github.com/scaleway/scaleway-cli/v2/internal/core"
12+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
13+
"github.com/scaleway/scaleway-cli/v2/internal/sentry"
1414
)
1515

1616
var (

‎cmd/scw/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strings"
55
"testing"
66

7-
"github.com/scaleway/scaleway-cli/internal/core"
8-
"github.com/scaleway/scaleway-cli/internal/namespaces"
7+
"github.com/scaleway/scaleway-cli/v2/internal/core"
8+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
99
)
1010

1111
func Test_MainUsage(t *testing.T) {

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/scaleway/scaleway-cli
1+
module github.com/scaleway/scaleway-cli/v2
22

33
go 1.17
44

‎internal/core/autocomplete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strconv"
99
"strings"
1010

11-
"github.com/scaleway/scaleway-cli/internal/args"
11+
"github.com/scaleway/scaleway-cli/v2/internal/args"
1212
)
1313

1414
// AutocompleteSuggestions is a list of words to be set to the shell as autocomplete suggestions.

‎internal/core/bootstrap.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"net/http"
88
"os"
99

10-
"github.com/scaleway/scaleway-cli/internal/account"
11-
"github.com/scaleway/scaleway-cli/internal/interactive"
10+
"github.com/scaleway/scaleway-cli/v2/internal/account"
11+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
1212
"github.com/scaleway/scaleway-sdk-go/logger"
1313
"github.com/scaleway/scaleway-sdk-go/scw"
1414
"github.com/spf13/pflag"

‎internal/core/bootstrap_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77

88
"github.com/alecthomas/assert"
9-
"github.com/scaleway/scaleway-cli/internal/args"
10-
"github.com/scaleway/scaleway-cli/internal/interactive"
9+
"github.com/scaleway/scaleway-cli/v2/internal/args"
10+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
1111
)
1212

1313
func TestInterruptError(t *testing.T) {

‎internal/core/build_info_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/alecthomas/assert"
1111
"github.com/hashicorp/go-version"
12-
"github.com/scaleway/scaleway-cli/internal/args"
12+
"github.com/scaleway/scaleway-cli/v2/internal/args"
1313
"github.com/scaleway/scaleway-sdk-go/scw"
1414
"github.com/stretchr/testify/require"
1515
)

‎internal/core/cobra_usage_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"text/tabwriter"
1010

11-
"github.com/scaleway/scaleway-cli/internal/interactive"
11+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
1212
"github.com/scaleway/scaleway-sdk-go/logger"
1313
)
1414

‎internal/core/cobra_utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"reflect"
88
"strings"
99

10-
"github.com/scaleway/scaleway-cli/internal/args"
10+
"github.com/scaleway/scaleway-cli/v2/internal/args"
1111
"github.com/spf13/cobra"
1212
)
1313

‎internal/core/cobra_utils_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/scaleway/scaleway-cli/internal/args"
10+
"github.com/scaleway/scaleway-cli/v2/internal/args"
1111
)
1212

1313
type testType struct {

‎internal/core/command.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"strings"
99

10-
"github.com/scaleway/scaleway-cli/internal/human"
10+
"github.com/scaleway/scaleway-cli/v2/internal/human"
1111
)
1212

1313
// Command represent a CLI command. From this higher level type we create Cobra command objects.

‎internal/core/default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"strings"
66

7-
"github.com/scaleway/scaleway-cli/internal/args"
7+
"github.com/scaleway/scaleway-cli/v2/internal/args"
88
"github.com/scaleway/scaleway-sdk-go/namegenerator"
99
)
1010

‎internal/core/default_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/alecthomas/assert"
8-
"github.com/scaleway/scaleway-cli/internal/args"
8+
"github.com/scaleway/scaleway-cli/v2/internal/args"
99
)
1010

1111
func Test_ApplyDefaultValues(t *testing.T) {

‎internal/core/error.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/scaleway/scaleway-cli/internal/human"
8+
"github.com/scaleway/scaleway-cli/v2/internal/human"
99
)
1010

1111
// CliError is an all-in-one error structure that can be used in commands to return useful errors to the user.

‎internal/core/example.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/scaleway/scaleway-cli/internal/args"
9-
"github.com/scaleway/scaleway-cli/internal/interactive"
8+
"github.com/scaleway/scaleway-cli/v2/internal/args"
9+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
1010
)
1111

1212
// Example represents an example for the usage of a CLI command.

‎internal/core/printer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strings"
99
"text/template"
1010

11-
"github.com/scaleway/scaleway-cli/internal/gofields"
12-
"github.com/scaleway/scaleway-cli/internal/human"
11+
"github.com/scaleway/scaleway-cli/v2/internal/gofields"
12+
"github.com/scaleway/scaleway-cli/v2/internal/human"
1313
"gopkg.in/yaml.v3"
1414
)
1515

‎internal/core/result.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/scaleway/scaleway-cli/internal/human"
9-
"github.com/scaleway/scaleway-cli/internal/interactive"
8+
"github.com/scaleway/scaleway-cli/v2/internal/human"
9+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
1010

1111
"github.com/fatih/color"
12-
"github.com/scaleway/scaleway-cli/internal/terminal"
12+
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
1313
"github.com/scaleway/scaleway-sdk-go/strcase"
1414
)
1515

‎internal/core/testing.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"github.com/dnaeon/go-vcr/cassette"
2222
"github.com/dnaeon/go-vcr/recorder"
2323
"github.com/hashicorp/go-version"
24-
args "github.com/scaleway/scaleway-cli/internal/args"
25-
"github.com/scaleway/scaleway-cli/internal/human"
26-
"github.com/scaleway/scaleway-cli/internal/interactive"
24+
args "github.com/scaleway/scaleway-cli/v2/internal/args"
25+
"github.com/scaleway/scaleway-cli/v2/internal/human"
26+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
2727
"github.com/scaleway/scaleway-sdk-go/api/test/v1"
2828
"github.com/scaleway/scaleway-sdk-go/logger"
2929
"github.com/scaleway/scaleway-sdk-go/scw"

‎internal/core/validate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strconv"
88
"strings"
99

10-
"github.com/scaleway/scaleway-cli/internal/args"
10+
"github.com/scaleway/scaleway-cli/v2/internal/args"
1111
"github.com/scaleway/scaleway-sdk-go/logger"
1212
"github.com/scaleway/scaleway-sdk-go/strcase"
1313
"github.com/scaleway/scaleway-sdk-go/validation"

‎internal/core/validate_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/alecthomas/assert"
10-
"github.com/scaleway/scaleway-cli/internal/args"
10+
"github.com/scaleway/scaleway-cli/v2/internal/args"
1111
)
1212

1313
type Element struct {

‎internal/core/view.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package core
22

33
import (
4-
"github.com/scaleway/scaleway-cli/internal/human"
4+
"github.com/scaleway/scaleway-cli/v2/internal/human"
55
)
66

77
// View hydrates human.MarshalOpt

‎internal/docgen/docgen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"text/template"
1111

12-
"github.com/scaleway/scaleway-cli/internal/core"
12+
"github.com/scaleway/scaleway-cli/v2/internal/core"
1313
)
1414

1515
type tplData struct {

‎internal/e2e/errors_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package e2e
33
import (
44
"testing"
55

6-
"github.com/scaleway/scaleway-cli/internal/core"
7-
"github.com/scaleway/scaleway-cli/internal/namespaces/test/v1"
6+
"github.com/scaleway/scaleway-cli/v2/internal/core"
7+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
88
)
99

1010
func TestStandardErrors(t *testing.T) {

‎internal/e2e/human_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package e2e
33
import (
44
"testing"
55

6-
"github.com/scaleway/scaleway-cli/internal/core"
7-
"github.com/scaleway/scaleway-cli/internal/namespaces/test/v1"
6+
"github.com/scaleway/scaleway-cli/v2/internal/core"
7+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
88
)
99

1010
func TestTestCommand(t *testing.T) {

‎internal/e2e/sdk_errors_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
"github.com/alecthomas/assert"
7-
"github.com/scaleway/scaleway-cli/internal/core"
8-
"github.com/scaleway/scaleway-cli/internal/namespaces/test/v1"
7+
"github.com/scaleway/scaleway-cli/v2/internal/core"
8+
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
99
sdktest "github.com/scaleway/scaleway-sdk-go/api/test/v1"
1010
)
1111

‎internal/human/marshal.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010

1111
"github.com/fatih/color"
12-
"github.com/scaleway/scaleway-cli/internal/gofields"
13-
"github.com/scaleway/scaleway-cli/internal/tabwriter"
14-
"github.com/scaleway/scaleway-cli/internal/terminal"
12+
"github.com/scaleway/scaleway-cli/v2/internal/gofields"
13+
"github.com/scaleway/scaleway-cli/v2/internal/tabwriter"
14+
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
1515
"github.com/scaleway/scaleway-sdk-go/logger"
1616
"github.com/scaleway/scaleway-sdk-go/strcase"
1717
"golang.org/x/text/cases"

‎internal/human/marshal_func.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/dustin/go-humanize"
1212
"github.com/fatih/color"
1313
"github.com/hashicorp/go-version"
14-
"github.com/scaleway/scaleway-cli/internal/terminal"
14+
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
1515
"github.com/scaleway/scaleway-sdk-go/scw"
1616
)
1717

‎internal/interactive/print.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"regexp"
77
"strings"
88

9-
"github.com/scaleway/scaleway-cli/internal/terminal"
9+
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
1010
)
1111

1212
func Print(a ...interface{}) (int, error) {

‎internal/interactive/prompt.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/chzyer/readline"
99
"github.com/fatih/color"
10-
"github.com/scaleway/scaleway-cli/internal/human"
11-
"github.com/scaleway/scaleway-cli/internal/terminal"
10+
"github.com/scaleway/scaleway-cli/v2/internal/human"
11+
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
1212
)
1313

1414
type PromptPasswordConfig struct {

‎internal/namespaces/account/v2alpha1/account_cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"reflect"
99

10-
"github.com/scaleway/scaleway-cli/internal/core"
10+
"github.com/scaleway/scaleway-cli/v2/internal/core"
1111
"github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
1212
"github.com/scaleway/scaleway-sdk-go/scw"
1313
)

‎internal/namespaces/account/v2alpha1/custom.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"reflect"
99
"strings"
1010

11-
"github.com/scaleway/scaleway-cli/internal/args"
12-
"github.com/scaleway/scaleway-cli/internal/core"
13-
"github.com/scaleway/scaleway-cli/internal/interactive"
11+
"github.com/scaleway/scaleway-cli/v2/internal/args"
12+
"github.com/scaleway/scaleway-cli/v2/internal/core"
13+
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
1414
account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
1515
"github.com/scaleway/scaleway-sdk-go/scw"
1616
)

‎internal/namespaces/account/v2alpha1/custom_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path"
77
"testing"
88

9-
"github.com/scaleway/scaleway-cli/internal/core"
9+
"github.com/scaleway/scaleway-cli/v2/internal/core"
1010
account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
1111
)
1212

‎internal/namespaces/account/v2alpha1/error.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package account
33
import (
44
"fmt"
55

6-
"github.com/scaleway/scaleway-cli/internal/core"
6+
"github.com/scaleway/scaleway-cli/v2/internal/core"
77
)
88

99
func installationCanceled(addKeyInstructions string) *core.CliError {

‎internal/namespaces/account/v2alpha1/helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package account
22

33
import (
4-
"github.com/scaleway/scaleway-cli/internal/core"
4+
"github.com/scaleway/scaleway-cli/v2/internal/core"
55
)
66

77
func addSSHKey(metaKey string, key string) core.BeforeFunc {

‎internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"reflect"
99

10-
"github.com/scaleway/scaleway-cli/internal/core"
10+
"github.com/scaleway/scaleway-cli/v2/internal/core"
1111
"github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
1212
"github.com/scaleway/scaleway-sdk-go/scw"
1313
)

‎internal/namespaces/applesilicon/v1alpha1/custom.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package applesilicon
22

33
import (
4-
"github.com/scaleway/scaleway-cli/internal/core"
5-
"github.com/scaleway/scaleway-cli/internal/human"
4+
"github.com/scaleway/scaleway-cli/v2/internal/core"
5+
"github.com/scaleway/scaleway-cli/v2/internal/human"
66
applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
77
)
88

‎internal/namespaces/applesilicon/v1alpha1/custom_server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"time"
1010

1111
"github.com/fatih/color"
12-
"github.com/scaleway/scaleway-cli/internal/core"
13-
"github.com/scaleway/scaleway-cli/internal/human"
12+
"github.com/scaleway/scaleway-cli/v2/internal/core"
13+
"github.com/scaleway/scaleway-cli/v2/internal/human"
1414
applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
1515
"github.com/scaleway/scaleway-sdk-go/scw"
1616
)

0 commit comments

Comments
 (0)