toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump github.com/dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a4f59e9e70764ea6f6901cf17b88059789

Browse Source 
full diff:

- a2c85815a7...v3.2.0
  - https://github.com/dgrijalva/jwt-go/blob/v3.2.0/VERSION_HISTORY.md
- 9781369abd...5f0f1276fe42dd721c1c093604995a9f758ace21

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2019-06-11 16:10:33 +02:00
parent 79578882a1
commit dd87cd9feb
25 changed files with 630 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/engine/activate_test.go
View File

@ -119,7 +119,7 @@ func (c mockLicenseClient) StoreLicense(ctx context.Context, dclnt licensing.Wra
func (c mockLicenseClient) LoadLocalLicense(ctx context.Context, dclnt licensing.WrappedDockerClient) (*model.Subscription, error) {
return nil, fmt.Errorf("not implemented")
}
func (c mockLicenseClient) SummarizeLicense(res *model.CheckResponse, keyID string) *model.Subscription {
func (c mockLicenseClient) SummarizeLicense(res *model.CheckResponse) *model.Subscription {
return nil
}
func TestActivateDisplayOnlyHub(t *testing.T) {

8
cli/command/engine/licenses_test.go
View File

@ -40,8 +40,8 @@ func TestSubscriptionContextWrite(t *testing.T) {
},
{
formatter.Context{Format: NewSubscriptionsFormat("table", true)},
`1:License Name: name1 Quantity: 10 nodes Expiration date: 2020-01-01
2:License Name: name2 Quantity: 20 nodes Expiration date: 2020-01-01
`1:License Name: name1 Components: 10 nodes Expiration date: 2020-01-01
2:License Name: name2 Components: 20 nodes Expiration date: 2020-01-01
`,
},
{
@ -197,7 +197,7 @@ func TestSubscriptionContextWriteJSON(t *testing.T) {
"ProductRatePlan": "",
"ProductRatePlanID": "",
"State": "",
"Summary": "License Name: name1\tQuantity: 10 nodes\tExpiration date: 2020-01-01",
"Summary": "License Name: name1\tComponents: 10 nodes\tExpiration date: 2020-01-01",
},
{
"Owner": "owner2",
@ -219,7 +219,7 @@ func TestSubscriptionContextWriteJSON(t *testing.T) {
"ProductRatePlan": "",
"ProductRatePlanID": "",
"State": "",
"Summary": "License Name: name2\tQuantity: 20 nodes\tExpiration date: 2020-01-01",
"Summary": "License Name: name2\tComponents: 20 nodes\tExpiration date: 2020-01-01",
},
}

2
cli/command/engine/testdata/expired-license-display-only.golden vendored
View File

@ -1 +1 @@
License: Quantity: 1 Nodes Expiration date: 2018-03-18 Expired! You will no longer receive updates. Please renew at https://docker.com/licensing
License: Components: 1 Nodes Expiration date: 2018-03-18 Expired! You will no longer receive updates. Please renew at https://docker.com/licensing