bib: fix linter problems

New linter problems arose after updating golangci-lint's version.

Author: schuellerf

bib/cmd/bootc-image-builder/cloud.go

@@ -29,6 +29,7 @@ func upload(uploader cloud.Uploader, path string, flags *pflag.FlagSet) error {
 	if err != nil {
 		return fmt.Errorf("cannot upload: %v", err)
 	}
+	// nolint:errcheck
 	defer file.Close()
 
 	var r io.Reader = file

bib/cmd/bootc-image-builder/image.go

@@ -126,7 +126,7 @@ func checkMountpoints(filesystems []blueprint.FilesystemCustomization, policy *p
 		}
 	}
 	if len(errs) > 0 {
-		return fmt.Errorf("The following errors occurred while validating custom mountpoints:\n%w", errors.Join(errs...))
+		return fmt.Errorf("the following errors occurred while validating custom mountpoints:\n%w", errors.Join(errs...))
 	}
 	return nil
 }

bib/cmd/bootc-image-builder/image_test.go

@@ -108,31 +108,31 @@ func TestCheckFilesystemCustomizationsValidates(t *testing.T) {
 				{Mountpoint: "/ostree"},
 			},
 			ptmode:      disk.RawPartitioningMode,
-			expectedErr: "The following errors occurred while validating custom mountpoints:\npath \"/ostree\" is not allowed",
+			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/ostree\" is not allowed",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"},
 				{Mountpoint: "/var"},
 			},
 			ptmode:      disk.RawPartitioningMode,
-			expectedErr: "The following errors occurred while validating custom mountpoints:\npath \"/var\" is not allowed",
+			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/var\" is not allowed",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"},
 				{Mountpoint: "/var/data"},
 			},
 			ptmode:      disk.BtrfsPartitioningMode,
-			expectedErr: "The following errors occurred while validating custom mountpoints:\npath \"/var/data\" is not allowed",
+			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/var/data\" is not allowed",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"},
 				{Mountpoint: "/boot/"},
 			},
 			ptmode:      disk.BtrfsPartitioningMode,
-			expectedErr: "The following errors occurred while validating custom mountpoints:\npath \"/boot/\" must be canonical",
+			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/boot/\" must be canonical",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
@@ -141,7 +141,7 @@ func TestCheckFilesystemCustomizationsValidates(t *testing.T) {
 				{Mountpoint: "/opt"},
 			},
 			ptmode:      disk.BtrfsPartitioningMode,
-			expectedErr: "The following errors occurred while validating custom mountpoints:\npath \"/boot/\" must be canonical\npath \"/opt\" is not allowed",
+			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/boot/\" must be canonical\npath \"/opt\" is not allowed",
 		},
 	} {
 		if tc.expectedErr == "" {

bib/cmd/bootc-image-builder/main.go

@@ -176,6 +176,7 @@ func saveManifest(ms manifest.OSBuildManifest, fpath string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create output file %q: %s", fpath, err.Error())
 	}
+	// nolint:errcheck
 	defer fp.Close()
 	if _, err := fp.Write(b); err != nil {
 		return fmt.Errorf("failed to write output file %q: %s", fpath, err.Error())

bib/cmd/upload/main.go

@@ -40,6 +40,7 @@ func uploadAMI(cmd *cobra.Command, args []string) {
 
 	f, err := os.Open(filename)
 	check(err)
+	// nolint:errcheck
 	defer f.Close()
 
 	check(uploader.UploadAndRegister(f, os.Stderr))

bib/internal/buildconfig/config.go

@@ -87,6 +87,7 @@ func loadConfig(path string) (*externalBlueprint.Blueprint, error) {
 		if err != nil {
 			return nil, err
 		}
+		// nolint:errcheck
 		defer fp.Close()
 	}
 

bib/internal/buildconfig/config_test.go

@@ -184,6 +184,7 @@ func TestReadWithFallbackFromStdin(t *testing.T) {
 	fakeUserCnfPath := makeFakeConfig(t, "fake-stdin", fakeConfigJSON)
 	fakeStdinFp, err := os.Open(fakeUserCnfPath)
 	require.NoError(t, err)
+	// nolint:errcheck
 	defer fakeStdinFp.Close()
 
 	restore := buildconfig.MockOsStdin(fakeStdinFp)