add ctx to the Index function

wolfi-dev · Sep 20, 2024 · 28643a8 · 28643a8
1 parent f765ef6
commit 28643a8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pkg/advisory/discover.go b/pkg/advisory/discover.go
@@ -57,7 +57,7 @@ func Discover(ctx context.Context, opts DiscoverOptions) error {
 
 		var apkindexes []*apk.APKIndex
 		for _, arch := range opts.Arches {
-			apkindex, err := index.Index(arch, packageRepositoryURL)
+			apkindex, err := index.Index(ctx, arch, packageRepositoryURL)
 			if err != nil {
 				return fmt.Errorf("unable to get APKINDEX for arch %q: %w", arch, err)
 			}

diff --git a/pkg/cli/advisory_create.go b/pkg/cli/advisory_create.go
@@ -98,7 +98,7 @@ newly created advisory and any other advisories for the same package.`,
 
 			var apkindexes []*apk.APKIndex
 			for _, arch := range archs {
-				idx, err := index.Index(arch, packageRepositoryURL)
+				idx, err := index.Index(cmd.Context(), arch, packageRepositoryURL)
 				if err != nil {
 					return fmt.Errorf("unable to load APKINDEX for %s: %w", arch, err)
 				}

diff --git a/pkg/cli/advisory_update.go b/pkg/cli/advisory_update.go
@@ -89,7 +89,7 @@ required fields are missing.`,
 
 			var apkindexes []*apk.APKIndex
 			for _, arch := range archs {
-				idx, err := index.Index(arch, packageRepositoryURL)
+				idx, err := index.Index(cmd.Context(), arch, packageRepositoryURL)
 				if err != nil {
 					return fmt.Errorf("unable to load APKINDEX for %s: %w", arch, err)
 				}

diff --git a/pkg/cli/advisory_validate.go b/pkg/cli/advisory_validate.go
@@ -165,7 +165,7 @@ print an error message that specifies where and how the data is invalid.`,
 				return fmt.Errorf("unable to create index of advisories repo: %w", err)
 			}
 
-			apkIndex, err := index.Index("x86_64", apkRepositoryURL)
+			apkIndex, err := index.Index(ctx, "x86_64", apkRepositoryURL)
 			if err != nil {
 				return fmt.Errorf("unable to load APKINDEX: %w", err)
 			}

diff --git a/pkg/cli/scan.go b/pkg/cli/scan.go
@@ -742,7 +742,7 @@ func resolveInputsForRemoteTarget(ctx context.Context, inputs []string) (downloa
 		byArch := map[string]*apk.APKIndex{}
 		for _, arch := range []string{"x86_64", "aarch64"} {
 			ig.Go(func() error {
-				apkindex, err := index.Index(arch, apkRepositoryURL)
+				apkindex, err := index.Index(ctx, arch, apkRepositoryURL)
 				if err != nil {
 					return fmt.Errorf("getting APKINDEX: %w", err)
 				}

diff --git a/pkg/index/index.go b/pkg/index/index.go
@@ -13,18 +13,18 @@ import (
 	"chainguard.dev/apko/pkg/apk/auth"
 )
 
-func Index(arch, repo string) (*apk.APKIndex, error) {
+func Index(ctx context.Context, arch, repo string) (*apk.APKIndex, error) {
 	var rc io.ReadCloser
 	if strings.HasPrefix(repo, "http://") || strings.HasPrefix(repo, "https://") {
 		u, err := url.Parse(fmt.Sprintf("%s/%s/APKINDEX.tar.gz", repo, arch))
 		if err != nil {
 			return nil, err
 		}
-		req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, u.String(), nil)
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
 		if err != nil {
 			return nil, err
 		}
-		if err := auth.DefaultAuthenticators.AddAuth(context.TODO(), req); err != nil {
+		if err := auth.DefaultAuthenticators.AddAuth(ctx, req); err != nil {
 			return nil, err
 		}
 		resp, err := http.DefaultClient.Do(req)