Merge pull request #182 from RomainBelorgey/import

Move internal/hub to pkg/hub

internal/commands/account/cmd.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/account/info.go

@@ -29,8 +29,8 @@ import (
 
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/account/info_test.go

@@ -24,7 +24,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
 
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 func TestInfoOutput(t *testing.T) {

internal/commands/account/ratelimiting.go

@@ -28,8 +28,8 @@ import (
 
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/login.go

@@ -28,9 +28,9 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/credentials"
 	"github.com/docker/hub-tool/internal/errdef"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/login"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/org/cmd.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/org/list.go

@@ -28,8 +28,8 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
 	"github.com/docker/hub-tool/internal/format/tabwriter"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/org/members.go

@@ -26,8 +26,8 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
 	"github.com/docker/hub-tool/internal/format/tabwriter"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/org/teams.go

@@ -27,8 +27,8 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
 	"github.com/docker/hub-tool/internal/format/tabwriter"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/repo/cmd.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/repo/list.go

@@ -29,8 +29,8 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
 	"github.com/docker/hub-tool/internal/format/tabwriter"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/repo/rm.go

@@ -32,8 +32,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/hub-tool/internal/ansi"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/root.go

@@ -33,8 +33,8 @@ import (
 	"github.com/docker/hub-tool/internal/commands/tag"
 	"github.com/docker/hub-tool/internal/commands/token"
 	"github.com/docker/hub-tool/internal/credentials"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/login"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 type options struct {

internal/commands/tag/cmd.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/tag/inspect.go

@@ -39,8 +39,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/hub-tool/internal/ansi"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/tag/list.go

@@ -30,8 +30,8 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
 	"github.com/docker/hub-tool/internal/format/tabwriter"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/tag/rm.go

@@ -27,8 +27,8 @@ import (
 	"github.com/docker/distribution/reference"
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/errdef"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

internal/commands/token/activate.go

@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/hub-tool/internal/ansi"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/token/cmd.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/token/create.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/token/deactivate.go

@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/hub-tool/internal/ansi"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/token/inspect.go

@@ -30,8 +30,8 @@ import (
 
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/token/list.go

@@ -29,8 +29,8 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/format"
 	"github.com/docker/hub-tool/internal/format/tabwriter"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/commands/token/rm.go

@@ -27,8 +27,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/hub-tool/internal/ansi"
-	"github.com/docker/hub-tool/internal/hub"
 	"github.com/docker/hub-tool/internal/metrics"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 const (

internal/login/login.go

@@ -33,7 +33,7 @@ import (
 	"github.com/docker/hub-tool/internal/ansi"
 	"github.com/docker/hub-tool/internal/credentials"
 	"github.com/docker/hub-tool/internal/errdef"
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 // RunLogin logs the user and asks for the 2FA code if needed

main.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/docker/hub-tool/internal/commands"
 	"github.com/docker/hub-tool/internal/credentials"
-	"github.com/docker/hub-tool/internal/hub"
+	"github.com/docker/hub-tool/pkg/hub"
 )
 
 func main() {

internal/hub/ratelimiting.go → pkg/hub/ratelimiting.go

@@ -29,17 +29,24 @@ import (
 
 // RateLimits ...
 type RateLimits struct {
-	Limit           *int `json:",omitempty"`
-	LimitWindow     *int `json:",omitempty"`
-	Remaining       *int `json:",omitempty"`
-	RemainingWindow *int `json:",omitempty"`
+	Limit           *int    `json:",omitempty"`
+	LimitWindow     *int    `json:",omitempty"`
+	Remaining       *int    `json:",omitempty"`
+	RemainingWindow *int    `json:",omitempty"`
+	Source          *string `json:",omitempty"`
 }
 
-const (
+var (
 	first  = "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull"
 	second = "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest"
 )
 
+// SetURLs change the base urls used to check ratelimiting values
+func SetURLs(newFirst, newSecond string) {
+	first = newFirst
+	second = newSecond
+}
+
 // GetRateLimits returns the rate limits for the authenticated user
 func (c *Client) GetRateLimits() (*RateLimits, error) {
 	token, err := tryGetToken(c)
@@ -74,35 +81,43 @@ func (c *Client) GetRateLimits() (*RateLimits, error) {
 		return nil, err
 	}
 
+	source := resp.Header.Get("docker-Ratelimit-Source")
+
 	return &RateLimits{
 		Limit:           &limit,
 		LimitWindow:     &limitWindow,
 		Remaining:       &remaining,
 		RemainingWindow: &remainingWindow,
+		Source:          &source,
 	}, nil
 }
 
 func tryGetToken(c *Client) (string, error) {
-	token, err := c.getToken(c.password)
+	token, err := c.getToken("", true)
 	if err != nil {
-		token, err = c.getToken(c.refreshToken)
+		token, err = c.getToken(c.password, false)
 		if err != nil {
-			token, err = c.getToken(c.token)
+			token, err = c.getToken(c.refreshToken, false)
 			if err != nil {
-				return "", err
+				token, err = c.getToken(c.token, false)
+				if err != nil {
+					return "", err
+				}
 			}
 		}
 	}
 	return token, nil
 }
 
-func (c *Client) getToken(password string) (string, error) {
+func (c *Client) getToken(password string, anonymous bool) (string, error) {
 	req, err := http.NewRequest("GET", first, nil)
 	if err != nil {
 		return "", err
 	}
 
-	req.Header.Add("Authorization", "Basic "+basicAuth(c.account, password))
+	if !anonymous {
+		req.Header.Add("Authorization", "Basic "+basicAuth(c.account, password))
+	}
 	resp, err := c.doRawRequest(req)
 	if err != nil {
 		return "", err