Change back to max-wait instead of max-retries

Author: FayeSGW

cmd/kosli/attestSonar.go

@@ -24,7 +24,7 @@ type attestSonarOptions struct {
 	projectKey string
 	serverURL  string
 	revision   string
-	maxRetries int
+	maxWait    int
 	payload    SonarAttestationPayload
 }
 
@@ -39,9 +39,9 @@ The scan to be retrieved can be specified in two ways:
 If you have overriden the location of this folder by passing parameters to the Sonar scanner, or are running Kosli's CLI locally outside the repo's base directory,
 you can provide the correct path using the ^--sonar-working-dir^ flag. This metadata is generated by a specific scan, allowing Kosli to retrieve the results of that scan.  
 If there are delays in the scan processing (either because the scanned project is very large, or because SonarQube is experiencing processing delays), it may happen that 
-the scan results are not available by the time the attest sonar command is executed. In this case you can use the ^--max-retries^ flag to retry the command while waiting for the scan to be processed. 
-This flag takes the maximum number of retries for the Kosli CLI to attempt to retrieve the scan results, with exponential backoff. Once the results 
-are available they are attested to Kosli as usual.
+the scan results are not available by the time the attest sonar command is executed. In this case you can use the ^--max-wait^ flag to retry the command while waiting for the scan to be processed. 
+This flag takes the maximum number of seconds to wait for the results to be available. The Kosli CLI will then attempt to retrieve the scan results until the maximum wait time is reached, with 
+exponential backoff between retries. Once the results are available they are attested to Kosli as usual.
 
 2. Providing the Sonar project key and the revision of the scan (plus the SonarQube server URL if relevant). If running the Kosli CLI in some CI/CD pipeline, the revision
 is defaulted to the commit SHA. If you are running the command locally, or have overriden the revision in SonarQube via parameters to the Sonar scanner, you can
@@ -62,7 +62,7 @@ kosli attest sonar \
 	--api-token yourAPIToken \
 	--org yourOrgName \
 
-# report a SonarQube Server attestation about a trail using SonarQube's metadata, allowing for up to 10 retries:
+# report a SonarQube Server attestation about a trail using SonarQube's metadata, waiting for up to 60 seconds for the results to be available:
 kosli attest sonar \
 	--name yourAttestationName \
 	--flow yourFlowName \
@@ -71,7 +71,7 @@ kosli attest sonar \
 	--sonar-working-dir yourSonarWorkingDirPath \
 	--api-token yourAPIToken \
 	--org yourOrgName \
-	--max-retries 10
+	--max-wait 60
 
 # report a SonarQube Cloud attestation for a specific branch about a trail using key/revision:
 kosli attest sonar \
@@ -98,7 +98,7 @@ kosli attest sonar \
 	--api-token yourAPIToken \
 	--org yourOrgName \
 
-# report a SonarQube Cloud attestation about a trail with an attachment using SonarQube's metadata, allowing for up to 5 retries:
+# report a SonarQube Cloud attestation about a trail with an attachment using SonarQube's metadata, waiting for up to 300 seconds for the results to be available:
 kosli attest sonar \
 	--name yourAttestationName \
 	--flow yourFlowName \
@@ -108,7 +108,7 @@ kosli attest sonar \
 	--attachment yourAttachmentPath \
 	--api-token yourAPIToken \
 	--org yourOrgName \
-	--max-retries 5
+	--max-wait 300
 `
 
 func newAttestSonarCmd(out io.Writer) *cobra.Command {
@@ -164,7 +164,7 @@ func newAttestSonarCmd(out io.Writer) *cobra.Command {
 	cmd.Flags().StringVar(&o.projectKey, "sonar-project-key", "", sonarProjectKeyFlag)
 	cmd.Flags().StringVar(&o.serverURL, "sonar-server-url", "https://sonarcloud.io", sonarServerURLFlag)
 	cmd.Flags().StringVar(&o.revision, "sonar-revision", o.commitSHA, sonarRevisionFlag)
-	cmd.Flags().IntVar(&o.maxRetries, "max-retries", 0, sonarMaxRetriesFlag)
+	cmd.Flags().IntVar(&o.maxWait, "max-wait", 30, sonarMaxWaitFlag)
 
 	err := RequireFlags(cmd, []string{"flow", "trail", "name", "sonar-api-token"})
 	if err != nil {
@@ -182,7 +182,7 @@ func (o *attestSonarOptions) run(args []string) error {
 		return err
 	}
 
-	sc := sonar.NewSonarConfig(o.apiToken, o.workingDir, o.ceTaskURL, o.projectKey, o.serverURL, o.revision, o.maxRetries)
+	sc := sonar.NewSonarConfig(o.apiToken, o.workingDir, o.ceTaskURL, o.projectKey, o.serverURL, o.revision, o.maxWait)
 
 	o.payload.SonarResults, err = sc.GetSonarResults(logger)
 	if err != nil {

cmd/kosli/root.go

@@ -241,7 +241,7 @@ The ^.kosli_ignore^ will be treated as part of the artifact like any other file,
 	sonarProjectKeyFlag                  = "[conditional] The project key of the SonarCloud/SonarQube project. Only required if you want to use the project key/revision to get the scan results rather than using Sonar's metadata file."
 	sonarServerURLFlag                   = "[conditional] The URL of your SonarQube server. Only required if you are using SonarQube and not using SonarQube's metadata file to get scan results."
 	sonarRevisionFlag                    = "[conditional] The revision of the SonarCloud/SonarQube project. Only required if you want to use the project key/revision to get the scan results rather than using Sonar's metadata file and you have overridden the default revision, or you aren't using a CI. Defaults to the value of the git commit flag."
-	sonarMaxRetriesFlag                  = "[optional] Allow the command to retry fetching the scan results from SonarQube, up to the maximum number of retries provided, with exponential backoff. Useful when using SonarQube's metadata file to retrieve and attest scans that take a long time to process . Defaults to 0."
+	sonarMaxWaitFlag                     = "[optional] Allow the command to wait and retry fetching the scan results from SonarQube, up to the maximum number of seconds provided, with exponential backoff. Useful when using SonarQube's metadata file to retrieve and attest scans that take a long time to process . Defaults to 30 seconds."
 	logicalEnvFlag                       = "[required] The logical environment."
 	physicalEnvFlag                      = "[required] The physical environment."
 	attestationTypeDescriptionFlag       = "[optional] The attestation type description."

internal/sonar/sonar.go

@@ -20,7 +20,7 @@ type SonarConfig struct {
 	revision   string
 	projectKey string
 	serverURL  string
-	maxRetries int
+	maxWait    int
 }
 
 // Structs to build the JSON for our attestation payload
@@ -113,15 +113,15 @@ type Error struct {
 	Msg string `json:"msg"`
 }
 
-func NewSonarConfig(apiToken, workingDir, ceTaskUrl, projectKey, serverURL, revision string, maxRetries int) *SonarConfig {
+func NewSonarConfig(apiToken, workingDir, ceTaskUrl, projectKey, serverURL, revision string, maxWait int) *SonarConfig {
 	return &SonarConfig{
 		APIToken:   apiToken,
 		WorkingDir: workingDir,
 		CETaskUrl:  ceTaskUrl,
 		revision:   revision,
 		projectKey: projectKey,
 		serverURL:  serverURL,
-		maxRetries: maxRetries,
+		maxWait:    maxWait,
 	}
 }
 
@@ -164,7 +164,7 @@ func (sc *SonarConfig) GetSonarResults(logger *log.Logger) (*SonarResults, error
 
 	if analysisID == "" {
 		//Get the analysis ID, status, project name and branch data from the ceTaskURL (ce API)
-		analysisID, err = GetCETaskData(httpClient, project, sonarResults, sc.CETaskUrl, tokenHeader, sc.maxRetries, logger)
+		analysisID, err = GetCETaskData(httpClient, project, sonarResults, sc.CETaskUrl, tokenHeader, sc.maxWait, logger)
 		if err != nil {
 			return nil, err
 		}
@@ -215,7 +215,7 @@ func (sc *SonarConfig) readFile(project *Project, results *SonarResults) error {
 	return nil
 }
 
-func GetCETaskData(httpClient *http.Client, project *Project, sonarResults *SonarResults, ceTaskURL, tokenHeader string, maxRetries int, logger *log.Logger) (string, error) {
+func GetCETaskData(httpClient *http.Client, project *Project, sonarResults *SonarResults, ceTaskURL, tokenHeader string, maxWait int, logger *log.Logger) (string, error) {
 	taskRequest, err := http.NewRequest("GET", ceTaskURL, nil)
 	taskRequest.Header.Add("Authorization", tokenHeader)
 	if err != nil {
@@ -227,7 +227,7 @@ func GetCETaskData(httpClient *http.Client, project *Project, sonarResults *Sona
 	elapsed := 0 // seconds elapsed
 	taskResponseData := &TaskResponse{}
 
-	for retries < maxRetries || maxRetries == 0 {
+	for elapsed < maxWait {
 		taskResponse, err := httpClient.Do(taskRequest)
 		if err != nil {
 			return "", err
@@ -238,14 +238,15 @@ func GetCETaskData(httpClient *http.Client, project *Project, sonarResults *Sona
 			return "", fmt.Errorf("please check your API token is correct and you have the correct permissions in SonarQube")
 		}
 
-		if maxRetries == 0 {
-			taskResponse.Body.Close()
-			break
-		}
-
 		if taskResponseData.Task.Status == "PENDING" || taskResponseData.Task.Status == "IN_PROGRESS" {
+			// So that we don't wait longer than maxWait
+			if (elapsed + wait) > maxWait {
+				wait = maxWait - elapsed
+			}
+
 			logger.Info("retry %d: waiting %ds for SonarQube scan to be processed...", retries+1, wait)
 			time.Sleep(time.Duration(wait) * time.Second)
+
 			if elapsed > 300 { // If we've waited 5 minutes, we'll wait 300 seconds (5 minutes) before checking again. This is so that we don't end up with extremely long waiting intervals with the doubling approach.
 				elapsed += wait
 				retries++