Change to v2 import statements

samcoe · samcoe · commit 952ebc8eb28a · 2021-09-13T14:56:13.000-07:00
diff --git a/pkg/cmd/gpg-key/add/add.go b/pkg/cmd/gpg-key/add/add.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/cli/cli/internal/config"
-	"github.com/cli/cli/pkg/cmdutil"
-	"github.com/cli/cli/pkg/iostreams"
+	"github.com/cli/cli/v2/internal/config"
+	"github.com/cli/cli/v2/pkg/cmdutil"
+	"github.com/cli/cli/v2/pkg/iostreams"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/gpg-key/add/add_test.go b/pkg/cmd/gpg-key/add/add_test.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/cli/cli/internal/config"
-	"github.com/cli/cli/pkg/httpmock"
-	"github.com/cli/cli/pkg/iostreams"
+	"github.com/cli/cli/v2/internal/config"
+	"github.com/cli/cli/v2/pkg/httpmock"
+	"github.com/cli/cli/v2/pkg/iostreams"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/cmd/gpg-key/add/http.go b/pkg/cmd/gpg-key/add/http.go
@@ -8,8 +8,8 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/cli/cli/api"
-	"github.com/cli/cli/internal/ghinstance"
+	"github.com/cli/cli/v2/api"
+	"github.com/cli/cli/v2/internal/ghinstance"
 )
 
 var scopesError = errors.New("insufficient OAuth scopes")
@@ -23,7 +23,7 @@ func GPGKeyUpload(httpClient *http.Client, hostname string, keyFile io.Reader) e
 	}
 
 	payload := map[string]string{
-		"armored_public_key":   string(keyBytes),
+		"armored_public_key": string(keyBytes),
 	}
 
 	payloadBytes, err := json.Marshal(payload)
diff --git a/pkg/cmd/gpg-key/gpg-key.go b/pkg/cmd/gpg-key/gpg-key.go
@@ -1,9 +1,9 @@
 package key
 
 import (
-	cmdAdd "github.com/cli/cli/pkg/cmd/gpg-key/add"
-	cmdList "github.com/cli/cli/pkg/cmd/gpg-key/list"
-	"github.com/cli/cli/pkg/cmdutil"
+	cmdAdd "github.com/cli/cli/v2/pkg/cmd/gpg-key/add"
+	cmdList "github.com/cli/cli/v2/pkg/cmd/gpg-key/list"
+	"github.com/cli/cli/v2/pkg/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/gpg-key/list/http.go b/pkg/cmd/gpg-key/list/http.go
@@ -9,17 +9,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cli/cli/api"
-	"github.com/cli/cli/internal/ghinstance"
+	"github.com/cli/cli/v2/api"
+	"github.com/cli/cli/v2/internal/ghinstance"
 )
 
 var scopesError = errors.New("insufficient OAuth scopes")
 
 type emails []email
 
 type email struct {
-	Email    string `json:email`
-	Verified bool   `json:verified`
+	Email string `json:"email"`
 }
 
 func (es emails) String() string {
@@ -33,7 +32,7 @@ func (es emails) String() string {
 type gpgKey struct {
 	KeyId     string    `json:"key_id"`
 	PublicKey string    `json:"public_key"`
-	Emails    emails    `json:emails"`
+	Emails    emails    `json:"emails"`
 	CreatedAt time.Time `json:"created_at"`
 	ExpiresAt time.Time `json:"expires_at"`
 }
diff --git a/pkg/cmd/gpg-key/list/list.go b/pkg/cmd/gpg-key/list/list.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/cli/cli/internal/config"
-	"github.com/cli/cli/pkg/cmdutil"
-	"github.com/cli/cli/pkg/iostreams"
-	"github.com/cli/cli/utils"
+	"github.com/cli/cli/v2/internal/config"
+	"github.com/cli/cli/v2/pkg/cmdutil"
+	"github.com/cli/cli/v2/pkg/iostreams"
+	"github.com/cli/cli/v2/utils"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/gpg-key/list/list_test.go b/pkg/cmd/gpg-key/list/list_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cli/cli/internal/config"
-	"github.com/cli/cli/pkg/httpmock"
-	"github.com/cli/cli/pkg/iostreams"
+	"github.com/cli/cli/v2/internal/config"
+	"github.com/cli/cli/v2/pkg/httpmock"
+	"github.com/cli/cli/v2/pkg/iostreams"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go
@@ -14,6 +14,7 @@ import (
 	extensionCmd "github.com/cli/cli/v2/pkg/cmd/extension"
 	"github.com/cli/cli/v2/pkg/cmd/factory"
 	gistCmd "github.com/cli/cli/v2/pkg/cmd/gist"
+	gpgKeyCmd "github.com/cli/cli/v2/pkg/cmd/gpg-key"
 	issueCmd "github.com/cli/cli/v2/pkg/cmd/issue"
 	prCmd "github.com/cli/cli/v2/pkg/cmd/pr"
 	releaseCmd "github.com/cli/cli/v2/pkg/cmd/release"

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"io/ioutil"`
`9`	`9`	`"net/http"`
`10`	`10`
`11`		`- "github.com/cli/cli/api"`
`12`		`- "github.com/cli/cli/internal/ghinstance"`
	`11`	`+ "github.com/cli/cli/v2/api"`
	`12`	`+ "github.com/cli/cli/v2/internal/ghinstance"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var scopesError = errors.New("insufficient OAuth scopes")`
`@@ -23,7 +23,7 @@ func GPGKeyUpload(httpClient *http.Client, hostname string, keyFile io.Reader) e`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`payload := map[string]string{`
`26`		`- "armored_public_key": string(keyBytes),`
	`26`	`+ "armored_public_key": string(keyBytes),`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`payloadBytes, err := json.Marshal(payload)`