From baeaf66011464ea49954dcf0ec25574b8fa7070c Mon Sep 17 00:00:00 2001
From: Meredith Lancaster <malancas@github.com>
Date: Mon, 24 Mar 2025 19:13:27 -0600
Subject: [PATCH] restructure api client methods

Signed-off-by: Meredith Lancaster <malancas@github.com>
---
 pkg/cmd/attestation/api/client.go | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkg/cmd/attestation/api/client.go b/pkg/cmd/attestation/api/client.go
index d0cffcb27..61d0bee52 100644
--- a/pkg/cmd/attestation/api/client.go
+++ b/pkg/cmd/attestation/api/client.go
@@ -98,29 +98,21 @@ func (c *LiveClient) GetByDigest(params FetchParams) ([]*Attestation, error) {
 	return bundles, nil
 }
 
-func (c *LiveClient) getAttestations(params FetchParams) ([]*Attestation, error) {
+func (c *LiveClient) buildRequestURL(params FetchParams) (string, error) {
 	if err := params.Validate(); err != nil {
-		return nil, err
+		return "", err
 	}
 
-	var urlTemplate string
-	var resourceOwner string
+	var url string
 	if params.Repo != "" {
 		// check if Repo is set first because if Repo has been set, Owner will be set using the value of Repo.
 		// If Repo is not set, the field will remain empty. It will not be populated using the value of Owner.
-		urlTemplate = GetAttestationByRepoAndSubjectDigestPath
-		resourceOwner = params.Repo
+		url = fmt.Sprintf(GetAttestationByRepoAndSubjectDigestPath, params.Repo, params.Digest)
 	} else {
-		urlTemplate = GetAttestationByOwnerAndSubjectDigestPath
-		resourceOwner = params.Owner
+		url = fmt.Sprintf(GetAttestationByOwnerAndSubjectDigestPath, params.Owner, params.Digest)
 	}
-	url := fmt.Sprintf(urlTemplate, resourceOwner, params.Digest)
 
 	perPage := params.Limit
-	if perPage <= 0 || perPage > maxLimitForFlag {
-		return nil, fmt.Errorf("limit must be greater than 0 and less than or equal to %d", maxLimitForFlag)
-	}
-
 	if perPage > maxLimitForFetch {
 		perPage = maxLimitForFetch
 	}
@@ -130,6 +122,14 @@ func (c *LiveClient) getAttestations(params FetchParams) ([]*Attestation, error)
 	if params.PredicateType != "" {
 		url = fmt.Sprintf("%s&predicate_type=%s", url, params.PredicateType)
 	}
+	return url, nil
+}
+
+func (c *LiveClient) getAttestations(params FetchParams) ([]*Attestation, error) {
+	url, err := c.buildRequestURL(params)
+	if err != nil {
+		return nil, err
+	}
 
 	var attestations []*Attestation
 	var resp AttestationsResponse
@@ -139,13 +139,11 @@ func (c *LiveClient) getAttestations(params FetchParams) ([]*Attestation, error)
 	for url != "" && len(attestations) < params.Limit {
 		err := backoff.Retry(func() error {
 			newURL, restErr := c.githubAPI.RESTWithNext(c.host, http.MethodGet, url, nil, &resp)
-
 			if restErr != nil {
 				if shouldRetry(restErr) {
 					return restErr
-				} else {
-					return backoff.Permanent(restErr)
 				}
+				return backoff.Permanent(restErr)
 			}
 
 			url = newURL