Use WellKnownSnapID helper.features-flag

Tweak docstring of Flag function. 

3 files changed, 6 insertions, 6 deletions

diff --git a/features/features.go b/features/features.go
index fabf054b96..d334d542cb 100644
--- a/features/features.go
+++ b/features/features.go
@@ -148,7 +148,7 @@ type confGetter interface {
	GetMaybe(snapName, key string, result interface{}) error
 }
 
-// Flag returns the value of a given feature flag.
+// Flag returns whether the given feature flag is enabled.
 func Flag(tr confGetter, feature SnapdFeature) (bool, error) {
	var isEnabled interface{}
	snapName, confName := feature.ConfigOption()
diff --git a/gadget/gadget.go b/gadget/gadget.go
index 3085389d85..d8b5b52fd1 100644
--- a/gadget/gadget.go
+++ b/gadget/gadget.go
@@ -1028,8 +1028,8 @@ func flatten(path string, cfg interface{}, out map[string]interface{}) {
 }
 
 // SystemDefaults returns default system configuration from gadget defaults.
-func SystemDefaults(gadgetDefaults map[string]map[string]interface{}, coreSnapID string) map[string]interface{} {
-	for _, systemSnap := range []string{"system", coreSnapID} {
+func SystemDefaults(gadgetDefaults map[string]map[string]interface{}) map[string]interface{} {
+	for _, systemSnap := range []string{"system", naming.WellKnownSnapID("core")} {
	if defaults, ok := gadgetDefaults[systemSnap]; ok {
	coreDefaults := map[string]interface{}{}
	flatten("", defaults, coreDefaults)
diff --git a/gadget/gadget_test.go b/gadget/gadget_test.go
index f1a3457bc9..2ec030e9d3 100644
--- a/gadget/gadget_test.go
+++ b/gadget/gadget_test.go
@@ -126,7 +126,7 @@ defaults:
 
 var mockClassicGadgetCoreDefaultsYaml = []byte(`
 defaults:
- otheridididididididididididididi:
+ 99T7MUlRhtI3U0QFgl5mXXESAiSwt776:
 ssh:
 disable: true
 `)
@@ -395,7 +395,7 @@ func (s *gadgetYamlTestSuite) TestCoreConfigDefaults(c *C) {
 
	ginfo, err := gadget.ReadInfo(s.dir, &modelConstraints{classic: true})
	c.Assert(err, IsNil)
-	defaults := gadget.SystemDefaults(ginfo.Defaults, "otheridididididididididididididi")
+	defaults := gadget.SystemDefaults(ginfo.Defaults)
	c.Check(defaults, DeepEquals, map[string]interface{}{
	"ssh.disable": true,
	})
@@ -410,7 +410,7 @@ func (s *gadgetYamlTestSuite) TestCoreConfigDefaults(c *C) {
	ginfo, err = gadget.ReadInfo(s.dir, &modelConstraints{classic: true})
	c.Assert(err, IsNil)
 
-	defaults = gadget.SystemDefaults(ginfo.Defaults, "otheridididididididididididididi")
+	defaults = gadget.SystemDefaults(ginfo.Defaults)
	c.Check(defaults, DeepEquals, map[string]interface{}{
	"something": true,
	})