Merge branch '2.8' into 2.9

sdg0919 · Mar 24, 2021 · d0612d5 · d0612d5
2 parents b070cb4 + b094caf
commit d0612d5
Show file tree

Hide file tree

Showing 35 changed files with 82 additions and 58 deletions.
diff --git a/acceptancetests/jujupy/k8s_provider/microk8s.py b/acceptancetests/jujupy/k8s_provider/microk8s.py
@@ -95,7 +95,7 @@ def enable_microk8s_addons(self, addons=None):
                 addons.append('rbac')
         else:
             addons = [addon for addon in addons if addon != 'rbac']
-            logger.info('disabling rbac -> ', self.sh('microk8s.disable', 'rbac'))
+            logger.info('disabling rbac -> %s', self.sh('microk8s.disable', 'rbac'))
 
         def wait_until_ready(timeout, checker):
             for _ in until_timeout(timeout):

diff --git a/go.mod b/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/gorilla/websocket v1.4.2
 	github.com/gosuri/uitable v0.0.1
 	github.com/hashicorp/go-msgpack v0.5.5
+	github.com/hashicorp/go-uuid v1.0.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/raft v2.0.0-20200420012049-88ad3b3f0a54+incompatible
 	github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea
@@ -46,7 +47,7 @@ require (
 	github.com/juju/featureflag v0.0.0-20200423045028-e2f9e1cb1611
 	github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d
 	github.com/juju/gojsonschema v0.0.0-20150312170016-e1ad140384f2
-	github.com/juju/gomaasapi v0.0.0-20190826212825-0ab1eb636aba
+	github.com/juju/gomaasapi/v2 v2.0.0-20210323144809-92beddd020fe
 	github.com/juju/http v0.0.0-20201019013536-69ae1d429836
 	github.com/juju/idmclient/v2 v2.0.0-20210309081103-6b4a5212f851
 	github.com/juju/jsonschema v0.0.0-20161102181919-a0ef8b74ebcf
@@ -74,30 +75,36 @@ require (
 	github.com/juju/txn v0.0.0-20210302043154-251cea9e140a
 	github.com/juju/utils v0.0.0-20200604140309-9d78121a29e0
 	github.com/juju/utils/v2 v2.0.0-20200923005554-4646bfea2ef1
-	github.com/juju/version v0.0.0-20191219164919-81c1be00b9a6
+	github.com/juju/version v0.0.0-20210303051006-2015802527a8
 	github.com/juju/version/v2 v2.0.0-20210319015800-dcfac8f4f057
 	github.com/juju/webbrowser v1.0.0
 	github.com/juju/worker/v2 v2.0.0-20200916234526-d6e694f1c54a
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/kr/pretty v0.2.1
 	github.com/lxc/lxd v0.0.0-20201127143816-0245f4a840c6
+	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb
+	github.com/onsi/ginkgo v1.14.2 // indirect
+	github.com/onsi/gomega v1.10.4 // indirect
 	github.com/oracle/oci-go-sdk v5.7.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/rogpeppe/fastuuid v1.2.0 // indirect
 	github.com/satori/go.uuid v1.2.0
+	github.com/stretchr/testify v1.7.0 // indirect
 	github.com/vishvananda/netlink v1.1.0
 	github.com/vmware/govmomi v0.21.1-0.20191008161538-40aebf13ba45
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/mod v0.4.0 // indirect
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 	golang.org/x/sys v0.0.0-20210223212115-eede4237b368
+	golang.org/x/text v0.3.4 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
-	golang.org/x/tools v0.0.0-20200725200936-102e7d357031
+	golang.org/x/tools v0.0.0-20210105210202-9ed45478a130
 	google.golang.org/api v0.29.0
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/genproto v0.0.0-20200726014623-da3ae01ef02d // indirect
@@ -106,7 +113,7 @@ require (
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/goose.v2 v2.0.1
 	gopkg.in/httprequest.v1 v1.2.1
-	gopkg.in/ini.v1 v1.10.1
+	gopkg.in/ini.v1 v1.51.0
 	gopkg.in/juju/environschema.v1 v1.0.1-0.20201027142642-c89a4490670a
 	gopkg.in/macaroon.v2 v2.1.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0

diff --git a/go.sum b/go.sum
diff --git a/juju/testing/conn.go b/juju/testing/conn.go
@@ -16,7 +16,6 @@ import (
 	"github.com/juju/charm/v8"
 	"github.com/juju/cmd/cmdtesting"
 	"github.com/juju/errors"
-	"github.com/juju/http"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
 	"github.com/juju/pubsub"
@@ -140,7 +139,6 @@ const AdminSecret = "dummy-secret"
 func (s *JujuConnSuite) SetUpSuite(c *gc.C) {
 	s.MgoSuite.SetUpSuite(c)
 	s.FakeJujuXDGDataHomeSuite.SetUpSuite(c)
-	s.PatchValue(&http.OutgoingAccessAllowed, false)
 	s.PatchValue(&paths.Chown, func(name string, uid, gid int) error { return nil })
 }
 

diff --git a/provider/maas/config_test.go b/provider/maas/config_test.go
@@ -4,7 +4,7 @@
 package maas
 
 import (
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/constraints.go b/provider/maas/constraints.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/juju/collections/set"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 
 	"github.com/juju/juju/core/constraints"
 	"github.com/juju/juju/environs/context"

diff --git a/provider/maas/constraints_test.go b/provider/maas/constraints_test.go
@@ -7,7 +7,7 @@ import (
 	"net/url"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/devices.go b/provider/maas/devices.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 
 	"github.com/juju/juju/core/instance"
 	corenetwork "github.com/juju/juju/core/network"

diff --git a/provider/maas/environ.go b/provider/maas/environ.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/names/v4"
 	"github.com/juju/utils/v2"
 	"github.com/juju/version/v2"

diff --git a/provider/maas/environ_test.go b/provider/maas/environ_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/environ_whitebox_test.go b/provider/maas/environ_whitebox_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/names/v4"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/v2"

diff --git a/provider/maas/environprovider.go b/provider/maas/environprovider.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/jsonschema"
 	"github.com/juju/loggo"
 

diff --git a/provider/maas/environprovider_test.go b/provider/maas/environprovider_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"github.com/juju/collections/set"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/v2"
 	gc "gopkg.in/check.v1"

diff --git a/provider/maas/errors.go b/provider/maas/errors.go
@@ -4,7 +4,7 @@
 package maas
 
 import (
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 
 	"github.com/juju/juju/provider/common"
 )

diff --git a/provider/maas/errors_test.go b/provider/maas/errors_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/instance.go b/provider/maas/instance.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/names/v4"
 
 	"github.com/juju/juju/core/instance"

diff --git a/provider/maas/instance_test.go b/provider/maas/instance_test.go
@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/interfaces.go b/provider/maas/interfaces.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 
 	"github.com/juju/juju/core/instance"
 	corenetwork "github.com/juju/juju/core/network"

diff --git a/provider/maas/interfaces_test.go b/provider/maas/interfaces_test.go
@@ -6,7 +6,7 @@ package maas
 import (
 	"fmt"
 
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/maas2_environ_whitebox_test.go b/provider/maas/maas2_environ_whitebox_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/names/v4"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"

diff --git a/provider/maas/maas2_test.go b/provider/maas/maas2_test.go
@@ -6,7 +6,7 @@ package maas
 import (
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/provider/maas/maas2instance.go b/provider/maas/maas2instance.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 
 	"github.com/juju/juju/core/instance"
 	corenetwork "github.com/juju/juju/core/network"

diff --git a/provider/maas/maas2instance_test.go b/provider/maas/maas2instance_test.go
@@ -7,7 +7,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/juju/core/instance"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/core/status"

diff --git a/provider/maas/maas2storage.go b/provider/maas/maas2storage.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/utils/v2"
 
 	"github.com/juju/juju/environs/storage"

diff --git a/provider/maas/maas2storage_test.go b/provider/maas/maas2storage_test.go
@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/provider/maas/maas_test.go b/provider/maas/maas_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/os/v2/series"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/v2"

diff --git a/provider/maas/storage.go b/provider/maas/storage.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/utils/v2"
 
 	"github.com/juju/juju/environs/storage"

diff --git a/provider/maas/storage_test.go b/provider/maas/storage_test.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 

diff --git a/provider/maas/util.go b/provider/maas/util.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/utils"
+	"github.com/juju/utils/v2"
 	goyaml "gopkg.in/yaml.v2"
 
 	"github.com/juju/juju/cloudconfig/cloudinit"

diff --git a/provider/maas/volumes.go b/provider/maas/volumes.go
@@ -11,7 +11,7 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/names/v4"
 	"github.com/juju/schema"
 

diff --git a/provider/maas/volumes_test.go b/provider/maas/volumes_test.go
@@ -4,7 +4,7 @@
 package maas
 
 import (
-	"github.com/juju/gomaasapi"
+	"github.com/juju/gomaasapi/v2"
 	"github.com/juju/names/v4"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/testing/base.go b/testing/base.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/juju/collections/set"
 	"github.com/juju/featureflag"
-	"github.com/juju/http"
 	"github.com/juju/loggo"
 	"github.com/juju/os/v2/series"
 	"github.com/juju/testing"
@@ -194,7 +193,6 @@ func (s *BaseSuite) SetUpSuite(c *gc.C) {
 	s.CleanupSuite.SetUpSuite(c)
 	s.LoggingSuite.SetUpSuite(c)
 	// JujuOSEnvSuite does not have a suite setup.
-	s.PatchValue(&http.OutgoingAccessAllowed, false)
 	// LTS-dependent requires new entry upon new LTS release.
 	s.oldLtsForTesting = series.SetLatestLtsForTesting("xenial")
 }
@@ -210,7 +208,6 @@ func (s *BaseSuite) SetUpTest(c *gc.C) {
 	s.CleanupSuite.SetUpTest(c)
 	s.LoggingSuite.SetUpTest(c)
 	s.JujuOSEnvSuite.SetUpTest(c)
-	c.Assert(http.OutgoingAccessAllowed, gc.Equals, false)
 	if s.InitialLoggingConfig != "" {
 		_ = loggo.ConfigureLoggers(s.InitialLoggingConfig)
 	}

diff --git a/worker/containerbroker/mocks/agent_mock.go b/worker/containerbroker/mocks/agent_mock.go
diff --git a/worker/instancemutater/mocks/agent_mock.go b/worker/instancemutater/mocks/agent_mock.go