fix: usage of Failf and Errorf

checks/alertmanager.go

@@ -36,12 +36,12 @@ func (c *AlertManagerChecker) Check(ctx *context.Context, extConfig external.Che
 
 	connection, err := ctx.GetConnection(check.Connection)
 	if err != nil {
-		return results.Failf("error getting connection: %v", err)
+		return results.Errorf("error getting connection: %v", err)
 	}
 
 	parsedURL, err := url.Parse(connection.URL)
 	if err != nil {
-		return results.Failf("error parsing url: %v", err)
+		return results.Errorf("error parsing url: %v", err)
 	}
 	client := alertmanagerClient.NewHTTPClientWithConfig(nil, &alertmanagerClient.TransportConfig{
 		Host:     parsedURL.Host,
@@ -67,8 +67,7 @@ func (c *AlertManagerChecker) Check(ctx *context.Context, extConfig external.Che
 		Filter:  filters,
 	})
 	if err != nil {
-		results.Errorf("error fetching from alertmanager: %v", err)
-		return results
+		return results.Errorf("error fetching from alertmanager: %v", err)
 	}
 
 	type Alerts struct {

checks/aws_config.go

@@ -40,7 +40,7 @@ func (c *AwsConfigChecker) Check(ctx *context.Context, extConfig external.Check)
 		check.AWSConnection = &connection.AWSConnection{}
 	} else {
 		if err := check.AWSConnection.Populate(ctx); err != nil {
-			return results.Failf("failed to populate aws connection: %v", err)
+			return results.Errorf("failed to populate aws connection: %v", err)
 		}
 	}
 

checks/aws_config_rule.go

@@ -42,19 +42,15 @@ func (c *AwsConfigRuleChecker) Check(ctx *context.Context, extConfig external.Ch
 	if check.AWSConnection == nil {
 		check.AWSConnection = &connection.AWSConnection{}
 	} else if err := check.AWSConnection.Populate(ctx); err != nil {
-		return results.Failf("failed to populate aws connection: %v", err)
+		return results.Errorf("failed to populate aws connection: %v", err)
 	}
 
 	cfg, err := awsUtil.NewSession(ctx.Context, *check.AWSConnection)
 	if err != nil {
-		return results.Failf("failed to create a session: %v", err)
+		return results.Errorf("failed to create a session: %v", err)
 	}
 
 	client := configservice.NewFromConfig(*cfg)
-	if err != nil {
-		return results.Failf("failed to describe compliance rules: %v", err)
-	}
-
 	var complianceTypes = []types.ComplianceType{}
 	for _, i := range check.ComplianceTypes {
 		complianceTypes = append(complianceTypes, types.ComplianceType(i))
@@ -64,7 +60,7 @@ func (c *AwsConfigRuleChecker) Check(ctx *context.Context, extConfig external.Ch
 		ConfigRuleNames: check.Rules,
 	})
 	if err != nil {
-		return results.Failf("failed to describe compliance rules: %v", err)
+		return results.Errorf("failed to describe compliance rules: %v", err)
 	}
 
 	type ConfigRuleResource struct {

checks/azure_devops.go

@@ -41,22 +41,22 @@ func (t *AzureDevopsChecker) check(ctx *context.Context, check v1.AzureDevopsChe
 	if check.PersonalAccessToken.ValueStatic != "" {
 		c = &models.Connection{Password: check.PersonalAccessToken.ValueStatic}
 	} else if c, err = ctx.HydrateConnectionByURL(check.ConnectionName); err != nil {
-		return results.Failf("failed to hydrate connection: %v", err)
+		return results.Errorf("failed to hydrate connection: %v", err)
 	} else if c != nil {
 		if c, err = c.Merge(ctx, check); err != nil {
-			return results.Failf("failed to merge connection: %v", err)
+			return results.Errorf("failed to merge connection: %v", err)
 		}
 	}
 
 	connection := azuredevops.NewPatConnection(fmt.Sprintf("https://dev.azure.com/%s", check.Organization), c.Password)
 	coreClient, err := core.NewClient(ctx, connection)
 	if err != nil {
-		return results.Errorf("failed to create core client: %w", err)
+		return results.Errorf("failed to create core client: %v", err)
 	}
 
 	project, err := coreClient.GetProject(ctx, core.GetProjectArgs{ProjectId: &check.Project})
 	if err != nil {
-		return results.Errorf("failed to get project (name=%s): %w", check.Project, err)
+		return results.Errorf("failed to get project (name=%s): %v", check.Project, err)
 	}
 	projectID := project.Id.String()
 
@@ -68,7 +68,7 @@ func (t *AzureDevopsChecker) check(ctx *context.Context, check v1.AzureDevopsChe
 	pipelineClient := pipelines.NewClient(ctx, connection)
 	allPipelines, err := pipelineClient.ListPipelines(ctx, pipelines.ListPipelinesArgs{Project: &projectID})
 	if err != nil {
-		return results.Errorf("failed to get pipeline (project=%s): %w", check.Project, err)
+		return results.Errorf("failed to get pipeline (project=%s): %v", check.Project, err)
 	}
 
 	for _, pipeline := range *allPipelines {
@@ -89,7 +89,7 @@ func (t *AzureDevopsChecker) check(ctx *context.Context, check v1.AzureDevopsChe
 		// https://learn.microsoft.com/en-us/rest/api/azure/devops/pipelines/runs/list?view=azure-devops-rest-7.1
 		runs, err := pipelineClient.ListRuns(ctx, pipelines.ListRunsArgs{PipelineId: pipeline.Id, Project: &projectID})
 		if err != nil {
-			return results.Errorf("failed to get runs (pipeline=%s): %w", check.Pipeline, err)
+			return results.Errorf("failed to get runs (pipeline=%s): %v", check.Pipeline, err)
 		}
 
 		latestRun := getLatestCompletedRun(*runs)
@@ -105,7 +105,7 @@ func (t *AzureDevopsChecker) check(ctx *context.Context, check v1.AzureDevopsChe
 		// because the ListRuns API doesn't return Resources.
 		latestRun, err = pipelineClient.GetRun(ctx, pipelines.GetRunArgs{Project: &projectID, PipelineId: pipeline.Id, RunId: (*runs)[0].Id})
 		if err != nil {
-			return results.Errorf("failed to get run (pipeline=%s): %w", check.Pipeline, err)
+			return results.Errorf("failed to get run (pipeline=%s): %v", check.Pipeline, err)
 		}
 
 		if !matchBranchNames(check.Branches, latestRun.Resources) {

checks/catalog.go

@@ -30,7 +30,7 @@ func (c *CatalogChecker) Check(ctx *canaryContext.Context, check v1.CatalogCheck
 
 	items, err := query.FindConfigsByResourceSelector(ctx.Context, check.Selector...)
 	if err != nil {
-		return results.Failf("failed to fetch catalogs: %v", err)
+		return results.Errorf("failed to fetch catalogs: %v", err)
 	}
 
 	var configItems []map[string]any

checks/cloudwatch.go

@@ -39,7 +39,7 @@ func (c *CloudWatchChecker) Check(ctx *context.Context, extConfig external.Check
 	results = append(results, result)
 
 	if err := check.AWSConnection.Populate(ctx); err != nil {
-		return results.Failf("failed to populate aws connection: %v", err)
+		return results.Errorf("failed to populate aws connection: %v", err)
 	}
 
 	cfg, err := awsUtil.NewSession(ctx.Context, check.AWSConnection)

checks/database_backup_gcp.go

@@ -29,7 +29,7 @@ func GCPDatabaseBackupCheck(ctx *context.Context, check v1.DatabaseBackupCheck)
 	results = append(results, result)
 
 	if err := check.GCP.HydrateConnection(ctx); err != nil {
-		return results.Failf("failed to populate GCP connection: %v", err)
+		return results.Errorf("failed to populate GCP connection: %v", err)
 	}
 
 	svc, err := gcp.NewSQLAdmin(ctx.Context, check.GCP.GCPConnection)

checks/dns.go

@@ -54,7 +54,7 @@ func (c *DNSChecker) Check(ctx *canaryContext.Context, extConfig external.Check)
 	if check.Server != "" {
 		dialer, err := getDialer(check, timeout)
 		if err != nil {
-			return results.Failf("Failed to get dialer, %v", err)
+			return results.Errorf("Failed to get dialer, %v", err)
 		}
 		r = net.Resolver{
 			PreferGo: true,
@@ -71,7 +71,7 @@ func (c *DNSChecker) Check(ctx *canaryContext.Context, extConfig external.Check)
 
 	resultCh := make(chan *pkg.CheckResult, 1)
 	if fn, ok := resolvers[strings.ToUpper(queryType)]; !ok {
-		return results.Failf("unknown query type: %s", queryType)
+		return results.Errorf("unknown query type: %s", queryType)
 	} else {
 		go func() {
 			pass, message, err := fn(ctx, &r, check)

checks/dynatrace.go

@@ -33,7 +33,7 @@ func (t *DynatraceChecker) Check(ctx *context.Context, extConfig external.Check)
 
 	apiKey, err := ctx.GetEnvValueFromCache(check.APIKey)
 	if err != nil {
-		return results.Failf("error getting Dynatrace API key: %v", err)
+		return results.Errorf("error getting Dynatrace API key: %v", err)
 	}
 
 	config := dynatrace.NewConfiguration()
@@ -46,7 +46,7 @@ func (t *DynatraceChecker) Check(ctx *context.Context, extConfig external.Check)
 	apiClient := dynatrace.NewAPIClient(config)
 	problems, apiResponse, err := apiClient.ProblemsApi.GetProblems(ctx).Execute()
 	if err != nil {
-		return results.Failf("error getting Dynatrace problems: %s", err.Error())
+		return results.Errorf("error getting Dynatrace problems: %s", err.Error())
 	}
 	defer apiResponse.Body.Close()
 

checks/elasticsearch.go

@@ -35,7 +35,7 @@ func (c *ElasticsearchChecker) Check(ctx *context.Context, extConfig external.Ch
 
 	connection, err := ctx.GetConnection(check.Connection)
 	if err != nil {
-		return results.Failf("error getting connection: %v", err)
+		return results.Errorf("error getting connection: %v", err)
 	}
 
 	cfg := elasticsearch.Config{

checks/exec.go

@@ -141,7 +141,7 @@ func execPowershell(ctx *context.Context, check v1.ExecCheck, envParams *execEnv
 
 	ps, err := exec.LookPath("powershell.exe")
 	if err != nil {
-		return results.Failf("powershell not found")
+		return results.Errorf("powershell not found")
 	}
 
 	args := []string{check.Script}

checks/folder_gcs.go

@@ -22,15 +22,15 @@ func CheckGCSBucket(ctx *context.Context, check v1.FolderCheck) pkg.Results {
 	results = append(results, result)
 
 	if check.GCSConnection == nil {
-		return results.Errorf("missing GCS connection")
+		return results.Invalidf("missing GCS connection")
 	}
 
 	var bucket string
 	bucket, check.Path = parseGCSPath(check.Path)
 
 	connection, err := ctx.HydrateConnectionByURL(check.GCPConnection.ConnectionName)
 	if err != nil {
-		return results.Failf("failed to populate GCS connection: %v", err)
+		return results.Errorf("failed to populate GCS connection: %v", err)
 	} else if connection == nil {
 		connection = &models.Connection{Type: models.ConnectionTypeGCS}
 		if check.GCSConnection.Bucket == "" {
@@ -39,7 +39,7 @@ func CheckGCSBucket(ctx *context.Context, check v1.FolderCheck) pkg.Results {
 
 		connection, err = connection.Merge(ctx, check.GCSConnection)
 		if err != nil {
-			return results.Failf("failed to populate GCS connection: %v", err)
+			return results.Errorf("failed to populate GCS connection: %v", err)
 		}
 	}
 

checks/folder_s3.go

@@ -32,7 +32,7 @@ func CheckS3Bucket(ctx *context.Context, check v1.FolderCheck) pkg.Results {
 
 	connection, err := ctx.HydrateConnectionByURL(check.AWSConnection.ConnectionName)
 	if err != nil {
-		return results.Failf("failed to populate AWS connection: %v", err)
+		return results.Errorf("failed to populate AWS connection: %v", err)
 	} else if connection == nil {
 		connection = &models.Connection{Type: models.ConnectionTypeS3}
 		if check.S3Connection.Bucket == "" {
@@ -41,7 +41,7 @@ func CheckS3Bucket(ctx *context.Context, check v1.FolderCheck) pkg.Results {
 
 		connection, err = connection.Merge(ctx, check.S3Connection)
 		if err != nil {
-			return results.Failf("failed to populate AWS connection: %v", err)
+			return results.Errorf("failed to populate AWS connection: %v", err)
 		}
 	}
 

checks/folder_sftp.go

@@ -18,7 +18,7 @@ func CheckSFTP(ctx *context.Context, check v1.FolderCheck) pkg.Results {
 
 	foundConn, err := check.SFTPConnection.HydrateConnection(ctx)
 	if err != nil {
-		return results.Failf("failed to populate SFTP connection: %v", err)
+		return results.Errorf("failed to populate SFTP connection: %v", err)
 	}
 
 	auth := check.SFTPConnection.Authentication

checks/folder_smb.go

@@ -23,7 +23,7 @@ func CheckSmb(ctx *context.Context, check v1.FolderCheck) pkg.Results {
 
 	foundConn, err := check.SMBConnection.HydrateConnection(ctx)
 	if err != nil {
-		return results.Failf("failed to populate SMB connection: %v", err)
+		return results.Errorf("failed to populate SMB connection: %v", err)
 	}
 
 	auth := check.SMBConnection.Authentication

checks/git_protocol.go

@@ -105,12 +105,12 @@ func (c *GitProtocolChecker) Check(ctx *context.Context, extConfig external.Chec
 	// Fetching Git Username
 	username, err := ctx.GetEnvValueFromCache(check.Username)
 	if err != nil {
-		return results.Failf("error fetching git user from env cache: %v", err)
+		return results.Errorf("error fetching git user from env cache: %v", err)
 	}
 	// Fetching Git Password
 	password, err := ctx.GetEnvValueFromCache(check.Password)
 	if err != nil {
-		return results.Failf("error fetching git password from env cache: %v", err)
+		return results.Errorf("error fetching git password from env cache: %v", err)
 	}
 
 	if len(filename) == 0 {
@@ -119,7 +119,7 @@ func (c *GitProtocolChecker) Check(ctx *context.Context, extConfig external.Chec
 
 	// Push Changes
 	if err := pushChanges(check.Repository, username, password, filename); err != nil {
-		return results.Failf("error pushing changes: %v", err)
+		return results.Errorf("error pushing changes: %v", err)
 	}
 
 	details := map[string]string{

checks/github.go

@@ -38,13 +38,13 @@ func (c *GitHubChecker) Check(ctx *context.Context, extConfig external.Check) pk
 
 	var githubToken string
 	if connection, err := ctx.HydrateConnectionByURL(check.ConnectionName); err != nil {
-		return results.Failf("failed to find connection for github token %q: %v", check.ConnectionName, err)
+		return results.Errorf("failed to find connection for github token %q: %v", check.ConnectionName, err)
 	} else if connection != nil {
 		githubToken = connection.Password
 	} else {
 		githubToken, err = ctx.GetEnvValueFromCache(check.GithubToken)
 		if err != nil {
-			return results.Failf("error fetching github token from env cache: %v", err)
+			return results.Errorf("error fetching github token from env cache: %v", err)
 		}
 	}
 
@@ -56,13 +56,13 @@ func (c *GitHubChecker) Check(ctx *context.Context, extConfig external.Check) pk
 	cmd.Env = append(cmd.Env, "GITHUB_TOKEN="+githubToken)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return results.Failf("error executing askgit command. output=%q: %v", output, err)
+		return results.Errorf("error executing askgit command. output=%q: %v", output, err)
 	}
 
 	var rowResults = make([]map[string]any, 0)
 	err = json.Unmarshal(output, &rowResults)
 	if err != nil {
-		return results.Failf("error parsing mergestat result: %v", err)
+		return results.Errorf("error parsing mergestat result: %v", err)
 	}
 
 	result.AddDetails(rowResults)

checks/http.go

@@ -241,7 +241,11 @@ func (c *HTTPChecker) Check(ctx *context.Context, check v1.HTTPCheck) pkg.Result
 	}
 
 	if ok := response.IsOK(check.ResponseCodes...); !ok {
-		return results.Failf("response code invalid %d != %v", status, check.ResponseCodes)
+		if len(check.ResponseCodes) > 0 {
+			return results.Failf("response code invalid. %d != %v", status, check.ResponseCodes)
+		} else {
+			return results.Failf("response code invalid. %d is not 2xx", status)
+		}
 	}
 
 	if check.ThresholdMillis > 0 && check.ThresholdMillis < int(elapsed.Milliseconds()) {

checks/jmeter.go

@@ -44,15 +44,15 @@ func (c *JmeterChecker) Check(ctx *context.Context, extConfig external.Check) pk
 	//FIXME: the jmx file should not be cached
 	value, err := ctx.GetEnvValueFromCache(check.Jmx)
 	if err != nil {
-		return results.Failf("Failed to parse the jmx plan: %v", err)
+		return results.Errorf("Failed to parse the jmx plan: %v", err)
 	}
 
 	testPlanFilename := fmt.Sprintf("/tmp/jmx-%s-%s-%d.jmx", namespace, check.Jmx.Name, rand.Int())
 	logFilename := fmt.Sprintf("/tmp/jmx-%s-%s-%d.jtl", namespace, check.Jmx.Name, rand.Int())
 	err = os.WriteFile(testPlanFilename, []byte(value), 0755)
 	defer os.Remove(testPlanFilename) // nolint: errcheck
 	if err != nil {
-		return results.Failf("unable to write test plan file")
+		return results.Errorf("unable to write test plan file")
 	}
 
 	var host string
@@ -67,21 +67,21 @@ func (c *JmeterChecker) Check(ctx *context.Context, extConfig external.Check) pk
 	_, ok := exec.SafeExec(jmeterCmd)
 	defer os.Remove(logFilename) // nolint: errcheck
 	if !ok {
-		return results.Failf("error running the jmeter command: %v", jmeterCmd)
+		return results.Errorf("error running the jmeter command: %v", jmeterCmd)
 	}
 	raw, err := os.ReadFile(logFilename)
 	if err != nil {
-		return results.Failf("error opening the log file: %v", err)
+		return results.Errorf("error opening the log file: %v", err)
 	}
 	elapsedTime, err := checkLogs(raw)
 	if err != nil {
-		return results.Failf("check failed: %v", err)
+		return results.Errorf("check failed: %v", err)
 	}
 	totalDuration := time.Duration(elapsedTime) * time.Millisecond
 	if check.ResponseDuration != "" {
 		resDuration, err := time.ParseDuration(check.ResponseDuration)
 		if err != nil {
-			return results.Failf("error parsing response duration: %v", err)
+			return results.Errorf("error parsing response duration: %v", err)
 		}
 		if totalDuration > resDuration {
 			return results.Failf("the response took %v longer than specified", (totalDuration - resDuration).String())

checks/junit.go

@@ -144,7 +144,7 @@ func podExecf(ctx *context.Context, pod corev1.Pod, results pkg.Results, cmd str
 	_cmd := fmt.Sprintf(cmd, args...)
 	stdout, stderr, err := ctx.Kommons().ExecutePodf(pod.Namespace, pod.Name, containerName, "bash", "-c", _cmd)
 	if stderr != "" || err != nil {
-		podFail(ctx, pod, results.Failf("error running %s: %v %v %v", _cmd, stdout, stderr, err))
+		podFail(ctx, pod, results.Errorf("error running %s: %v %v %v", _cmd, stdout, stderr, err))
 		return "", false
 	}
 	return strings.TrimSpace(stdout), true
@@ -191,7 +191,7 @@ func (c *JunitChecker) Check(ctx *context.Context, extConfig external.Check) pkg
 	results = append(results, result)
 
 	if ctx.Kommons() == nil {
-		return results.Failf("Kubernetes is not initialized")
+		return results.Errorf("Kubernetes is not initialized")
 	}
 
 	k8s := ctx.Kubernetes()