update go module path /v2 (#45)

bwagner5 · web-flow · commit f6086b045817 · 2020-07-30T11:14:34.000-05:00
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ GOPROXY ?= "https://proxy.golang.org,direct"
 MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))
 BUILD_DIR_PATH = ${MAKEFILE_PATH}/build
 SUPPORTED_PLATFORMS ?= "windows/amd64,darwin/amd64,linux/amd64,linux/arm64,linux/arm"
-SELECTOR_PKG_VERSION_VAR=github.com/aws/amazon-ec2-instance-selector/pkg/selector.versionID
+SELECTOR_PKG_VERSION_VAR=github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector.versionID
 LATEST_RELEASE_TAG=$(shell git tag | tail -1)
 PREVIOUS_RELEASE_TAG=$(shell git tag | tail -2 | head -1)
 
diff --git a/README.md b/README.md
@@ -207,8 +207,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 )
diff --git a/cmd/examples/example1.go b/cmd/examples/example1.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 )
diff --git a/cmd/main.go b/cmd/main.go
@@ -19,9 +19,9 @@ import (
 	"os"
 	"strings"
 
-	commandline "github.com/aws/amazon-ec2-instance-selector/pkg/cli"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector/outputs"
+	commandline "github.com/aws/amazon-ec2-instance-selector/v2/pkg/cli"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector/outputs"
 	"github.com/aws/aws-sdk-go/aws/session"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/aws/amazon-ec2-instance-selector
+module github.com/aws/amazon-ec2-instance-selector/v2
 
 go 1.14
 
diff --git a/pkg/bytequantity/bytequantity_test.go b/pkg/bytequantity/bytequantity_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 )
 
 func TestParseToByteQuantity(t *testing.T) {
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
diff --git a/pkg/cli/cli_internal_test.go b/pkg/cli/cli_internal_test.go
@@ -17,7 +17,7 @@ import (
 	"os"
 	"testing"
 
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 	"github.com/spf13/pflag"
 )
 
diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go
@@ -20,10 +20,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/cli"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/cli"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cli/flags.go b/pkg/cli/flags.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
 	"github.com/spf13/pflag"
 )
 
diff --git a/pkg/cli/flags_test.go b/pkg/cli/flags_test.go
@@ -17,8 +17,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 )
 
 // Tests
diff --git a/pkg/cli/types.go b/pkg/cli/types.go
@@ -18,8 +18,8 @@ import (
 	"log"
 	"regexp"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
diff --git a/pkg/cli/types_test.go b/pkg/cli/types_test.go
@@ -18,9 +18,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 )
 
 // Tests
diff --git a/pkg/selector/aggregates.go b/pkg/selector/aggregates.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 )
diff --git a/pkg/selector/aggregates_test.go b/pkg/selector/aggregates_test.go
@@ -16,8 +16,8 @@ package selector_test
 import (
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 )
 
 // Tests
diff --git a/pkg/selector/comparators_internal_test.go b/pkg/selector/comparators_internal_test.go
@@ -17,7 +17,7 @@ import (
 	"math"
 	"testing"
 
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 	"github.com/aws/aws-sdk-go/aws"
 )
 
diff --git a/pkg/selector/outputs/outputs_test.go b/pkg/selector/outputs/outputs_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector/outputs"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector/outputs"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/ghodss/yaml"
 	"github.com/hashicorp/hcl"
diff --git a/pkg/selector/selector.go b/pkg/selector/selector.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector/outputs"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector/outputs"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/session"
diff --git a/pkg/selector/selector_test.go b/pkg/selector/selector_test.go
@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
diff --git a/pkg/selector/types.go b/pkg/selector/types.go
@@ -17,7 +17,7 @@ import (
 	"encoding/json"
 	"regexp"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 )
diff --git a/pkg/selector/types_test.go b/pkg/selector/types_test.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/aws/amazon-ec2-instance-selector/pkg/selector"
-	h "github.com/aws/amazon-ec2-instance-selector/pkg/test"
+	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
+	h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"
 )
 
 // Tests

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/aws/amazon-ec2-instance-selector`
	`1`	`+module github.com/aws/amazon-ec2-instance-selector/v2`
`2`	`2`
`3`	`3`	`go 1.14`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"`
`8`		`- h "github.com/aws/amazon-ec2-instance-selector/pkg/test"`
	`7`	`+ "github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"`
	`8`	`+ h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestParseToByteQuantity(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"os"`
`18`	`18`	`"testing"`
`19`	`19`
`20`		`- h "github.com/aws/amazon-ec2-instance-selector/pkg/test"`
	`20`	`+ h "github.com/aws/amazon-ec2-instance-selector/v2/pkg/test"`
`21`	`21`	`"github.com/spf13/pflag"`
`22`	`22`	`)`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/aws/amazon-ec2-instance-selector/pkg/bytequantity"`
	`10`	`+ "github.com/aws/amazon-ec2-instance-selector/v2/pkg/bytequantity"`
`11`	`11`	`"github.com/spf13/pflag"`
`12`	`12`	`)`
`13`	`13`