fix: use %w instead of %v/%s in fmt.Errorf to preserve error chains

cmd/certsuite/check/image_cert_status/image_cert_status.go

@@ -39,7 +39,7 @@ func checkImageCertStatus(cmd *cobra.Command, _ []string) error {
 
 	validator, err := certdb.GetValidator(offlineDB)
 	if err != nil {
-		return fmt.Errorf("could not get a validator for container images, error: %v", err)
+		return fmt.Errorf("could not get a validator for container images, error: %w", err)
 	}
 
 	switch {

cmd/certsuite/check/results/results.go

@@ -50,7 +50,7 @@ func checkResults(cmd *cobra.Command, _ []string) error {
 	// Build a database with the test results from the log file
 	actualTestResults, err := getTestResultsDB(logFileName)
 	if err != nil {
-		return fmt.Errorf("could not get the test results DB, err: %v", err)
+		return fmt.Errorf("could not get the test results DB, err: %w", err)
 	}
 
 	// Generate a reference YAML template with the test results if required
@@ -61,7 +61,7 @@ func checkResults(cmd *cobra.Command, _ []string) error {
 	// Get the expected test results from the reference YAML template
 	expectedTestResults, err := getExpectedTestResults(templateFileName)
 	if err != nil {
-		return fmt.Errorf("could not get the expected test results, err: %v", err)
+		return fmt.Errorf("could not get the expected test results, err: %w", err)
 	}
 
 	// Match the results between the test results DB and the reference YAML template
@@ -95,7 +95,7 @@ func getTestResultsDB(logFileName string) (map[string]string, error) {
 
 	file, err := os.Open(logFileName)
 	if err != nil {
-		return nil, fmt.Errorf("could not open file %q, err: %v", logFileName, err)
+		return nil, fmt.Errorf("could not open file %q, err: %w", logFileName, err)
 	}
 	defer file.Close()
 
@@ -118,7 +118,7 @@ func getTestResultsDB(logFileName string) (map[string]string, error) {
 	}
 
 	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("error scanning file, err: %v", err)
+		return nil, fmt.Errorf("error scanning file, err: %w", err)
 	}
 
 	return resultsDB, nil
@@ -127,13 +127,13 @@ func getTestResultsDB(logFileName string) (map[string]string, error) {
 func getExpectedTestResults(templateFileName string) (map[string]string, error) {
 	templateFile, err := os.ReadFile(templateFileName)
 	if err != nil {
-		return nil, fmt.Errorf("could not open template file %q, err: %v", templateFileName, err)
+		return nil, fmt.Errorf("could not open template file %q, err: %w", templateFileName, err)
 	}
 
 	var expectedTestResultsList TestResults
 	err = yaml.Unmarshal(templateFile, &expectedTestResultsList)
 	if err != nil {
-		return nil, fmt.Errorf("could not parse the template YAML file, err: %v", err)
+		return nil, fmt.Errorf("could not parse the template YAML file, err: %w", err)
 	}
 
 	expectedTestResults := make(map[string]string)
@@ -190,12 +190,12 @@ func generateTemplateFile(resultsDB map[string]string) error {
 	yamlEncoder.SetIndent(twoSpaces)
 	err := yamlEncoder.Encode(&resultsTemplate)
 	if err != nil {
-		return fmt.Errorf("could not encode template yaml, err: %v", err)
+		return fmt.Errorf("could not encode template yaml, err: %w", err)
 	}
 
 	err = os.WriteFile(TestResultsTemplateFileName, yamlTemplate.Bytes(), TestResultsTemplateFilePermissions)
 	if err != nil {
-		return fmt.Errorf("could not write to file %q: %v", TestResultsTemplateFileName, err)
+		return fmt.Errorf("could not write to file %q: %w", TestResultsTemplateFileName, err)
 	}
 
 	return nil

cmd/certsuite/claim/compare/compare.go

@@ -121,23 +121,23 @@ func claimCompareFilesfunc(claim1, claim2 string) error {
 	// readfiles
 	claimdata1, err := os.ReadFile(claim1)
 	if err != nil {
-		return fmt.Errorf("failed reading claim1 file: %v", err)
+		return fmt.Errorf("failed reading claim1 file: %w", err)
 	}
 
 	claimdata2, err := os.ReadFile(claim2)
 	if err != nil {
-		return fmt.Errorf("failed reading claim2 file: %v", err)
+		return fmt.Errorf("failed reading claim2 file: %w", err)
 	}
 
 	// unmarshal the files
 	claimFile1Data, err := unmarshalClaimFile(claimdata1)
 	if err != nil {
-		return fmt.Errorf("failed to unmarshal claim1 file: %v", err)
+		return fmt.Errorf("failed to unmarshal claim1 file: %w", err)
 	}
 
 	claimFile2Data, err := unmarshalClaimFile(claimdata2)
 	if err != nil {
-		return fmt.Errorf("failed to unmarshal claim2 file: %v", err)
+		return fmt.Errorf("failed to unmarshal claim2 file: %w", err)
 	}
 
 	// Compare claim versions.

cmd/certsuite/claim/show/csv/csv.go

@@ -90,7 +90,7 @@ func dumpCsv(_ *cobra.Command, _ []string) error {
 	// Parse the claim file into the claim scheme.
 	claimScheme, err := claim.Parse(claimFilePathFlag)
 	if err != nil {
-		return fmt.Errorf("failed to parse claim file %s: %v", claimFilePathFlag, err)
+		return fmt.Errorf("failed to parse claim file %s: %w", claimFilePathFlag, err)
 	}
 
 	// Check claim format version
@@ -186,7 +186,7 @@ func loadCNFTypeMap(path string) (CNFTypeMap map[string]string, err error) { //n
 	// Open the CSV file
 	file, err := os.Open(path)
 	if err != nil {
-		return CNFTypeMap, fmt.Errorf("error opening text file: %s, err:%s", path, err)
+		return CNFTypeMap, fmt.Errorf("error opening text file: %s, err:%w", path, err)
 	}
 	defer file.Close()
 	// initialize map
@@ -195,7 +195,7 @@ func loadCNFTypeMap(path string) (CNFTypeMap map[string]string, err error) { //n
 	// read the file
 	data, err := io.ReadAll(file)
 	if err != nil {
-		return CNFTypeMap, fmt.Errorf("error reading JSON file: %s, err:%s", path, err)
+		return CNFTypeMap, fmt.Errorf("error reading JSON file: %s, err:%w", path, err)
 	}
 
 	err = json.Unmarshal(data, &CNFTypeMap)

cmd/certsuite/claim/show/failures/failures.go

@@ -166,7 +166,7 @@ func getNonCompliantObjectsFromFailureReason(checkDetails string) ([]NonComplian
 
 	err := json.Unmarshal([]byte(checkDetails), &objects)
 	if err != nil {
-		return nil, fmt.Errorf("failed to decode checkDetails %s: %v", checkDetails, err)
+		return nil, fmt.Errorf("failed to decode checkDetails %s: %w", checkDetails, err)
 	}
 
 	// Now let's create a list of our NonCompliantObject-type items.
@@ -286,7 +286,7 @@ func showFailures(_ *cobra.Command, _ []string) error {
 	// Parse the claim file into the claim scheme.
 	claimScheme, err := claim.Parse(claimFilePathFlag)
 	if err != nil {
-		return fmt.Errorf("failed to parse claim file %s: %v", claimFilePathFlag, err)
+		return fmt.Errorf("failed to parse claim file %s: %w", claimFilePathFlag, err)
 	}
 
 	// Check claim format version

cmd/certsuite/generate/feedback/feedback.go

@@ -41,28 +41,28 @@ var (
 func runGenerateFeedbackJsFile(_ *cobra.Command, _ []string) error {
 	dat, err := os.ReadFile(feedbackJSONFilePath)
 	if err != nil {
-		return fmt.Errorf("failed to read json feedback file: %v", err)
+		return fmt.Errorf("failed to read json feedback file: %w", err)
 	}
 	var obj map[string]interface{}
 	err = json.Unmarshal(dat, &obj)
 	if err != nil {
-		return fmt.Errorf("failed to unmarshal json feedback file %s: %v", feedbackJSONFilePath, err)
+		return fmt.Errorf("failed to unmarshal json feedback file %s: %w", feedbackJSONFilePath, err)
 	}
 
 	// Print the JSON content
 	jsonBytes, err := json.MarshalIndent(obj, "", "  ")
 	if err != nil {
-		return fmt.Errorf("failed to marshal feedback js content: %v", err)
+		return fmt.Errorf("failed to marshal feedback js content: %w", err)
 	}
 	feedbackJsFilePath := filepath.Join(feedbackOutputPath, "feedback.js")
 	file, err := os.Create(feedbackJsFilePath)
 	if err != nil {
-		return fmt.Errorf("failed to create javascript feedback file: %v", err)
+		return fmt.Errorf("failed to create javascript feedback file: %w", err)
 	}
 	feedbackjs := "feedback="
 	_, err = file.WriteString(feedbackjs + string(jsonBytes))
 	if err != nil {
-		return fmt.Errorf("failed to write javascript feedback file: %v", err)
+		return fmt.Errorf("failed to write javascript feedback file: %w", err)
 	}
 
 	fmt.Println(feedbackjs + string(jsonBytes))

cmd/certsuite/info/info.go

@@ -32,7 +32,7 @@ func showInfo(cmd *cobra.Command, _ []string) error {
 	// Get a list of matching test cases names
 	testIDs, err := getMatchingTestIDs(testCaseFlag)
 	if err != nil {
-		return fmt.Errorf("could not get the matching test case list, err: %v", err)
+		return fmt.Errorf("could not get the matching test case list, err: %w", err)
 	}
 
 	// Print the list and leave if only listing is required
@@ -123,12 +123,12 @@ func printTestList(testIDs []string) {
 
 func getMatchingTestIDs(labelExpr string) ([]string, error) {
 	if err := checksdb.InitLabelsExprEvaluator(labelExpr); err != nil {
-		return nil, fmt.Errorf("failed to initialize a test case label evaluator, err: %v", err)
+		return nil, fmt.Errorf("failed to initialize a test case label evaluator, err: %w", err)
 	}
 	certsuite.LoadInternalChecksDB()
 	testIDs, err := checksdb.FilterCheckIDs()
 	if err != nil {
-		return nil, fmt.Errorf("could not list test cases, err: %v", err)
+		return nil, fmt.Errorf("could not list test cases, err: %w", err)
 	}
 
 	return testIDs, nil

cmd/certsuite/pkg/claim/claim.go

@@ -90,12 +90,12 @@ type Schema struct {
 func CheckVersion(version string) error {
 	claimSemVersion, err := semver.NewVersion(version)
 	if err != nil {
-		return fmt.Errorf("claim file version %q is not valid: %v", version, err)
+		return fmt.Errorf("claim file version %q is not valid: %w", version, err)
 	}
 
 	supportedSemVersion, err := semver.NewVersion(supportedClaimFormatVersion)
 	if err != nil {
-		return fmt.Errorf("supported claim file version v%v is not valid: v%v", supportedClaimFormatVersion, err)
+		return fmt.Errorf("supported claim file version v%v is not valid: %w", supportedClaimFormatVersion, err)
 	}
 
 	if claimSemVersion.Compare(supportedSemVersion) != 0 {
@@ -109,13 +109,13 @@ func CheckVersion(version string) error {
 func Parse(filePath string) (*Schema, error) {
 	fileBytes, err := os.ReadFile(filePath)
 	if err != nil {
-		return nil, fmt.Errorf("failure reading file: %v", err)
+		return nil, fmt.Errorf("failure reading file: %w", err)
 	}
 
 	claimFile := Schema{}
 	err = json.Unmarshal(fileBytes, &claimFile)
 	if err != nil {
-		return nil, fmt.Errorf("failed to unmarshal file: %v", err)
+		return nil, fmt.Errorf("failed to unmarshal file: %w", err)
 	}
 
 	return &claimFile, nil

cmd/certsuite/run/run.go

@@ -128,10 +128,10 @@ func initTestParamsFromFlags(cmd *cobra.Command) error {
 		var dirPerm fs.FileMode = 0o755 // default permissions for a directory
 		err := os.MkdirAll(testParams.OutputDir, dirPerm)
 		if err != nil {
-			return fmt.Errorf("could not create directory %q, err: %v", testParams.OutputDir, err)
+			return fmt.Errorf("could not create directory %q, err: %w", testParams.OutputDir, err)
 		}
 	} else if err != nil {
-		return fmt.Errorf("could not check directory %q, err: %v", testParams.OutputDir, err)
+		return fmt.Errorf("could not check directory %q, err: %w", testParams.OutputDir, err)
 	}
 
 	// Process the timeout flag

cmd/certsuite/upload/results_spreadsheet/drive_utils.go

@@ -23,7 +23,7 @@ func createDriveFolder(srv *drive.Service, folderName, parentFolderID string) (*
 
 	files, err := call.Do()
 	if err != nil {
-		return nil, fmt.Errorf("unable to list files: %v", err)
+		return nil, fmt.Errorf("unable to list files: %w", err)
 	}
 
 	if len(files.Files) > 0 {
@@ -32,7 +32,7 @@ func createDriveFolder(srv *drive.Service, folderName, parentFolderID string) (*
 
 	createdFolder, err := srv.Files.Create(driveFolder).Do()
 	if err != nil {
-		return nil, fmt.Errorf("unable to create folder: %v", err)
+		return nil, fmt.Errorf("unable to create folder: %w", err)
 	}
 
 	return createdFolder, nil

cmd/certsuite/upload/results_spreadsheet/results_spreadsheet.go

@@ -78,12 +78,12 @@ func CreateSheetsAndDriveServices(credentials string) (sheetService *sheets.Serv
 
 	sheetSrv, err := sheets.NewService(ctx, option.WithAuthCredentialsFile(option.ServiceAccount, credentials))
 	if err != nil {
-		return nil, nil, fmt.Errorf("unable to retrieve Sheets service: %v", err)
+		return nil, nil, fmt.Errorf("unable to retrieve Sheets service: %w", err)
 	}
 
 	driveSrv, err := drive.NewService(ctx, option.WithAuthCredentialsFile(option.ServiceAccount, credentials))
 	if err != nil {
-		return nil, nil, fmt.Errorf("unable to retrieve Drive service: %v", err)
+		return nil, nil, fmt.Errorf("unable to retrieve Drive service: %w", err)
 	}
 
 	return sheetSrv, driveSrv, nil
@@ -206,7 +206,7 @@ func createConclusionsSheet(sheetsService *sheets.Service, driveService *drive.S
 	workloadsFolderName := "Results Per Workload"
 	workloadsResultsFolder, err := createDriveFolder(driveService, workloadsFolderName, mainResultsFolderID)
 	if err != nil {
-		return nil, fmt.Errorf("unable to create workloads results folder: %v", err)
+		return nil, fmt.Errorf("unable to create workloads results folder: %w", err)
 	}
 
 	rawSheetHeaders := GetHeadersFromSheet(rawResultsSheet)
@@ -262,7 +262,7 @@ func createConclusionsSheet(sheetsService *sheets.Service, driveService *drive.S
 			case ResultsConclusionsCol:
 				workloadResultsSpreadsheet, err := createSingleWorkloadRawResultsSpreadSheet(sheetsService, driveService, workloadsResultsFolder, rawResultsSheet, workloadName)
 				if err != nil {
-					return nil, fmt.Errorf("error has occurred while creating %s results file: %v", workloadName, err)
+					return nil, fmt.Errorf("error has occurred while creating %s results file: %w", workloadName, err)
 				}
 
 				hyperlinkFormula := fmt.Sprintf("=HYPERLINK(%q, %q)", workloadResultsSpreadsheet.SpreadsheetUrl, "Results")
@@ -292,7 +292,7 @@ func createConclusionsSheet(sheetsService *sheets.Service, driveService *drive.S
 func createRawResultsSheet(fp string) (*sheets.Sheet, error) {
 	records, err := readCSV(fp)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read csv file: %v", err)
+		return nil, fmt.Errorf("failed to read csv file: %w", err)
 	}
 
 	rows := prepareRecordsForSpreadSheet(records)

cmd/certsuite/upload/results_spreadsheet/sheet_utils.go

@@ -73,7 +73,7 @@ func addBasicFilterToSpreadSheet(srv *sheets.Service, spreadsheet *sheets.Spread
 func addDescendingSortFilterToSheet(srv *sheets.Service, spreadsheet *sheets.Spreadsheet, sheetName, colName string) error {
 	sheetsValues, err := srv.Spreadsheets.Values.Get(spreadsheet.SpreadsheetId, sheetName).Do()
 	if err != nil {
-		return fmt.Errorf("unable to retrieve sheet %s values: %v", sheetName, err)
+		return fmt.Errorf("unable to retrieve sheet %s values: %w", sheetName, err)
 	}
 	headers := GetHeadersFromValueRange(sheetsValues)
 	indices, err := GetHeaderIndicesByColumnNames(headers, []string{colName})
@@ -83,7 +83,7 @@ func addDescendingSortFilterToSheet(srv *sheets.Service, spreadsheet *sheets.Spr
 
 	sheetID, err := GetSheetIDByName(spreadsheet, sheetName)
 	if err != nil {
-		return fmt.Errorf("unable to retrieve sheet %s id: %v", sheetName, err)
+		return fmt.Errorf("unable to retrieve sheet %s id: %w", sheetName, err)
 	}
 
 	requests := []*sheets.Request{
@@ -117,7 +117,7 @@ const booleanConditionTextEQ = "TEXT_EQ"
 func addFilterByFailedAndMandatoryToSheet(srv *sheets.Service, spreadsheet *sheets.Spreadsheet, sheetName string) error {
 	sheetsValues, err := srv.Spreadsheets.Values.Get(spreadsheet.SpreadsheetId, sheetName).Do()
 	if err != nil {
-		return fmt.Errorf("unable to retrieve sheet %s values: %v", sheetName, err)
+		return fmt.Errorf("unable to retrieve sheet %s values: %w", sheetName, err)
 	}
 	headers := GetHeadersFromValueRange(sheetsValues)
 	indices, err := GetHeaderIndicesByColumnNames(headers, []string{"State", "Mandatory/Optional"})
@@ -130,7 +130,7 @@ func addFilterByFailedAndMandatoryToSheet(srv *sheets.Service, spreadsheet *shee
 
 	sheetID, err := GetSheetIDByName(spreadsheet, sheetName)
 	if err != nil {
-		return fmt.Errorf("unable to retrieve sheet %s id: %v", sheetName, err)
+		return fmt.Errorf("unable to retrieve sheet %s id: %w", sheetName, err)
 	}
 
 	requests := []*sheets.Request{