Refactor snap support from service package

Tim McNamara · Tim McNamara · commit a187512c3a28 · 2019-03-08T16:43:30.000+13:00
diff --git a/mongo/service.go b/mongo/service.go
@@ -84,11 +84,14 @@ type mongoService interface {
 }
 
 var newService = func(name string, conf common.Conf) (mongoService, error) {
+	if featureflag.Enabled(feature.MongoDbSnap) {
+		return snap.NewServiceFromName(name, conf)
+	}
 	return service.DiscoverService(name, conf)
 }
 
 var discoverService = func(name string) (mongoService, error) {
-	return service.DiscoverService(name, common.Conf{})
+	return newService(name, common.Conf{})
 }
 
 // IsServiceInstalled returns whether the MongoDB init service
diff --git a/service/discovery.go b/service/discovery.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/juju/juju/feature"
 	"github.com/juju/juju/service/common"
-	"github.com/juju/juju/service/snap"
 	"github.com/juju/juju/service/systemd"
 	"github.com/juju/juju/service/upstart"
 	"github.com/juju/juju/service/windows"
@@ -107,13 +106,6 @@ var discoveryFuncs = []discoveryCheck{
 }
 
 func discoverLocalInitSystem() (string, error) {
-	if featureflag.Enabled(feature.MongoDbSnap) {
-		local, err := snap.IsRunning()
-		if err == nil && local {
-			return InitSystemSnap, nil
-		}
-		return "", errors.NotFoundf("snap does not appear to be installed correctly")
-	}
 	for _, check := range discoveryFuncs {
 		local, err := check.isRunning()
 		if err != nil {
@@ -129,7 +121,6 @@ func discoverLocalInitSystem() (string, error) {
 }
 
 const (
-	discoverSnap    = "if [ -x /usr/bin/snap ] || [ -d /snap ]; then  echo -n snap; exit 0; fi"
 	discoverSystemd = "if [ -d /run/systemd/system ]; then echo -n systemd; exit 0; fi"
 	discoverUpstart = "if [ -f /sbin/initctl ] && /sbin/initctl --system list 2>&1 > /dev/null; then echo -n upstart; exit 0; fi"
 )
@@ -144,9 +135,6 @@ func DiscoverInitSystemScript() string {
 		discoverUpstart,
 		"exit 1",
 	}
-	if featureflag.Enabled(feature.MongoDbSnap) {
-		tests = append([]string{discoverSnap}, tests...)
-	}
 	data := renderer.RenderScript(tests)
 	return string(data)
 }

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,14 @@ type mongoService interface {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`var newService = func(name string, conf common.Conf) (mongoService, error) {`
	`87`	`+ if featureflag.Enabled(feature.MongoDbSnap) {`
	`88`	`+ return snap.NewServiceFromName(name, conf)`
	`89`	`+ }`
`87`	`90`	`return service.DiscoverService(name, conf)`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`var discoverService = func(name string) (mongoService, error) {`
`91`		`- return service.DiscoverService(name, common.Conf{})`
	`94`	`+ return newService(name, common.Conf{})`
`92`	`95`	`}`
`93`	`96`
`94`	`97`	`// IsServiceInstalled returns whether the MongoDB init service`