Refactor series support to that juju itself can set its own supported…

… series
sdg0919 · Mar 11, 2021 · 9ff81fd · 9ff81fd
1 parent b9be824
commit 9ff81fd
Show file tree

Hide file tree

Showing 145 changed files with 1,369 additions and 288 deletions.
diff --git a/api/imagemetadatamanager/client_test.go b/api/imagemetadatamanager/client_test.go
@@ -7,13 +7,13 @@ import (
 	"regexp"
 
 	"github.com/juju/errors"
-	"github.com/juju/os/series"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/api/base/testing"
 	"github.com/juju/juju/api/imagemetadatamanager"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/core/series"
 	coretesting "github.com/juju/juju/testing"
 )
 

diff --git a/apiserver/authentication/agent.go b/apiserver/authentication/agent.go
@@ -14,7 +14,7 @@ import (
 	"github.com/juju/juju/state"
 )
 
-// AgentIdentityProvider performs authentication for machine and unit agents.
+// AgentAuthenticator performs authentication for machine and unit agents.
 type AgentAuthenticator struct{}
 
 var _ EntityAuthenticator = (*AgentAuthenticator)(nil)

diff --git a/apiserver/facades/agent/provisioner/provisioninginfo.go b/apiserver/facades/agent/provisioner/provisioninginfo.go
@@ -11,7 +11,6 @@ import (
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/common/storagecommon"
@@ -20,6 +19,7 @@ import (
 	"github.com/juju/juju/core/lxdprofile"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/network"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/imagemetadata"
 	"github.com/juju/juju/environs/simplestreams"

diff --git a/apiserver/facades/client/bundle/bundle.go b/apiserver/facades/client/bundle/bundle.go
@@ -18,7 +18,6 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 	"gopkg.in/yaml.v2"
 
 	"github.com/juju/juju/apiserver/common"
@@ -29,6 +28,7 @@ import (
 	"github.com/juju/juju/core/devices"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/storage"
 )

diff --git a/apiserver/facades/client/client/client.go b/apiserver/facades/client/client/client.go
@@ -11,8 +11,6 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os"
-	"github.com/juju/os/series"
 	"github.com/juju/replicaset"
 	"github.com/juju/version"
 
@@ -28,7 +26,9 @@ import (
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/multiwatcher"
 	"github.com/juju/juju/core/network"
+	"github.com/juju/juju/core/os"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/context"

diff --git a/apiserver/facades/client/client/client_test.go b/apiserver/facades/client/client/client_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 	"github.com/juju/replicaset"
 	jtesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
@@ -39,6 +38,7 @@ import (
 	"github.com/juju/juju/core/multiwatcher"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"

diff --git a/apiserver/facades/client/machinemanager/machinemanager.go b/apiserver/facades/client/machinemanager/machinemanager.go
@@ -5,20 +5,21 @@ package machinemanager
 
 import (
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os"
-	"github.com/juju/os/series"
 
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/common/storagecommon"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/core/instance"
+	"github.com/juju/juju/core/os"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/context"
@@ -742,6 +743,12 @@ func isSeriesLessThan(series1, series2 string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+	// Versions may be numeric.
+	vers1Int, err1 := strconv.Atoi(version1)
+	vers2Int, err2 := strconv.Atoi(version2)
+	if err1 == nil && err2 == nil {
+		return vers2Int > vers1Int, nil
+	}
 	return version2 > version1, nil
 }
 

diff --git a/apiserver/facades/client/machinemanager/machinemanager_test.go b/apiserver/facades/client/machinemanager/machinemanager_test.go
@@ -5,13 +5,14 @@ package machinemanager_test
 
 import (
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/golang/mock/gomock"
 	"github.com/juju/errors"
+	"github.com/juju/juju/core/os"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 	jtesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
@@ -24,6 +25,7 @@ import (
 	apiservertesting "github.com/juju/juju/apiserver/testing"
 	"github.com/juju/juju/cloud"
 	"github.com/juju/juju/core/model"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/environs/context"
 	"github.com/juju/juju/state"
@@ -873,16 +875,57 @@ func (s *MachineManagerSuite) TestIsSeriesLessThan(c *gc.C) {
 
 	ss := series.SupportedSeries()
 
-	// get the series versions
-	vs := make([]string, 0, len(ss))
+	// Group series by OS and check the list for
+	// each OS separately.
+	seriesByOS := make(map[os.OSType][]string)
 	for _, ser := range ss {
+		seriesOS, err := series.GetOSFromSeries(ser)
+		c.Assert(err, jc.ErrorIsNil)
+		seriesList := seriesByOS[seriesOS]
+		seriesList = append(seriesList, ser)
+		seriesByOS[seriesOS] = seriesList
+	}
+
+	for seriesOS, seriesList := range seriesByOS {
+		c.Logf("checking series for %v", seriesOS)
+		s.assertSeriesLessThan(c, seriesList)
+	}
+}
+
+type seriesVersion []string
+
+func (s seriesVersion) Len() int {
+	return len(s)
+}
+
+func (s seriesVersion) Less(i, j int) bool {
+	v1 := s[i]
+	v2 := s[j]
+	v1Int, err1 := strconv.Atoi(v1)
+	v2Int, err2 := strconv.Atoi(v2)
+	if err1 == nil && err2 == nil {
+		return v1Int < v2Int
+	}
+	return v1 < v2
+}
+
+func (s seriesVersion) Swap(i, j int) {
+	sv := s[i]
+	s[i] = s[j]
+	s[j] = sv
+}
+
+func (s *MachineManagerSuite) assertSeriesLessThan(c *gc.C, seriesList []string) {
+	// get the series versions
+	vs := make(seriesVersion, 0, len(seriesList))
+	for _, ser := range seriesList {
 		ver, err := series.SeriesVersion(ser)
 		c.Assert(err, jc.ErrorIsNil)
 		vs = append(vs, ver)
 	}
 
 	// sort the values, so the lexicographical order is determined
-	sort.Strings(vs)
+	sort.Sort(vs)
 
 	// check that the IsSeriesLessThan works for all supported series
 	for i := range vs {

diff --git a/apiserver/facades/client/modelmanager/modelinfo_test.go b/apiserver/facades/client/modelmanager/modelinfo_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/juju/description/v2"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 	gitjujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
@@ -27,6 +26,7 @@ import (
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"

diff --git a/apiserver/facades/controller/metricsmanager/metricsmanager.go b/apiserver/facades/controller/metricsmanager/metricsmanager.go
@@ -13,15 +13,15 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os"
-	"github.com/juju/os/series"
 	"github.com/juju/utils"
 
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/facades/agent/metricsender"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/core/instance"
+	"github.com/juju/juju/core/os"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/state"
 )
 

diff --git a/cloudconfig/cloudinit/interface.go b/cloudconfig/cloudinit/interface.go
@@ -2,7 +2,7 @@
 // Copyright 2015 Cloudbase Solutions SRL
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-// The cloudinit package implements a way of creating
+// Package cloudinit implements a way of creating
 // a cloud-init configuration file.
 // See https://help.ubuntu.com/community/CloudInit.
 package cloudinit
@@ -11,13 +11,14 @@ import (
 	"github.com/juju/errors"
 	corenetwork "github.com/juju/juju/core/network"
 	jujupackaging "github.com/juju/juju/packaging"
-	"github.com/juju/os"
-	"github.com/juju/os/series"
 	"github.com/juju/packaging"
 	"github.com/juju/packaging/commands"
 	"github.com/juju/packaging/config"
 	"github.com/juju/proxy"
 	"github.com/juju/utils/shell"
+
+	"github.com/juju/juju/core/os"
+	"github.com/juju/juju/core/series"
 )
 
 // CloudConfig is the interface of all cloud-init cloudconfig options.

diff --git a/cloudconfig/machinecloudconfig.go b/cloudconfig/machinecloudconfig.go
@@ -10,12 +10,13 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-	utilsos "github.com/juju/os"
-	utilsseries "github.com/juju/os/series"
+	osseries "github.com/juju/os/series"
 	"github.com/juju/utils"
 	"gopkg.in/yaml.v2"
 
+	utilsos "github.com/juju/juju/core/os"
 	"github.com/juju/juju/core/paths"
+	utilsseries "github.com/juju/juju/core/series"
 )
 
 // InitReader describes methods for extracting machine provisioning config,
@@ -88,7 +89,7 @@ func (r *MachineInitReader) GetInitConfig() (map[string]interface{}, error) {
 	}
 	switch containerOS {
 	case utilsos.Ubuntu, utilsos.CentOS, utilsos.OpenSUSE:
-		hostSeries, err := utilsseries.HostSeries()
+		hostSeries, err := osseries.HostSeries()
 		if err != nil || series != hostSeries {
 			logger.Debugf("not attempting to get init config for %s, series of machine and container differ", series)
 			return nil, nil

diff --git a/cloudconfig/providerinit/providerinit.go b/cloudconfig/providerinit/providerinit.go
@@ -2,19 +2,19 @@
 // Copyright 2015 Cloudbase Solutions SRL
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-// This package offers userdata in a gzipped format to be used by different
+// Package providerinit offers userdata in a gzipped format to be used by different
 // cloud providers
 package providerinit
 
 import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-	"github.com/juju/os/series"
 
 	"github.com/juju/juju/cloudconfig"
 	"github.com/juju/juju/cloudconfig/cloudinit"
 	"github.com/juju/juju/cloudconfig/instancecfg"
 	"github.com/juju/juju/cloudconfig/providerinit/renderers"
+	"github.com/juju/juju/core/series"
 )
 
 var logger = loggo.GetLogger("juju.cloudconfig.providerinit")

diff --git a/cloudconfig/providerinit/renderers/interface.go b/cloudconfig/providerinit/renderers/interface.go
@@ -2,16 +2,15 @@
 // Copyright 2015 Cloudbase Solutions SRL
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-// The renderers package implements a way to encode the userdata
+// Package renderers implements a way to encode the userdata
 // depending on the OS and the provider.
 // It currently holds an interface and common functions, while
 // the implementations live in the particular providers.
 package renderers
 
 import (
-	"github.com/juju/os"
-
 	"github.com/juju/juju/cloudconfig/cloudinit"
+	"github.com/juju/juju/core/os"
 )
 
 // ProviderRenderer defines a method to encode userdata depending on

diff --git a/cloudconfig/userdatacfg.go b/cloudconfig/userdatacfg.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
-	"github.com/juju/os"
-	"github.com/juju/os/series"
 	"github.com/juju/proxy"
 	"github.com/juju/utils"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/cloudconfig/cloudinit"
 	"github.com/juju/juju/cloudconfig/instancecfg"
+	"github.com/juju/juju/core/os"
+	"github.com/juju/juju/core/series"
 )
 
 const (

diff --git a/cloudconfig/userdatacfg_unix.go b/cloudconfig/userdatacfg_unix.go
@@ -19,12 +19,12 @@ import (
 	"github.com/juju/featureflag"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os"
 	"github.com/juju/proxy"
 	"github.com/juju/version"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/cloudconfig/cloudinit"
+	"github.com/juju/juju/core/os"
 	"github.com/juju/juju/environs/simplestreams"
 	"github.com/juju/juju/juju/osenv"
 	"github.com/juju/juju/service"

diff --git a/cloudconfig/userdatacfg_win.go b/cloudconfig/userdatacfg_win.go
@@ -14,10 +14,10 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/featureflag"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 	"github.com/juju/utils/cert"
 
 	"github.com/juju/juju/core/paths"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/juju/osenv"
 	"github.com/juju/juju/tools"
 )

diff --git a/cmd/juju/application/deploy_test.go b/cmd/juju/application/deploy_test.go
@@ -25,7 +25,6 @@ import (
 	"github.com/juju/gnuflag"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"
-	"github.com/juju/os/series"
 	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils"
@@ -50,6 +49,7 @@ import (
 	"github.com/juju/juju/core/devices"
 	"github.com/juju/juju/core/instance"
 	"github.com/juju/juju/core/model"
+	"github.com/juju/juju/core/series"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/context"