Finish move from utils/set to collections/set.

hatched · Jan 31, 2020 · 03b3b91 · 03b3b91
1 parent 8a733c2
commit 03b3b91
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 17 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/api/facadeversions_test.go b/api/facadeversions_test.go
@@ -4,8 +4,8 @@
 package api_test
 
 import (
+	"github.com/juju/collections/set"
 	jc "github.com/juju/testing/checkers"
-	"github.com/juju/utils/set"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/api"

diff --git a/apiserver/facades/agent/caasoperator/watcher.go b/apiserver/facades/agent/caasoperator/watcher.go
@@ -4,8 +4,8 @@
 package caasoperator
 
 import (
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/utils/set"
 	"gopkg.in/juju/worker.v1"
 	"gopkg.in/juju/worker.v1/catacomb"
 

diff --git a/apiserver/facades/client/action/action.go b/apiserver/facades/client/action/action.go
@@ -6,8 +6,8 @@ package action
 import (
 	"strings"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/utils/set"
 	"gopkg.in/juju/names.v3"
 
 	"github.com/juju/juju/apiserver/common"

diff --git a/apiserver/facades/client/controller/controller.go b/apiserver/facades/client/controller/controller.go
@@ -10,10 +10,10 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/txn"
-	"github.com/juju/utils/set"
 	"gopkg.in/juju/names.v3"
 	"gopkg.in/macaroon.v2"
 

diff --git a/apiserver/facades/client/controller/controller_internal_test.go b/apiserver/facades/client/controller/controller_internal_test.go
@@ -4,8 +4,8 @@
 package controller
 
 import (
+	"github.com/juju/collections/set"
 	jc "github.com/juju/testing/checkers"
-	"github.com/juju/utils/set"
 	gc "gopkg.in/check.v1"
 )
 

diff --git a/apiserver/facades/controller/charmrevisionupdater/updater.go b/apiserver/facades/controller/charmrevisionupdater/updater.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-	"github.com/juju/utils/set"
 
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"

diff --git a/cmd/juju/backups/remove.go b/cmd/juju/backups/remove.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 
 	"github.com/juju/cmd"
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/gnuflag"
-	"github.com/juju/utils/set"
 
 	"github.com/juju/juju/apiserver/params"
 	jujucmd "github.com/juju/juju/cmd"

diff --git a/cmd/juju/commands/plugin.go b/cmd/juju/commands/plugin.go
@@ -15,9 +15,9 @@ import (
 	"syscall"
 
 	"github.com/juju/cmd"
+	"github.com/juju/collections/set"
 	"github.com/juju/gnuflag"
 	"github.com/juju/utils"
-	"github.com/juju/utils/set"
 
 	"github.com/juju/juju/juju/osenv"
 )

diff --git a/container/broker/broker.go b/container/broker/broker.go
@@ -6,10 +6,10 @@ package broker
 import (
 	"strings"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/utils/arch"
-	"github.com/juju/utils/set"
 	"gopkg.in/juju/names.v3"
 
 	apiprovisioner "github.com/juju/juju/api/provisioner"

diff --git a/core/model/model.go b/core/model/model.go
@@ -4,10 +4,10 @@
 package model
 
 import (
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/os"
 	"github.com/juju/os/series"
-	"github.com/juju/utils/set"
 )
 
 // ModelType indicates a model type.

diff --git a/core/raftlease/fsm.go b/core/raftlease/fsm.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/raft"
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/utils/set"
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/juju/juju/core/globalclock"

diff --git a/mongo/service.go b/mongo/service.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/utils"
 	"github.com/juju/utils/featureflag"
-	"github.com/juju/utils/set"
 
 	"github.com/juju/juju/feature"
 	"github.com/juju/juju/network"

diff --git a/mongo/service_test.go b/mongo/service_test.go
@@ -6,9 +6,9 @@ package mongo_test
 import (
 	"strings"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
-	"github.com/juju/utils/set"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/mongo"

diff --git a/provider/oci/networking.go b/provider/oci/networking.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	"github.com/juju/utils/set"
 	ociCore "github.com/oracle/oci-go-sdk/core"
 	"gopkg.in/juju/names.v3"
 

diff --git a/state/lease/store.go b/state/lease/store.go
@@ -8,10 +8,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jujutxn "github.com/juju/txn"
-	"github.com/juju/utils/set"
 	"gopkg.in/mgo.v2/bson"
 	"gopkg.in/mgo.v2/txn"
 

diff --git a/state/modelgeneration.go b/state/modelgeneration.go
@@ -9,9 +9,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	jujutxn "github.com/juju/txn"
-	"github.com/juju/utils/set"
 	"gopkg.in/juju/charm.v6"
 	"gopkg.in/juju/names.v3"
 	"gopkg.in/mgo.v2"