Removes unused systemd default search path directory argument from

WriteSystemdAgents.
orbital-transfer-survey · Jan 24, 2020 · 4db2f6f · 4db2f6f
1 parent e04f31b
commit 4db2f6f
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 21 deletions.
diff --git a/service/agentconf.go b/service/agentconf.go
@@ -44,7 +44,7 @@ type SystemdServiceManager interface {
 	// WriteSystemdAgents creates systemd files and create symlinks for the
 	// list of machine and units passed in the standard filepath.
 	WriteSystemdAgents(
-		machineAgent string, unitAgents []string, dataDir, symLinkSystemdDir, symLinkSystemdMultiUserDir string,
+		machineAgent string, unitAgents []string, dataDir, symLinkSystemdMultiUserDir string,
 	) ([]string, []string, []string, error)
 
 	//CreateAgentConf creates the configfile for specified agent running on a
@@ -53,7 +53,8 @@ type SystemdServiceManager interface {
 
 	// CopyAgentBinary copies all the tools into the path specified for each agent.
 	CopyAgentBinary(
-		machineAgent string, unitAgents []string, dataDir, toSeries, fromSeries string, jujuVersion version.Number) error
+		machineAgent string, unitAgents []string, dataDir, toSeries, fromSeries string, jujuVersion version.Number,
+	) error
 
 	// StartAllAgents starts all the agents in the machine with specified series.
 	StartAllAgents(machineAgent string, unitAgents []string, dataDir string) (string, []string, error)
@@ -103,7 +104,6 @@ func (s *systemdServiceManager) WriteServiceFiles() error {
 		machineAgent,
 		unitAgents,
 		paths.NixDataDir,
-		systemd.EtcSystemdDir,
 		systemd.EtcSystemdMultiUserDir,
 	)
 	if err != nil {
@@ -164,7 +164,7 @@ func (s *systemdServiceManager) FindAgents(dataDir string) (string, []string, []
 // WriteSystemdAgents creates systemd files and symlinks for the input machine
 // and unit agents, in the standard filepath '/var/lib/juju'.
 func (s *systemdServiceManager) WriteSystemdAgents(
-	machineAgent string, unitAgents []string, dataDir, symLinkSystemdDir, symLinkSystemdMultiUserDir string,
+	machineAgent string, unitAgents []string, dataDir, symLinkSystemdMultiUserDir string,
 ) ([]string, []string, []string, error) {
 	var (
 		startedSysServiceNames []string

diff --git a/service/agentconf_test.go b/service/agentconf_test.go
@@ -123,7 +123,7 @@ func (s *agentConfSuite) listServices() ([]string, error) {
 	return s.serviceData.InstalledNames(), nil
 }
 
-func (s *agentConfSuite) newService(name string, conf common.Conf) (service.Service, error) {
+func (s *agentConfSuite) newService(name string, _ common.Conf) (service.Service, error) {
 	for _, svc := range s.services {
 		if svc.Name() == name {
 			return svc, nil
@@ -290,7 +290,7 @@ func (s *agentConfSuite) TestCopyAgentBinaryOriginalAgentBinariesNotFound(c *gc.
 
 func (s *agentConfSuite) TestWriteSystemdAgents(c *gc.C) {
 	startedSymLinkAgents, startedSysServiceNames, errAgents, err := s.manager.WriteSystemdAgents(
-		s.machineName, s.unitNames, s.systemdDataDir, s.systemdDir, s.systemdMultiUserDir)
+		s.machineName, s.unitNames, s.systemdDataDir, s.systemdMultiUserDir)
 
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(startedSysServiceNames, gc.HasLen, 0)
@@ -306,7 +306,7 @@ func (s *agentConfSuite) TestWriteSystemdAgentsSystemdNotRunning(c *gc.C) {
 	)
 
 	startedSymLinkAgents, startedSysServiceNames, errAgents, err := s.manager.WriteSystemdAgents(
-		s.machineName, s.unitNames, s.systemdDataDir, s.systemdDir, s.systemdMultiUserDir)
+		s.machineName, s.unitNames, s.systemdDataDir, s.systemdMultiUserDir)
 
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(startedSymLinkAgents, gc.HasLen, 0)
@@ -323,7 +323,7 @@ func (s *agentConfSuite) TestWriteSystemdAgentsDBusErrManualLink(c *gc.C) {
 	)
 
 	startedSymLinkAgents, startedSysServiceNames, errAgents, err := s.manager.WriteSystemdAgents(
-		s.machineName, s.unitNames, s.systemdDataDir, s.systemdDir, s.systemdMultiUserDir)
+		s.machineName, s.unitNames, s.systemdDataDir, s.systemdMultiUserDir)
 
 	c.Assert(err, jc.ErrorIsNil)
 
@@ -342,7 +342,7 @@ func (s *agentConfSuite) TestWriteSystemdAgentsWriteServiceFail(c *gc.C) {
 	)
 
 	startedSymLinkAgents, startedSysServiceNames, errAgents, err := s.manager.WriteSystemdAgents(
-		s.machineName, s.unitNames, s.systemdDataDir, s.systemdDir, s.systemdMultiUserDir)
+		s.machineName, s.unitNames, s.systemdDataDir, s.systemdMultiUserDir)
 
 	c.Assert(err, gc.ErrorMatches, "fail me")
 	c.Assert(startedSysServiceNames, gc.HasLen, 0)

diff --git a/worker/upgradeseries/mocks/package_mock.go b/worker/upgradeseries/mocks/package_mock.go