Skip to content

Commit e95c5eb

Browse files
wallyworldwallyworld
committed
All other changes to use macaroon v2 and bakery client v2
1 parent e16b7c8 commit e95c5eb

File tree

81 files changed

+466
-954
lines changed

Some content is hidden

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

81 files changed

+466
-954
lines changed

‎Gopkg.lock

Lines changed: 34 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
[[override]]
3232
name = "gopkg.in/macaroon-bakery.v2-unstable"
33-
revision = "5a131df02b2333d5d75c501743cbc2948ee9bbf0"
33+
branch = "macaroon-v2"
34+
source = "github.com/wallyworld/macaroon-bakery"
3435

3536
[[constraint]]
3637
revision = "4e5a4a63d9b78757b4891b8de60be2606d8972ee"
@@ -110,7 +111,7 @@
110111
name = "github.com/juju/rfc"
111112

112113
[[constraint]]
113-
revision = "958d8b71e5ffa51212133b12a998ddf8362739df"
114+
revision = "fd7cab26ac5f36f7780f7bae4e9331e07dd44802"
114115
name = "github.com/juju/romulus"
115116

116117
[[constraint]]
@@ -150,8 +151,8 @@
150151
revision = "b0d0ce63cbe0c6e31d38e886a8c7cb20979b509d"
151152

152153
[[constraint]]
153-
revision = "5ca139ef9e6bd138ab2ff3c59aee3c472d12ac89"
154-
name = "gopkg.in/juju/charmrepo.v3"
154+
revision = "cd05de29309bc2c97e7334b8316c916203b0be9d"
155+
name = "gopkg.in/juju/charmrepo.v4"
155156

156157
[[constraint]]
157158
revision = "7359fc7857abe2b11b5b3e23811a9c64cb6b01e0"
@@ -298,14 +299,6 @@
298299
name = "github.com/juju/go-oracle-cloud"
299300
revision = "932a8cea00a1cd5cba3829a672c823955db674ae"
300301

301-
[[constraint]]
302-
name = "github.com/juju/httprequest"
303-
revision = "266fd1e9debf09c037a63f074d099a2da4559ece"
304-
305-
[[constraint]]
306-
name = "github.com/juju/idmclient"
307-
revision = "fb1dc7175251ac8e2dc460897313e05175cbbc0d"
308-
309302
[[constraint]]
310303
name = "github.com/juju/loggo"
311304
revision = "6e530bcce5d8e1b51b8e5ee7f08a455cd0a8c2e5"
@@ -336,7 +329,8 @@
336329

337330
[[constraint]]
338331
name = "github.com/juju/terms-client"
339-
revision = "9b925afd677234e4146dde3cb1a11e187cbed64e"
332+
branch = "bakeryv2"
333+
source = "github.com/wallyworld/terms-client"
340334

341335
[[constraint]]
342336
revision = "5f348e78887d8757a402c7bb81e707c3b244c6da"
@@ -354,7 +348,7 @@
354348
name = "github.com/juju/xml"
355349
revision = "eb759a627588d35166bc505fceb51b88500e291e"
356350

357-
[[constraint]]
351+
[[override]]
358352
name = "github.com/julienschmidt/httprouter"
359353
revision = "77a895ad01ebc98a4dc95d8355bc825ce80a56f6"
360354

@@ -403,8 +397,8 @@
403397
revision = "7a535cd943fccaeed196718896beec3fb51aff41"
404398

405399
[[constraint]]
406-
name = "gopkg.in/macaroon.v2-unstable"
407-
revision = "66ab28d0d56f39a383f7cf5cf3ac9a4e9ab32865"
400+
name = "gopkg.in/macaroon.v2"
401+
revision = "1679699b0b723e05f9f16c45b4c6cbd46adb2c78"
408402

409403
[[constraint]]
410404
name = "github.com/prometheus/client_golang"
@@ -494,17 +488,9 @@
494488
name = "gopkg.in/juju/worker.v1"
495489
revision = "19a698a7150fe54ef526b0602069083b4410fc98"
496490

497-
[[override]]
498-
name = "gopkg.in/macaroon-bakery.v1"
499-
revision = "469b44e6f1f9479e115c8ae879ef80695be624d5"
500-
501491
[[override]]
502492
name = "gopkg.in/macaroon-bakery.v2"
503-
revision = "ec9d2ad6796100720c154f614b6dea8798ec1181"
504-
505-
[[override]]
506-
name = "gopkg.in/macaroon.v1"
507-
revision = "ab3940c6c16510a850e1c2dd628b919f0f3f1464"
493+
revision = "6734dc66fe81c761f153bdd3e4ea572a105b6fe0"
508494

509495
[[constraint]]
510496
name = "gopkg.in/mgo.v2"

‎api/provisioner/mocks/machine_mock.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)