Remove HostSeries

Remove HostSeries everywhere it appears In most places, it needs to be replaces with the new HostBase. However, in a few places, it turns out it could just be dropped entirely
johnlettman · Apr 22, 2024 · 7aee297 · 7aee297
1 parent c9649b5
commit 7aee297
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 74 deletions.
diff --git a/api/agent/upgradeseries/upgradeseries.go b/api/agent/upgradeseries/upgradeseries.go
@@ -170,18 +170,14 @@ func (s *Client) StartUnitCompletion(reason string) error {
 // completely finished, passing the current host OS series.
 // We use the name "Finish" to distinguish this method from the various
 // "Complete" phases.
-func (s *Client) FinishUpgradeSeries(hostSeries string) error {
+func (s *Client) FinishUpgradeSeries(hostBase corebase.Base) error {
 	var results params.ErrorResults
-	base, err := corebase.GetBaseFromSeries(hostSeries)
-	if err != nil {
-		return errors.Trace(err)
-	}
 	args := params.UpdateChannelArgs{Args: []params.UpdateChannelArg{{
 		Entity:  params.Entity{Tag: s.authTag.String()},
-		Channel: base.Channel.Track,
+		Channel: hostBase.Channel.Track,
 	}}}
 
-	err = s.facade.FacadeCall("FinishUpgradeSeries", args, &results)
+	err := s.facade.FacadeCall("FinishUpgradeSeries", args, &results)
 	if err != nil {
 		return err
 	}

diff --git a/api/agent/upgradeseries/upgradeseries_test.go b/api/agent/upgradeseries/upgradeseries_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/juju/juju/api/agent/upgradeseries"
 	"github.com/juju/juju/api/base/mocks"
+	corebase "github.com/juju/juju/core/base"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/rpc/params"
@@ -179,7 +180,7 @@ func (s *upgradeSeriesSuite) TestFinishUpgradeSeries(c *gc.C) {
 	fCaller.EXPECT().FacadeCall("FinishUpgradeSeries", args, gomock.Any()).SetArg(2, resultSource)
 
 	api := upgradeseries.NewStateFromCaller(fCaller, s.tag)
-	err := api.FinishUpgradeSeries("xenial")
+	err := api.FinishUpgradeSeries(corebase.MustParseBaseFromString("[email protected]"))
 	c.Assert(err, gc.IsNil)
 }
 

diff --git a/apiserver/common/tools_test.go b/apiserver/common/tools_test.go
@@ -129,7 +129,7 @@ func (s *getToolsSuite) TestOSTools(c *gc.C) {
 
 	current := coretesting.CurrentVersion()
 	currentCopy := current
-	currentCopy.Release = coretesting.HostSeries(c)
+	currentCopy.Release = "foo"
 	configAttrs := map[string]interface{}{
 		"name":                 "some-name",
 		"type":                 "some-type",

diff --git a/container/kvm/initialisation.go b/container/kvm/initialisation.go
@@ -8,10 +8,9 @@ import (
 	"runtime"
 
 	"github.com/juju/errors"
-	"github.com/juju/os/v2/series"
 
 	"github.com/juju/juju/container"
-	"github.com/juju/juju/core/base"
+	coreos "github.com/juju/juju/core/os"
 	"github.com/juju/juju/core/paths"
 	"github.com/juju/juju/packaging"
 	"github.com/juju/juju/packaging/dependency"
@@ -45,11 +44,7 @@ func (ci *containerInitialiser) Initialise() error {
 }
 
 func ensureDependencies() error {
-	hostSeries, err := series.HostSeries()
-	if err != nil {
-		return errors.Trace(err)
-	}
-	hostBase, err := base.GetBaseFromSeries(hostSeries)
+	hostBase, err := coreos.HostBase()
 	if err != nil {
 		return errors.Trace(err)
 	}

diff --git a/container/lxd/export_test.go b/container/lxd/export_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/juju/clock"
 
 	"github.com/juju/juju/container"
+	"github.com/juju/juju/core/base"
 	"github.com/juju/juju/core/network"
 )
 
@@ -45,8 +46,8 @@ func PatchLXDViaSnap(patcher patcher, isSnap bool) {
 	patcher.PatchValue(&lxdViaSnap, func() bool { return isSnap })
 }
 
-func PatchHostSeries(patcher patcher, series string) {
-	patcher.PatchValue(&hostSeries, func() (string, error) { return series, nil })
+func PatchHostBase(patcher patcher, b base.Base) {
+	patcher.PatchValue(&hostBase, func() (base.Base, error) { return b, nil })
 }
 
 func PatchGetSnapManager(patcher patcher, mgr SnapManager) {

diff --git a/container/lxd/initialisation_linux.go b/container/lxd/initialisation_linux.go
@@ -11,18 +11,18 @@ import (
 	"time"
 
 	"github.com/juju/errors"
-	"github.com/juju/os/v2/series"
 	"github.com/juju/packaging/v3/manager"
 	"github.com/juju/proxy"
 
 	"github.com/juju/juju/container"
 	corebase "github.com/juju/juju/core/base"
+	coreos "github.com/juju/juju/core/os"
 	"github.com/juju/juju/packaging"
 	"github.com/juju/juju/packaging/dependency"
 	"github.com/juju/juju/service"
 )
 
-var hostSeries = series.HostSeries
+var hostBase = coreos.HostBase
 
 type containerInitialiser struct {
 	containerNetworkingMethod string
@@ -68,11 +68,7 @@ func NewContainerInitialiser(lxdSnapChannel, containerNetworkingMethod string) c
 
 // Initialise is specified on the container.Initialiser interface.
 func (ci *containerInitialiser) Initialise() (err error) {
-	localSeries, err := hostSeries()
-	if err != nil {
-		return errors.Trace(err)
-	}
-	localBase, err := corebase.GetBaseFromSeries(localSeries)
+	localBase, err := hostBase()
 	if err != nil {
 		return errors.Trace(err)
 	}

diff --git a/container/lxd/initialisation_test.go b/container/lxd/initialisation_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/juju/juju/container/lxd/mocks"
 	lxdtesting "github.com/juju/juju/container/lxd/testing"
+	"github.com/juju/juju/core/base"
 	coretesting "github.com/juju/juju/testing"
 )
 
@@ -86,7 +87,7 @@ func (s *initialiserTestSuite) containerInitialiser(svr lxd.InstanceServer, lxdI
 
 func (s *InitialiserSuite) TestSnapInstalled(c *gc.C) {
 	PatchLXDViaSnap(s, true)
-	PatchHostSeries(s, "jammy")
+	PatchHostBase(s, base.MustParseBaseFromString("[email protected]"))
 
 	ctrl := gomock.NewController(c)
 	defer ctrl.Finish()
@@ -103,7 +104,7 @@ func (s *InitialiserSuite) TestSnapInstalled(c *gc.C) {
 
 func (s *InitialiserSuite) TestSnapChannelMismatch(c *gc.C) {
 	PatchLXDViaSnap(s, true)
-	PatchHostSeries(s, "focal")
+	PatchHostBase(s, base.MustParseBaseFromString("[email protected]"))
 
 	ctrl := gomock.NewController(c)
 	defer ctrl.Finish()
@@ -121,7 +122,7 @@ func (s *InitialiserSuite) TestSnapChannelMismatch(c *gc.C) {
 
 func (s *InitialiserSuite) TestSnapChannelPrefixMatch(c *gc.C) {
 	PatchLXDViaSnap(s, true)
-	PatchHostSeries(s, "focal")
+	PatchHostBase(s, base.MustParseBaseFromString("[email protected]"))
 
 	ctrl := gomock.NewController(c)
 	defer ctrl.Finish()
@@ -143,7 +144,7 @@ func (s *InitialiserSuite) TestSnapChannelPrefixMatch(c *gc.C) {
 func (s *InitialiserSuite) TestInstallViaSnap(c *gc.C) {
 	PatchLXDViaSnap(s, false)
 
-	PatchHostSeries(s, "focal")
+	PatchHostBase(s, base.MustParseBaseFromString("[email protected]"))
 
 	paccmder := commands.NewSnapPackageCommander()
 
@@ -157,7 +158,7 @@ func (s *InitialiserSuite) TestInstallViaSnap(c *gc.C) {
 
 func (s *InitialiserSuite) TestLXDAlreadyInitialized(c *gc.C) {
 	s.patchDF100GB()
-	PatchHostSeries(s, "focal")
+	PatchHostBase(s, base.MustParseBaseFromString("[email protected]"))
 
 	ci := s.containerInitialiser(nil, true, "local")
 	ci.getExecCommand = s.PatchExecHelper.GetExecCommand(testing.PatchExecConfig{
@@ -171,7 +172,7 @@ func (s *InitialiserSuite) TestLXDAlreadyInitialized(c *gc.C) {
 }
 
 func (s *InitialiserSuite) TestInitializeSetsProxies(c *gc.C) {
-	PatchHostSeries(s, "jammy")
+	PatchHostBase(s, base.MustParseBaseFromString("[email protected]"))
 
 	ctrl := gomock.NewController(c)
 	defer ctrl.Finish()

diff --git a/environs/testing/tools.go b/environs/testing/tools.go
@@ -281,8 +281,8 @@ func RemoveFakeTools(c *gc.C, stor storage.Storage, toolsDir string) {
 	name := envtools.StorageName(toolsVersion, toolsDir)
 	err := stor.Remove(name)
 	c.Check(err, jc.ErrorIsNil)
-	defaultSeries := jujuversion.DefaultSupportedLTS()
-	if coretesting.HostSeries(c) != defaultSeries {
+	defaultBase := jujuversion.DefaultSupportedLTSBase()
+	if !defaultBase.IsCompatible(coretesting.HostBase(c)) {
 		toolsVersion.Release = "ubuntu"
 		name := envtools.StorageName(toolsVersion, toolsDir)
 		err := stor.Remove(name)

diff --git a/mongo/mongo.go b/mongo/mongo.go
@@ -20,13 +20,13 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/mgo/v3"
-	"github.com/juju/os/v2/series"
 	"github.com/juju/replicaset/v3"
 	"github.com/juju/retry"
 	"github.com/juju/utils/v3"
 
 	"github.com/juju/juju/core/base"
 	"github.com/juju/juju/core/network"
+	coreos "github.com/juju/juju/core/os"
 	"github.com/juju/juju/packaging"
 	"github.com/juju/juju/packaging/dependency"
 	"github.com/juju/juju/service/common"
@@ -225,15 +225,6 @@ func EnsureServerInstalled(ctx context.Context, args EnsureServerParams) error {
 func ensureServer(ctx context.Context, args EnsureServerParams, mongoKernelTweaks map[string]string) (err error) {
 	tweakSysctlForMongo(mongoKernelTweaks)
 
-	hostSeries, err := series.HostSeries()
-	if err != nil {
-		return errors.Annotatef(err, "cannot get host series")
-	}
-	hostBase, err := base.GetBaseFromSeries(hostSeries)
-	if err != nil {
-		return errors.Annotatef(err, "host series %q not a vlaid base", hostSeries)
-	}
-
 	mongoDep := dependency.Mongo(args.JujuDBSnapChannel)
 	if args.DataDir == "" {
 		args.DataDir = dataPathForJujuDbSnap
@@ -257,6 +248,11 @@ func ensureServer(ctx context.Context, args EnsureServerParams, mongoKernelTweak
 		return errors.Annotatef(err, "cannot create mongo snap service")
 	}
 
+	hostBase, err := coreos.HostBase()
+	if err != nil {
+		return errors.Annotatef(err, "cannot get host base")
+	}
+
 	if err := installMongod(mongoDep, hostBase, svc); err != nil {
 		return errors.Annotatef(err, "cannot install mongod")
 	}

diff --git a/testing/base.go b/testing/base.go
@@ -22,6 +22,7 @@ import (
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/core/arch"
+	"github.com/juju/juju/core/base"
 	"github.com/juju/juju/core/model"
 	coreos "github.com/juju/juju/core/os"
 	"github.com/juju/juju/core/os/ostype"
@@ -300,8 +301,8 @@ func CurrentVersion() version.Binary {
 }
 
 // HostSeries returns series.HostSeries(), asserting on error.
-func HostSeries(c *gc.C) string {
-	hostSeries, err := series.HostSeries()
+func HostBase(c *gc.C) base.Base {
+	hostBase, err := coreos.HostBase()
 	c.Assert(err, jc.ErrorIsNil)
-	return hostSeries
+	return hostBase
 }
diff --git a/worker/proxyupdater/proxyupdater.go b/worker/proxyupdater/proxyupdater.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	"github.com/juju/os/v2/series"
 	"github.com/juju/packaging/v3/commands"
 	"github.com/juju/packaging/v3/config"
 	"github.com/juju/proxy"
@@ -164,12 +163,8 @@ func (w *proxyWorker) handleProxyValues(legacyProxySettings, jujuProxySettings p
 
 // getPackageCommander is a helper function which returns the
 // package commands implementation for the current system.
-func getPackageCommander() (commands.PackageCommander, error) {
-	hostSeries, err := series.HostSeries()
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	return commands.NewPackageCommander(hostSeries)
+func getPackageCommander() commands.PackageCommander {
+	return commands.NewAptPackageCommander()
 }
 
 func (w *proxyWorker) handleSnapProxyValues(proxy proxy.Settings, storeID, storeAssertions, storeProxyURL string) {
@@ -261,11 +256,7 @@ func (w *proxyWorker) handleAptProxyValues(aptSettings proxy.Settings, aptMirror
 		err      error
 	)
 	if updateNeeded {
-		paccmder, err = getPackageCommander()
-		if err != nil {
-			w.config.Logger.Errorf("unable to process apt proxy changes: %v", err)
-			return
-		}
+		paccmder = getPackageCommander()
 	}
 
 	if aptSettings != w.aptProxy || w.first {

diff --git a/worker/proxyupdater/proxyupdater_test.go b/worker/proxyupdater/proxyupdater_test.go
@@ -226,8 +226,7 @@ func (s *ProxyUpdaterSuite) TestInitialStateLegacyProxy(c *gc.C) {
 	s.waitForFile(c, s.proxyEnvFile, proxySettings.AsScriptEnvironment())
 	s.waitForFile(c, s.proxySystemdFile, proxySettings.AsSystemdDefaultEnv())
 
-	paccmder, err := commands.NewPackageCommander(coretesting.HostSeries(c))
-	c.Assert(err, jc.ErrorIsNil)
+	paccmder := commands.NewAptPackageCommander()
 	s.waitForFile(c, pacconfig.AptProxyConfigFile, paccmder.ProxyConfigContents(aptProxySettings)+"\n")
 }
 
@@ -249,8 +248,7 @@ func (s *ProxyUpdaterSuite) TestInitialStateJujuProxy(c *gc.C) {
 	s.waitForFile(c, s.proxyEnvFile, empty.AsScriptEnvironment())
 	s.waitForFile(c, s.proxySystemdFile, empty.AsSystemdDefaultEnv())
 
-	paccmder, err := commands.NewPackageCommander(coretesting.HostSeries(c))
-	c.Assert(err, jc.ErrorIsNil)
+	paccmder := commands.NewAptPackageCommander()
 	s.waitForFile(c, pacconfig.AptProxyConfigFile, paccmder.ProxyConfigContents(aptProxySettings)+"\n")
 }
 

diff --git a/worker/upgradeseries/export_test.go b/worker/upgradeseries/export_test.go
@@ -3,10 +3,12 @@
 
 package upgradeseries
 
+import "github.com/juju/juju/core/base"
+
 type patcher interface {
 	PatchValue(interface{}, interface{})
 }
 
-func PatchHostSeries(patcher patcher, series string) {
-	patcher.PatchValue(&hostSeries, func() (string, error) { return series, nil })
+func PatchHostBase(patcher patcher, b base.Base) {
+	patcher.PatchValue(&hostBase, func() (base.Base, error) { return b, nil })
 }
diff --git a/worker/upgradeseries/mocks/package_mock.go b/worker/upgradeseries/mocks/package_mock.go
diff --git a/worker/upgradeseries/shim.go b/worker/upgradeseries/shim.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/juju/juju/api/agent/upgradeseries"
 	"github.com/juju/juju/api/base"
+	corebase "github.com/juju/juju/core/base"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/watcher"
 )
@@ -23,7 +24,7 @@ type Facade interface {
 	// Setters
 	StartUnitCompletion(reason string) error
 	SetMachineStatus(status model.UpgradeSeriesStatus, reason string) error
-	FinishUpgradeSeries(string) error
+	FinishUpgradeSeries(corebase.Base) error
 	PinMachineApplications() (map[string]error, error)
 	UnpinMachineApplications() (map[string]error, error)
 	SetInstanceStatus(model.UpgradeSeriesStatus, string) error