Improve the idiom for functions

partition/bootloader.go

@@ -98,9 +98,9 @@ type bootloaderType struct {
 }
 
 // Factory method that returns a new bootloader for the given partition
-var getBootloader = getBootloaderImpl
+var bootloader = bootloaderImpl
 
-func getBootloaderImpl(p *Partition) (bootloader bootLoader, err error) {
+func bootloaderImpl(p *Partition) (bootLoader, error) {
 	// try uboot
 	if uboot := newUboot(p); uboot != nil {
 		return uboot, nil

partition/bootloader_grub_test.go

@@ -129,7 +129,7 @@ func (s *PartitionTestSuite) TestGetBootVer(c *C) {
 func (s *PartitionTestSuite) TestGetBootloaderWithGrub(c *C) {
 	s.makeFakeGrubEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 	c.Assert(bootloader.Name(), Equals, bootloaderNameGrub)
 }

partition/bootloader_uboot_test.go

@@ -151,7 +151,7 @@ func (s *PartitionTestSuite) TestUbootGetEnvVar(c *C) {
 func (s *PartitionTestSuite) TestGetBootloaderWithUboot(c *C) {
 	s.makeFakeUbootEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 	c.Assert(bootloader.Name(), Equals, bootloaderNameUboot)
 }
@@ -168,7 +168,7 @@ func makeMockAssetsDir(c *C) {
 func (s *PartitionTestSuite) TestHandleAssets(c *C) {
 	s.makeFakeUbootEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 
 	// mock the hardwareYaml and the cacheDir
@@ -199,7 +199,7 @@ func (s *PartitionTestSuite) TestHandleAssets(c *C) {
 func (s *PartitionTestSuite) TestHandleAssetsVerifyBootloader(c *C) {
 	s.makeFakeUbootEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 
 	// mock the hardwareYaml and the cacheDir
@@ -213,7 +213,7 @@ func (s *PartitionTestSuite) TestHandleAssetsVerifyBootloader(c *C) {
 func (s *PartitionTestSuite) TestHandleAssetsFailVerifyPartitionLayout(c *C) {
 	s.makeFakeUbootEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 
 	// mock the hardwareYaml and the cacheDir
@@ -230,7 +230,7 @@ partition-layout: inplace
 func (s *PartitionTestSuite) TestHandleAssetsNoHardwareYaml(c *C) {
 	s.makeFakeUbootEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 
 	defaultCacheDir = c.MkDir()
@@ -241,7 +241,7 @@ func (s *PartitionTestSuite) TestHandleAssetsNoHardwareYaml(c *C) {
 func (s *PartitionTestSuite) TestHandleAssetsBadHardwareYaml(c *C) {
 	s.makeFakeUbootEnv(c)
 	p := New()
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	c.Assert(err, IsNil)
 
 	p.hardwareSpecFile = makeHardwareYaml(c, `

partition/partition.go

@@ -131,7 +131,7 @@ type Interface interface {
 
 	// Returns the full path to the (mounted and writable)
 	// bootloader-specific boot directory.
-	GetBootloaderDir() string
+	BootloaderDir() string
 }
 
 // mountEntry represents a mount this package has created.
@@ -507,7 +507,7 @@ func (p *Partition) RunWithOther(option MountOption, f func(otherRoot string) (e
 // SyncBootloaderFiles syncs the bootloader files
 // FIXME: can we unexport this?
 func (p *Partition) SyncBootloaderFiles() (err error) {
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	if err != nil {
 		return err
 	}
@@ -524,7 +524,7 @@ func (p *Partition) ToggleNextBoot() (err error) {
 
 // MarkBootSuccessful marks the boot as successful
 func (p *Partition) MarkBootSuccessful() (err error) {
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	if err != nil {
 		return err
 	}
@@ -535,7 +535,7 @@ func (p *Partition) MarkBootSuccessful() (err error) {
 // IsNextBootOther return true if the next boot will use the other rootfs
 // partition.
 func (p *Partition) IsNextBootOther() bool {
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	if err != nil {
 		return false
 	}
@@ -765,7 +765,7 @@ func (p *Partition) bindmountRequiredFilesystems() (err error) {
 	}
 
 	// add additional bootloader mounts, this is required for grub
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	if err == nil && bootloader != nil {
 		for _, mount := range bootloader.AdditionalBindMounts() {
 			requiredChrootMounts = append(requiredChrootMounts, mount)
@@ -813,7 +813,7 @@ func (p *Partition) toggleBootloaderRootfs() (err error) {
 		return errors.New("System is not dual root")
 	}
 
-	bootloader, err := getBootloader(p)
+	bootloader, err := bootloader(p)
 	if err != nil {
 		return err
 	}
@@ -832,10 +832,10 @@ func (p *Partition) toggleBootloaderRootfs() (err error) {
 	return bootloader.HandleAssets()
 }
 
-// GetBootloaderDir returns the full path to the (mounted and writable)
+// BootloaderDir returns the full path to the (mounted and writable)
 // bootloader-specific boot directory.
-func (p *Partition) GetBootloaderDir() string {
-	bootloader, err := getBootloader(p)
+func (p *Partition) BootloaderDir() string {
+	bootloader, err := bootloader(p)
 	if err != nil {
 		return ""
 	}

partition/partition_test.go

@@ -73,7 +73,7 @@ func (s *PartitionTestSuite) TearDownTest(c *C) {
 	// always restore what we might have mocked away
 	runCommand = runCommandImpl
 	defaultCacheDir = realDefaultCacheDir
-	getBootloader = getBootloaderImpl
+	bootloader = bootloaderImpl
 
 	// grub vars
 	bootloaderGrubConfigFile = bootloaderGrubConfigFileReal
@@ -460,7 +460,7 @@ func (b *mockBootloader) BootDir() string {
 func (s *PartitionTestSuite) TestToggleBootloaderRootfs(c *C) {
 	runCommand = mockRunCommand
 	b := &mockBootloader{}
-	getBootloader = func(p *Partition) (bootLoader, error) {
+	bootloader = func(p *Partition) (bootLoader, error) {
 		return b, nil
 	}
 
@@ -479,7 +479,7 @@ func (s *PartitionTestSuite) TestToggleBootloaderRootfs(c *C) {
 func (s *PartitionTestSuite) TestMarkBootSuccessful(c *C) {
 	runCommand = mockRunCommand
 	b := &mockBootloader{}
-	getBootloader = func(p *Partition) (bootLoader, error) {
+	bootloader = func(p *Partition) (bootLoader, error) {
 		return b, nil
 	}
 
@@ -494,7 +494,7 @@ func (s *PartitionTestSuite) TestMarkBootSuccessful(c *C) {
 func (s *PartitionTestSuite) TestSyncBootFiles(c *C) {
 	runCommand = mockRunCommand
 	b := &mockBootloader{}
-	getBootloader = func(p *Partition) (bootLoader, error) {
+	bootloader = func(p *Partition) (bootLoader, error) {
 		return b, nil
 	}
 

provisioning/provisioning.go

@@ -110,7 +110,7 @@ func IsSideLoaded(bootloaderDir string) bool {
 
 	InstallYaml, err := parseInstallYaml(file)
 	if err != nil {
-		logger.LogError(err)
+		logger.Noticef("Kernel sideload cannot be read, assuming sideload: %s", err)
 		// file isn't parseable, so let's assume system is sideloaded
 		return true
 	}

snappy/systemimage.go

@@ -167,7 +167,7 @@ func (s *SystemImagePart) SetActive(pb progress.Meter) (err error) {
 
 // Install installs the snap
 func (s *SystemImagePart) Install(pb progress.Meter, flags InstallFlags) (name string, err error) {
-	if provisioning.IsSideLoaded(s.partition.GetBootloaderDir()) {
+	if provisioning.IsSideLoaded(s.partition.BootloaderDir()) {
 		return "", ErrSideLoaded
 	}
 

snappy/systemimage_test.go

@@ -175,7 +175,7 @@ func (p *MockPartition) RunWithOther(option partition.MountOption, f func(otherR
 // used by GetBootLoaderDir(), used to test sideload logic.
 var tempBootDir string
 
-func (p *MockPartition) GetBootloaderDir() string {
+func (p *MockPartition) BootloaderDir() string {
 	return tempBootDir
 }
 
@@ -399,7 +399,7 @@ options:
 	mockPartition := MockPartition{}
 	sp.partition = &mockPartition
 
-	bootDir := sp.partition.GetBootloaderDir()
+	bootDir := sp.partition.BootloaderDir()
 
 	sideLoaded := filepath.Join(bootDir, provisioning.InstallYamlFile)