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.

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

Support dep #606

Merged
merged 4 commits into from
Oct 11, 2017
Merged

Support dep #606

merged 4 commits into from
Oct 11, 2017

Conversation

joshuarubin
Copy link

@joshuarubin joshuarubin commented Oct 9, 2017

This is a patch against v0.9.13, and requires #605, but there was no branch based on that at present, so I apologize for requesting this against master.

This adds a Gopkg.toml file so that dep can be supported. You can continue to use glide if you keep the Gopkg.toml up-to-date too. The reason that this is useful, for packages that use the hydra sdk, is that dep will recursively resolve dependencies using the Gopkg.toml file.

Right now, we have to add overrides for each of hydra's dependencies which is less than ideal.

Joshua Rubin added 2 commits October 9, 2017 14:21
Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
@aeneasr
Copy link
Member

aeneasr commented Oct 10, 2017

I see, use of dep makes sense, the idea is to transition at some point anyhow. However, I had some issues with dep on windows which is why it's not included yet. I'm however open to accepting this change.

One thing though, could you add dep tests to travis.yml (similar to glide tests)?

Also, here's a 0.9.x branch: https://github.com/ory/hydra/tree/v0.9.x

@joshuarubin joshuarubin changed the base branch from master to v0.9.x October 10, 2017 15:52
Joshua Rubin added 2 commits October 10, 2017 21:23
Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
@joshuarubin
Copy link
Author

OK, based on v0.9.x and all glide and dep tests now pass

@aeneasr aeneasr merged commit f2f8f7a into ory:v0.9.x Oct 11, 2017
@aeneasr
Copy link
Member

aeneasr commented Oct 11, 2017

Thank you!

@joshuarubin joshuarubin mentioned this pull request Oct 11, 2017
@joshuarubin joshuarubin deleted the support_dep branch October 11, 2017 19:15
aeneasr pushed a commit that referenced this pull request Oct 25, 2017
* vendor: support dep (#606)

* fix go-jose

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* add Gopkg.toml

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* add tests for dep

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* fix glide build

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* warden/groups: add ability to list all groups (#612)

* add ability to list all groups

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* update based on review comments

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* a few more updates from review

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* ensure group lists dont return nil

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* support es256

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

* update jwk tests

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants