Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a #1936

Merged
merged 1 commit into from
Dec 12, 2019
Merged

bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a #1936

merged 1 commit into from
Dec 12, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 11, 2019 •
edited
Loading

@thaJeztah thaJeztah changed the title bump github.com/dgrijalva/jwt-go v3.2.0 [WIP] bump github.com/dgrijalva/jwt-go v3.2.0 Jun 13, 2019
@thaJeztah
Copy link
Member Author

thaJeztah commented Jun 13, 2019 •
edited
Loading

Looks like this needs changes upstream first; docker-archive/licensing#25 docker-archive/licensing#27

@thaJeztah thaJeztah mentioned this pull request Jun 17, 2019
Merged
@thaJeztah thaJeztah changed the title [WIP] bump github.com/dgrijalva/jwt-go v3.2.0 bump github.com/dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a4f59e9e70764ea6f6901cf17b88059789 Jun 20, 2019
@thaJeztah
Copy link
Member Author

@silvin-lubecki @mason-fish ptal

@thaJeztah thaJeztah changed the title bump github.com/dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a4f59e9e70764ea6f6901cf17b88059789 bump github.com/dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a Jun 20, 2019
@thaJeztah thaJeztah changed the title bump github.com/dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a Jun 20, 2019
@thaJeztah
Copy link
Member Author

thaJeztah commented Jun 25, 2019 •
edited
Loading

Ah, whoops; looks like I forgot some local changes related to docker-archive/licensing#24 🤔

# github.com/docker/cli/internal/licenseutils
internal/licenseutils/utils.go:169:33: too many arguments in call to lclient.SummarizeLicense
	have (*model.CheckResponse, string)
	want (*model.CheckResponse)

@thaJeztah thaJeztah force-pushed the bump_jwt_go branch 3 times, most recently from e7c6900 to 514badc Compare June 25, 2019 14:14
@thaJeztah
Copy link
Member Author

One failure left; need to look if this is the expected result for an expired license;

=== FAIL: cli/command/engine TestActivateExpiredLicenseDryRun (0.00s)
    activate_test.go:77: assertion failed: 
        --- expected
        +++ actual
        @@ -1,2 +1,2 @@
        -License: Components: 1 Nodes	Expiration date: 2018-03-18	Expired! You will no longer receive updates. Please renew at https://docker.com/licensing
        +License: Components: 	Expiration date: 2018-03-18	Expired! You will no longer receive updates. Please renew at https://docker.com/licensing

@andrewhsu andrewhsu requested a review from mason-fish June 25, 2019 18:29
@thaJeztah thaJeztah mentioned this pull request Jun 26, 2019
Merged
@thaJeztah thaJeztah changed the title bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a [WIP] bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a Jun 26, 2019
@thaJeztah
Copy link
Member Author

WIP again; opened a PR to fix the test docker-archive/licensing#28, and added a temporary commit to vendor from my branch

@codecov-io
Copy link

Codecov Report

Merging #1936 into master will not change coverage.
The diff coverage is 0%.

@@           Coverage Diff           @@
##           master    #1936   +/-   ##
=======================================
  Coverage   56.74%   56.74%           
=======================================
  Files         310      310           
  Lines       21801    21801           
=======================================
  Hits        12370    12370           
  Misses       8517     8517           
  Partials      914      914

@codecov-io
Copy link

codecov-io commented Jun 26, 2019 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@7957888). Click here to learn what that means.
The diff coverage is 0%.

@@            Coverage Diff            @@
##             master    #1936   +/-   ##
=========================================
  Coverage          ?   56.78%           
=========================================
  Files             ?      311           
  Lines             ?    21832           
  Branches          ?        0           
=========================================
  Hits              ?    12398           
  Misses            ?     8519           
  Partials          ?      915

thaJeztah
thaJeztah commented Jun 26, 2019
View reviewed changes
vendor.conf Outdated Show resolved Hide resolved
@thaJeztah thaJeztah changed the title [WIP] bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a bump dgrijalva/jwt-go v3.2.0, docker/licencing 7c3de6a Jul 2, 2019
@thaJeztah
Copy link
Member Author

@silvin-lubecki @vdemeester I removed the temporary commit; this should be ready to go now

vdemeester
vdemeester approved these changes Jul 3, 2019
View reviewed changes
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

@thaJeztah
Copy link
Member Author

rebased; @silvin-lubecki PTAL

silvin-lubecki
silvin-lubecki approved these changes Dec 12, 2019
View reviewed changes
Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit 0fd5c16 into docker:master Dec 12, 2019
@thaJeztah thaJeztah deleted the bump_jwt_go branch December 12, 2019 13:50
@thaJeztah thaJeztah added this to the 20.03.0 milestone Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silvin-lubecki silvin-lubecki silvin-lubecki approved these changes

@vdemeester vdemeester vdemeester approved these changes

@mason-fish mason-fish Awaiting requested review from mason-fish

Assignees
No one assigned
Labels
status/2-code-review
Projects
None yet
Milestone
20.10.0
Development

Successfully merging this pull request may close these issues.
5 participants
@thaJeztah @codecov-io @vdemeester @silvin-lubecki @GordonTheTurtle