Skip to content

Commit 183cbcf

Browse files
wallyworldwallyworld
committed
Update to use juju/utils/v3
1 parent 4d65952 commit 183cbcf

File tree

541 files changed

+657
-690
lines changed

Some content is hidden

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

541 files changed

+657
-690
lines changed

‎agent/agent.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/juju/errors"
1818
"github.com/juju/loggo"
1919
"github.com/juju/names/v4"
20-
"github.com/juju/utils/v2"
21-
"github.com/juju/utils/v2/shell"
20+
"github.com/juju/utils/v3"
21+
"github.com/juju/utils/v3/shell"
2222
"github.com/juju/version/v2"
2323

2424
"github.com/juju/juju/api"

‎agent/agentbootstrap/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/juju/mgo/v2"
1616
"github.com/juju/names/v4"
1717
"github.com/juju/os/v2/series"
18-
"github.com/juju/utils/v2"
18+
"github.com/juju/utils/v3"
1919

2020
"github.com/juju/juju/agent"
2121
apiagent "github.com/juju/juju/api/agent"

‎agent/agentbootstrap/bootstrap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/juju/names/v4"
1313
gitjujutesting "github.com/juju/testing"
1414
jc "github.com/juju/testing/checkers"
15-
"github.com/juju/utils/v2"
15+
"github.com/juju/utils/v3"
1616
gc "gopkg.in/check.v1"
1717

1818
"github.com/juju/juju/agent"

‎agent/format-2.0_whitebox_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"path/filepath"
1313

1414
jc "github.com/juju/testing/checkers"
15-
"github.com/juju/utils/v2"
15+
"github.com/juju/utils/v3"
1616
"github.com/juju/version/v2"
1717
gc "gopkg.in/check.v1"
1818

‎agent/identity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88

99
"github.com/juju/errors"
10-
"github.com/juju/utils/v2"
10+
"github.com/juju/utils/v3"
1111
)
1212

1313
var ErrNoStateServingInfo = errors.New("StateServingInfo missing")

‎agent/tools/symlinks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/utils/v2/symlink"
11+
"github.com/juju/utils/v3/symlink"
1212

1313
"github.com/juju/juju/juju/names"
1414
)

‎agent/tools/symlinks_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"time"
1111

1212
jc "github.com/juju/testing/checkers"
13-
"github.com/juju/utils/v2"
14-
"github.com/juju/utils/v2/symlink"
13+
"github.com/juju/utils/v3"
14+
"github.com/juju/utils/v3/symlink"
1515
gc "gopkg.in/check.v1"
1616

1717
"github.com/juju/juju/agent/tools"

‎agent/tools/toolsdir.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"strings"
1717

1818
"github.com/juju/errors"
19-
"github.com/juju/utils/v2/symlink"
19+
"github.com/juju/utils/v3/symlink"
2020
"github.com/juju/version/v2"
2121

2222
coretools "github.com/juju/juju/tools"

‎api/agent/unit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/juju/names/v4"
1010
jc "github.com/juju/testing/checkers"
11-
"github.com/juju/utils/v2"
11+
"github.com/juju/utils/v3"
1212
gc "gopkg.in/check.v1"
1313

1414
"github.com/juju/juju/api"

‎api/apiclient.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
jujuhttp "github.com/juju/http/v2"
2929
"github.com/juju/loggo"
3030
"github.com/juju/names/v4"
31-
"github.com/juju/utils/v2"
32-
"github.com/juju/utils/v2/parallel"
31+
"github.com/juju/utils/v3"
32+
"github.com/juju/utils/v3/parallel"
3333
"github.com/juju/version/v2"
3434
"gopkg.in/macaroon.v2"
3535
"gopkg.in/retry.v1"
@@ -242,8 +242,10 @@ func Open(info *Info, opts DialOpts) (Connection, error) {
242242
// for everything, but it's easier just to leave it in place.
243243
bakeryClient.Client.Transport = &hostSwitchingTransport{
244244
primaryHost: dialResult.addr,
245-
primary: utils.NewHttpTLSTransport(dialResult.tlsConfig),
246-
fallback: http.DefaultTransport,
245+
primary: jujuhttp.NewHTTPTLSTransport(jujuhttp.TransportConfig{
246+
TLSConfig: dialResult.tlsConfig,
247+
}),
248+
fallback: http.DefaultTransport,
247249
}
248250

249251
// Prefer the SNI hostname or controller name for the cookie URL

‎api/certpool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"path/filepath"
1111

1212
"github.com/juju/errors"
13-
"github.com/juju/utils/v2/cert"
13+
"github.com/juju/utils/v3/cert"
1414

1515
"github.com/juju/juju/core/paths"
1616
)

‎api/controller/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/juju/names/v4"
1212
jujutesting "github.com/juju/testing"
1313
jc "github.com/juju/testing/checkers"
14-
"github.com/juju/utils/v2"
14+
"github.com/juju/utils/v3"
1515
gc "gopkg.in/check.v1"
1616
"gopkg.in/macaroon.v2"
1717

‎api/firewaller/firewaller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package firewaller_test
66
import (
77
"github.com/juju/names/v4"
88
jc "github.com/juju/testing/checkers"
9-
"github.com/juju/utils/v2"
9+
"github.com/juju/utils/v3"
1010
gc "gopkg.in/check.v1"
1111

1212
"github.com/juju/juju/api"

‎api/keymanager/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package keymanager
55

66
import (
7-
"github.com/juju/utils/v2/ssh"
7+
"github.com/juju/utils/v3/ssh"
88

99
"github.com/juju/juju/api/base"
1010
"github.com/juju/juju/apiserver/params"

‎api/keymanager/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/juju/errors"
1010
jc "github.com/juju/testing/checkers"
11-
"github.com/juju/utils/v2/ssh"
12-
sshtesting "github.com/juju/utils/v2/ssh/testing"
11+
"github.com/juju/utils/v3/ssh"
12+
sshtesting "github.com/juju/utils/v3/ssh/testing"
1313
gc "gopkg.in/check.v1"
1414

1515
"github.com/juju/juju/api/keymanager"

‎api/machineactions/machineactions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/juju/names/v4"
1010
jujutesting "github.com/juju/testing"
1111
jc "github.com/juju/testing/checkers"
12-
"github.com/juju/utils/v2"
12+
"github.com/juju/utils/v3"
1313
gc "gopkg.in/check.v1"
1414

1515
apitesting "github.com/juju/juju/api/base/testing"

‎api/metricsadder/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/juju/names/v4"
1010
jc "github.com/juju/testing/checkers"
11-
"github.com/juju/utils/v2"
11+
"github.com/juju/utils/v3"
1212
gc "gopkg.in/check.v1"
1313

1414
"github.com/juju/juju/api/metricsadder"

‎api/migrationmaster/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/juju/names/v4"
1919
jujutesting "github.com/juju/testing"
2020
jc "github.com/juju/testing/checkers"
21-
"github.com/juju/utils/v2"
21+
"github.com/juju/utils/v3"
2222
"github.com/juju/version/v2"
2323
gc "gopkg.in/check.v1"
2424
"gopkg.in/httprequest.v1"

‎api/provisioner/provisioner_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/juju/errors"
1212
"github.com/juju/names/v4"
1313
jc "github.com/juju/testing/checkers"
14-
"github.com/juju/utils/v2"
15-
"github.com/juju/utils/v2/arch"
14+
"github.com/juju/utils/v3"
15+
"github.com/juju/utils/v3/arch"
1616
gc "gopkg.in/check.v1"
1717

1818
"github.com/juju/juju/api"

‎api/resources/client/client_upload_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
apicharm "github.com/juju/juju/api/common/charm"
1717
"github.com/juju/testing"
1818
jc "github.com/juju/testing/checkers"
19-
"github.com/juju/utils/v2"
19+
"github.com/juju/utils/v3"
2020
gc "gopkg.in/check.v1"
2121

2222
"github.com/juju/juju/api/resources/client"

‎api/state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/juju/errors"
1616
"github.com/juju/featureflag"
1717
"github.com/juju/names/v4"
18-
"github.com/juju/utils/v2"
18+
"github.com/juju/utils/v3"
1919
"github.com/juju/version/v2"
2020
"gopkg.in/macaroon.v2"
2121

‎api/state_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/juju/errors"
1010
"github.com/juju/names/v4"
1111
jc "github.com/juju/testing/checkers"
12-
"github.com/juju/utils/v2"
12+
"github.com/juju/utils/v3"
1313
gc "gopkg.in/check.v1"
1414
"gopkg.in/macaroon.v2"
1515

‎api/uniter/unit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/juju/names/v4"
1212
"github.com/juju/testing"
1313
jc "github.com/juju/testing/checkers"
14-
"github.com/juju/utils/v2"
14+
"github.com/juju/utils/v3"
1515
gc "gopkg.in/check.v1"
1616

1717
basetesting "github.com/juju/juju/api/base/testing"

‎api/upgrader/unitupgrader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package upgrader_test
66
import (
77
"github.com/juju/errors"
88
jc "github.com/juju/testing/checkers"
9-
"github.com/juju/utils/v2"
9+
"github.com/juju/utils/v3"
1010
"github.com/juju/version/v2"
1111
gc "gopkg.in/check.v1"
1212

‎api/watcher/watcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers"
1212
"github.com/juju/names/v4"
1313
jc "github.com/juju/testing/checkers"
14-
"github.com/juju/utils/v2"
14+
"github.com/juju/utils/v3"
1515
"github.com/juju/worker/v3"
1616
"github.com/juju/worker/v3/workertest"
1717
gc "gopkg.in/check.v1"

‎apiserver/admin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/juju/loggo"
2222
"github.com/juju/names/v4"
2323
jc "github.com/juju/testing/checkers"
24-
"github.com/juju/utils/v2"
24+
"github.com/juju/utils/v3"
2525
gc "gopkg.in/check.v1"
2626

2727
"github.com/juju/juju/api"

‎apiserver/apiserver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/juju/loggo"
2525
"github.com/juju/names/v4"
2626
jc "github.com/juju/testing/checkers"
27-
"github.com/juju/utils/v2"
27+
"github.com/juju/utils/v3"
2828
"github.com/juju/worker/v3/dependency"
2929
"github.com/juju/worker/v3/workertest"
3030
gc "gopkg.in/check.v1"

‎apiserver/authentication/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88

99
jc "github.com/juju/testing/checkers"
10-
"github.com/juju/utils/v2"
10+
"github.com/juju/utils/v3"
1111
gc "gopkg.in/check.v1"
1212

1313
"github.com/juju/juju/apiserver/authentication"

‎apiserver/authentication/user_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/juju/names/v4"
1818
"github.com/juju/testing"
1919
jc "github.com/juju/testing/checkers"
20-
"github.com/juju/utils/v2"
20+
"github.com/juju/utils/v3"
2121
gc "gopkg.in/check.v1"
2222
"gopkg.in/macaroon.v2"
2323

‎apiserver/backup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/juju/errors"
1414
jc "github.com/juju/testing/checkers"
15-
"github.com/juju/utils/v2"
15+
"github.com/juju/utils/v3"
1616
gc "gopkg.in/check.v1"
1717

1818
"github.com/juju/juju/apiserver"

‎apiserver/charms.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/juju/charm/v8"
2323
"github.com/juju/errors"
24-
ziputil "github.com/juju/utils/v2/zip"
24+
ziputil "github.com/juju/utils/v3/zip"
2525

2626
"github.com/juju/juju/apiserver/common"
2727
apiservererrors "github.com/juju/juju/apiserver/errors"

‎apiserver/charms_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/juju/charm/v8"
2222
jc "github.com/juju/testing/checkers"
23-
"github.com/juju/utils/v2"
23+
"github.com/juju/utils/v3"
2424
gc "gopkg.in/check.v1"
2525

2626
"github.com/juju/juju/apiserver/common"

‎apiserver/common/action_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/juju/errors"
99
"github.com/juju/names/v4"
1010
jc "github.com/juju/testing/checkers"
11-
"github.com/juju/utils/v2"
11+
"github.com/juju/utils/v3"
1212
gc "gopkg.in/check.v1"
1313

1414
"github.com/juju/juju/apiserver/common"

‎apiserver/common/cloudspec/cloudspec_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/juju/names/v4"
1010
"github.com/juju/testing"
1111
jc "github.com/juju/testing/checkers"
12-
"github.com/juju/utils/v2"
12+
"github.com/juju/utils/v3"
1313
gc "gopkg.in/check.v1"
1414

1515
"github.com/juju/juju/apiserver/common"

‎apiserver/common/common_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/juju/names/v4"
1111
jc "github.com/juju/testing/checkers"
12-
"github.com/juju/utils/v2"
12+
"github.com/juju/utils/v3"
1313
gc "gopkg.in/check.v1"
1414

1515
"github.com/juju/juju/apiserver/common"

‎apiserver/common/controllerconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/juju/errors"
1010
"github.com/juju/names/v4"
1111
jc "github.com/juju/testing/checkers"
12-
"github.com/juju/utils/v2"
12+
"github.com/juju/utils/v3"
1313
gc "gopkg.in/check.v1"
1414

1515
"github.com/juju/juju/apiserver/common"

‎apiserver/common/crossmodel/auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/juju/errors"
1717
"github.com/juju/names/v4"
1818
jc "github.com/juju/testing/checkers"
19-
"github.com/juju/utils/v2"
19+
"github.com/juju/utils/v3"
2020
gc "gopkg.in/check.v1"
2121
"gopkg.in/macaroon.v2"
2222

‎apiserver/common/leadership_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/juju/errors"
99
"github.com/juju/names/v4"
1010
jc "github.com/juju/testing/checkers"
11-
"github.com/juju/utils/v2"
11+
"github.com/juju/utils/v3"
1212
gc "gopkg.in/check.v1"
1313

1414
"github.com/juju/juju/apiserver/common"

‎apiserver/common/tools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/juju/errors"
1010
"github.com/juju/names/v4"
1111
jc "github.com/juju/testing/checkers"
12-
"github.com/juju/utils/v2/arch"
12+
"github.com/juju/utils/v3/arch"
1313
"github.com/juju/version/v2"
1414
gc "gopkg.in/check.v1"
1515

‎apiserver/facades/agent/caasapplication/application.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/juju/loggo"
1515
"github.com/juju/names/v4"
1616
"github.com/juju/retry"
17-
"github.com/juju/utils/v2"
17+
"github.com/juju/utils/v3"
1818

1919
"github.com/juju/juju/agent"
2020
apiservererrors "github.com/juju/juju/apiserver/errors"

‎apiserver/facades/agent/keyupdater/authorisedkeys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package keyupdater
66
import (
77
"github.com/juju/errors"
88
"github.com/juju/names/v4"
9-
"github.com/juju/utils/v2/ssh"
9+
"github.com/juju/utils/v3/ssh"
1010

1111
"github.com/juju/juju/apiserver/common"
1212
apiservererrors "github.com/juju/juju/apiserver/errors"

0 commit comments

Comments
 (0)