Skip to content

Commit 133c07e

Browse files
silvin-lubeckisilvin-lubecki
authored
Merge pull request #182 from RomainBelorgey/import
Move internal/hub to pkg/hub
2 parents 5051946 + 6e40bf0 commit 133c07e

Some content is hidden

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

41 files changed

+52
-37
lines changed

Diff for: ‎internal/commands/account/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/docker/cli/cli/command"
2222
"github.com/spf13/cobra"
2323

24-
"github.com/docker/hub-tool/internal/hub"
24+
"github.com/docker/hub-tool/pkg/hub"
2525
)
2626

2727
const (

Diff for: ‎internal/commands/account/info.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929

3030
"github.com/docker/hub-tool/internal/ansi"
3131
"github.com/docker/hub-tool/internal/format"
32-
"github.com/docker/hub-tool/internal/hub"
3332
"github.com/docker/hub-tool/internal/metrics"
33+
"github.com/docker/hub-tool/pkg/hub"
3434
)
3535

3636
const (

Diff for: ‎internal/commands/account/info_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"gotest.tools/v3/assert"
2525
"gotest.tools/v3/golden"
2626

27-
"github.com/docker/hub-tool/internal/hub"
27+
"github.com/docker/hub-tool/pkg/hub"
2828
)
2929

3030
func TestInfoOutput(t *testing.T) {

Diff for: ‎internal/commands/account/ratelimiting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828

2929
"github.com/docker/hub-tool/internal/ansi"
3030
"github.com/docker/hub-tool/internal/format"
31-
"github.com/docker/hub-tool/internal/hub"
3231
"github.com/docker/hub-tool/internal/metrics"
32+
"github.com/docker/hub-tool/pkg/hub"
3333
)
3434

3535
const (

Diff for: ‎internal/commands/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
"github.com/docker/hub-tool/internal/ansi"
2929
"github.com/docker/hub-tool/internal/credentials"
3030
"github.com/docker/hub-tool/internal/errdef"
31-
"github.com/docker/hub-tool/internal/hub"
3231
"github.com/docker/hub-tool/internal/login"
3332
"github.com/docker/hub-tool/internal/metrics"
33+
"github.com/docker/hub-tool/pkg/hub"
3434
)
3535

3636
const (

Diff for: ‎internal/commands/org/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/docker/cli/cli/command"
2222
"github.com/spf13/cobra"
2323

24-
"github.com/docker/hub-tool/internal/hub"
24+
"github.com/docker/hub-tool/pkg/hub"
2525
)
2626

2727
const (

Diff for: ‎internal/commands/org/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/docker/hub-tool/internal/ansi"
2929
"github.com/docker/hub-tool/internal/format"
3030
"github.com/docker/hub-tool/internal/format/tabwriter"
31-
"github.com/docker/hub-tool/internal/hub"
3231
"github.com/docker/hub-tool/internal/metrics"
32+
"github.com/docker/hub-tool/pkg/hub"
3333
)
3434

3535
const (

Diff for: ‎internal/commands/org/members.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/docker/hub-tool/internal/ansi"
2727
"github.com/docker/hub-tool/internal/format"
2828
"github.com/docker/hub-tool/internal/format/tabwriter"
29-
"github.com/docker/hub-tool/internal/hub"
3029
"github.com/docker/hub-tool/internal/metrics"
30+
"github.com/docker/hub-tool/pkg/hub"
3131
)
3232

3333
const (

Diff for: ‎internal/commands/org/teams.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/docker/hub-tool/internal/ansi"
2828
"github.com/docker/hub-tool/internal/format"
2929
"github.com/docker/hub-tool/internal/format/tabwriter"
30-
"github.com/docker/hub-tool/internal/hub"
3130
"github.com/docker/hub-tool/internal/metrics"
31+
"github.com/docker/hub-tool/pkg/hub"
3232
)
3333

3434
const (

Diff for: ‎internal/commands/repo/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/docker/cli/cli/command"
2222
"github.com/spf13/cobra"
2323

24-
"github.com/docker/hub-tool/internal/hub"
24+
"github.com/docker/hub-tool/pkg/hub"
2525
)
2626

2727
const (

Diff for: ‎internal/commands/repo/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"github.com/docker/hub-tool/internal/ansi"
3030
"github.com/docker/hub-tool/internal/format"
3131
"github.com/docker/hub-tool/internal/format/tabwriter"
32-
"github.com/docker/hub-tool/internal/hub"
3332
"github.com/docker/hub-tool/internal/metrics"
33+
"github.com/docker/hub-tool/pkg/hub"
3434
)
3535

3636
const (

Diff for: ‎internal/commands/repo/rm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"github.com/spf13/cobra"
3333

3434
"github.com/docker/hub-tool/internal/ansi"
35-
"github.com/docker/hub-tool/internal/hub"
3635
"github.com/docker/hub-tool/internal/metrics"
36+
"github.com/docker/hub-tool/pkg/hub"
3737
)
3838

3939
const (

Diff for: ‎internal/commands/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"github.com/docker/hub-tool/internal/commands/tag"
3434
"github.com/docker/hub-tool/internal/commands/token"
3535
"github.com/docker/hub-tool/internal/credentials"
36-
"github.com/docker/hub-tool/internal/hub"
3736
"github.com/docker/hub-tool/internal/login"
37+
"github.com/docker/hub-tool/pkg/hub"
3838
)
3939

4040
type options struct {

Diff for: ‎internal/commands/tag/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/docker/cli/cli/command"
2222
"github.com/spf13/cobra"
2323

24-
"github.com/docker/hub-tool/internal/hub"
24+
"github.com/docker/hub-tool/pkg/hub"
2525
)
2626

2727
const (

Diff for: ‎internal/commands/tag/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import (
3939
"github.com/spf13/cobra"
4040

4141
"github.com/docker/hub-tool/internal/ansi"
42-
"github.com/docker/hub-tool/internal/hub"
4342
"github.com/docker/hub-tool/internal/metrics"
43+
"github.com/docker/hub-tool/pkg/hub"
4444
)
4545

4646
const (

Diff for: ‎internal/commands/tag/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/docker/hub-tool/internal/ansi"
3131
"github.com/docker/hub-tool/internal/format"
3232
"github.com/docker/hub-tool/internal/format/tabwriter"
33-
"github.com/docker/hub-tool/internal/hub"
3433
"github.com/docker/hub-tool/internal/metrics"
34+
"github.com/docker/hub-tool/pkg/hub"
3535
)
3636

3737
const (

Diff for: ‎internal/commands/tag/rm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/docker/distribution/reference"
2828
"github.com/docker/hub-tool/internal/ansi"
2929
"github.com/docker/hub-tool/internal/errdef"
30-
"github.com/docker/hub-tool/internal/hub"
3130
"github.com/docker/hub-tool/internal/metrics"
31+
"github.com/docker/hub-tool/pkg/hub"
3232
"github.com/pkg/errors"
3333
"github.com/spf13/cobra"
3434
)

Diff for: ‎internal/commands/token/activate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/spf13/cobra"
2626

2727
"github.com/docker/hub-tool/internal/ansi"
28-
"github.com/docker/hub-tool/internal/hub"
2928
"github.com/docker/hub-tool/internal/metrics"
29+
"github.com/docker/hub-tool/pkg/hub"
3030
)
3131

3232
const (

Diff for: ‎internal/commands/token/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/docker/cli/cli/command"
2222
"github.com/spf13/cobra"
2323

24-
"github.com/docker/hub-tool/internal/hub"
24+
"github.com/docker/hub-tool/pkg/hub"
2525
)
2626

2727
const (

Diff for: ‎internal/commands/token/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626

2727
"github.com/docker/hub-tool/internal/ansi"
2828
"github.com/docker/hub-tool/internal/format"
29-
"github.com/docker/hub-tool/internal/hub"
3029
"github.com/docker/hub-tool/internal/metrics"
30+
"github.com/docker/hub-tool/pkg/hub"
3131
)
3232

3333
const (

Diff for: ‎internal/commands/token/deactivate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/spf13/cobra"
2626

2727
"github.com/docker/hub-tool/internal/ansi"
28-
"github.com/docker/hub-tool/internal/hub"
2928
"github.com/docker/hub-tool/internal/metrics"
29+
"github.com/docker/hub-tool/pkg/hub"
3030
)
3131

3232
const (

Diff for: ‎internal/commands/token/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030

3131
"github.com/docker/hub-tool/internal/ansi"
3232
"github.com/docker/hub-tool/internal/format"
33-
"github.com/docker/hub-tool/internal/hub"
3433
"github.com/docker/hub-tool/internal/metrics"
34+
"github.com/docker/hub-tool/pkg/hub"
3535
)
3636

3737
const (

Diff for: ‎internal/commands/token/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"github.com/docker/hub-tool/internal/ansi"
3030
"github.com/docker/hub-tool/internal/format"
3131
"github.com/docker/hub-tool/internal/format/tabwriter"
32-
"github.com/docker/hub-tool/internal/hub"
3332
"github.com/docker/hub-tool/internal/metrics"
33+
"github.com/docker/hub-tool/pkg/hub"
3434
)
3535

3636
const (

Diff for: ‎internal/commands/token/rm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/spf13/cobra"
2828

2929
"github.com/docker/hub-tool/internal/ansi"
30-
"github.com/docker/hub-tool/internal/hub"
3130
"github.com/docker/hub-tool/internal/metrics"
31+
"github.com/docker/hub-tool/pkg/hub"
3232
)
3333

3434
const (

Diff for: ‎internal/login/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/docker/hub-tool/internal/ansi"
3434
"github.com/docker/hub-tool/internal/credentials"
3535
"github.com/docker/hub-tool/internal/errdef"
36-
"github.com/docker/hub-tool/internal/hub"
36+
"github.com/docker/hub-tool/pkg/hub"
3737
)
3838

3939
// RunLogin logs the user and asks for the 2FA code if needed

Diff for: ‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
"github.com/docker/hub-tool/internal/commands"
3232
"github.com/docker/hub-tool/internal/credentials"
33-
"github.com/docker/hub-tool/internal/hub"
33+
"github.com/docker/hub-tool/pkg/hub"
3434
)
3535

3636
func main() {

Diff for: ‎internal/hub/client.go renamed to ‎pkg/hub/client.go

File renamed without changes.

Diff for: ‎internal/hub/client_test.go renamed to ‎pkg/hub/client_test.go

File renamed without changes.

Diff for: ‎internal/hub/consumption.go renamed to ‎pkg/hub/consumption.go

File renamed without changes.

Diff for: ‎internal/hub/error.go renamed to ‎pkg/hub/error.go

File renamed without changes.

Diff for: ‎internal/hub/error_test.go renamed to ‎pkg/hub/error_test.go

File renamed without changes.

Diff for: ‎internal/hub/instances.go renamed to ‎pkg/hub/instances.go

File renamed without changes.

Diff for: ‎internal/hub/members.go renamed to ‎pkg/hub/members.go

File renamed without changes.

Diff for: ‎internal/hub/organizations.go renamed to ‎pkg/hub/organizations.go

File renamed without changes.

Diff for: ‎internal/hub/plan.go renamed to ‎pkg/hub/plan.go

File renamed without changes.

Diff for: ‎internal/hub/ratelimiting.go renamed to ‎pkg/hub/ratelimiting.go

+26-11
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,24 @@ import (
2929

3030
// RateLimits ...
3131
type RateLimits struct {
32-
Limit *int `json:",omitempty"`
33-
LimitWindow *int `json:",omitempty"`
34-
Remaining *int `json:",omitempty"`
35-
RemainingWindow *int `json:",omitempty"`
32+
Limit *int `json:",omitempty"`
33+
LimitWindow *int `json:",omitempty"`
34+
Remaining *int `json:",omitempty"`
35+
RemainingWindow *int `json:",omitempty"`
36+
Source *string `json:",omitempty"`
3637
}
3738

38-
const (
39+
var (
3940
first = "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull"
4041
second = "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest"
4142
)
4243

44+
// SetURLs change the base urls used to check ratelimiting values
45+
func SetURLs(newFirst, newSecond string) {
46+
first = newFirst
47+
second = newSecond
48+
}
49+
4350
// GetRateLimits returns the rate limits for the authenticated user
4451
func (c *Client) GetRateLimits() (*RateLimits, error) {
4552
token, err := tryGetToken(c)
@@ -74,35 +81,43 @@ func (c *Client) GetRateLimits() (*RateLimits, error) {
7481
return nil, err
7582
}
7683

84+
source := resp.Header.Get("docker-Ratelimit-Source")
85+
7786
return &RateLimits{
7887
Limit: &limit,
7988
LimitWindow: &limitWindow,
8089
Remaining: &remaining,
8190
RemainingWindow: &remainingWindow,
91+
Source: &source,
8292
}, nil
8393
}
8494

8595
func tryGetToken(c *Client) (string, error) {
86-
token, err := c.getToken(c.password)
96+
token, err := c.getToken("", true)
8797
if err != nil {
88-
token, err = c.getToken(c.refreshToken)
98+
token, err = c.getToken(c.password, false)
8999
if err != nil {
90-
token, err = c.getToken(c.token)
100+
token, err = c.getToken(c.refreshToken, false)
91101
if err != nil {
92-
return "", err
102+
token, err = c.getToken(c.token, false)
103+
if err != nil {
104+
return "", err
105+
}
93106
}
94107
}
95108
}
96109
return token, nil
97110
}
98111

99-
func (c *Client) getToken(password string) (string, error) {
112+
func (c *Client) getToken(password string, anonymous bool) (string, error) {
100113
req, err := http.NewRequest("GET", first, nil)
101114
if err != nil {
102115
return "", err
103116
}
104117

105-
req.Header.Add("Authorization", "Basic "+basicAuth(c.account, password))
118+
if !anonymous {
119+
req.Header.Add("Authorization", "Basic "+basicAuth(c.account, password))
120+
}
106121
resp, err := c.doRawRequest(req)
107122
if err != nil {
108123
return "", err

Diff for: ‎internal/hub/repositories.go renamed to ‎pkg/hub/repositories.go

File renamed without changes.

Diff for: ‎internal/hub/tags.go renamed to ‎pkg/hub/tags.go

File renamed without changes.

Diff for: ‎internal/hub/teams.go renamed to ‎pkg/hub/teams.go

File renamed without changes.

Diff for: ‎internal/hub/tokens.go renamed to ‎pkg/hub/tokens.go

File renamed without changes.

Diff for: ‎internal/hub/user.go renamed to ‎pkg/hub/user.go

File renamed without changes.

0 commit comments

Comments
 (0)