Rename spaces to space

After further comments it should really be environs/space and then reload the spaces with in that space.
smadol · Mar 31, 2020 · ab207d8 · ab207d8
1 parent 8d180b4
commit ab207d8
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 30 deletions.
diff --git a/agent/agentbootstrap/bootstrap.go b/agent/agentbootstrap/bootstrap.go
@@ -30,7 +30,7 @@ import (
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/context"
-	"github.com/juju/juju/environs/spaces"
+	"github.com/juju/juju/environs/space"
 	"github.com/juju/juju/mongo"
 	"github.com/juju/juju/network"
 	"github.com/juju/juju/state"

diff --git a/apiserver/facades/client/modelmanager/modelmanager.go b/apiserver/facades/client/modelmanager/modelmanager.go
@@ -32,7 +32,7 @@ import (
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/context"
-	"github.com/juju/juju/environs/spaces"
+	"github.com/juju/juju/environs/space"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/state/stateenvirons"
 	"github.com/juju/juju/tools"

diff --git a/apiserver/facades/client/spaces/spaces.go b/apiserver/facades/client/spaces/spaces.go
@@ -22,7 +22,7 @@ import (
 	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/context"
-	"github.com/juju/juju/environs/spaces"
+	"github.com/juju/juju/environs/space"
 	"github.com/juju/juju/state"
 	"gopkg.in/mgo.v2/txn"
 )

diff --git a/environs/spaces/context_mock_test.go → environs/space/context_mock_test.go b/environs/spaces/context_mock_test.go → environs/space/context_mock_test.go
diff --git a/environs/spaces/environs_mock_test.go → environs/space/environs_mock_test.go b/environs/spaces/environs_mock_test.go → environs/space/environs_mock_test.go
diff --git a/environs/space/package_test.go b/environs/space/package_test.go
@@ -0,0 +1,18 @@
+// Copyright 2020 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package space
+
+import (
+	"testing"
+
+	gc "gopkg.in/check.v1"
+)
+
+//go:generate mockgen -package space -destination context_mock_test.go github.com/juju/juju/environs/context ProviderCallContext
+//go:generate mockgen -package space -destination environs_mock_test.go github.com/juju/juju/environs BootstrapEnviron,NetworkingEnviron
+//go:generate mockgen -package space -destination spaces_mock_test.go github.com/juju/juju/environs/space ReloadSpacesState
+
+func TestPackage(t *testing.T) {
+	gc.TestingT(t)
+}
diff --git a/environs/spaces/spaces.go → environs/space/spaces.go b/environs/spaces/spaces.go → environs/space/spaces.go
@@ -1,7 +1,7 @@
 // Copyright 2020 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package spaces
+package space
 
 import (
 	"github.com/juju/errors"

diff --git a/environs/spaces/spaces_mock_test.go → environs/space/spaces_mock_test.go b/environs/spaces/spaces_mock_test.go → environs/space/spaces_mock_test.go
diff --git a/environs/spaces/spaces_test.go → environs/space/spaces_test.go b/environs/spaces/spaces_test.go → environs/space/spaces_test.go
@@ -1,7 +1,7 @@
 // Copyright 2020 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package spaces
+package space
 
 import (
 	"github.com/golang/mock/gomock"

diff --git a/environs/spaces/package_test.go b/environs/spaces/package_test.go