Merge pull request #1341 from imjasonh/auth

use apko Authenticator

go.mod

@@ -3,7 +3,7 @@ module chainguard.dev/melange
 go 1.22.3
 
 require (
-	chainguard.dev/apko v0.15.0
+	chainguard.dev/apko v0.15.1-0.20240702145404-20f57d2660cb
 	cloud.google.com/go/storage v1.42.0
 	dagger.io/dagger v0.11.9
 	github.com/chainguard-dev/clog v1.4.0
@@ -123,7 +123,7 @@ require (
 	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/letsencrypt/boulder v0.0.0-20240617152149-1ece848ae580 // indirect
+	github.com/letsencrypt/boulder v0.0.0-20240627203931-55c274d132fb // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -144,7 +144,7 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/sigstore/cosign/v2 v2.2.4 // indirect
 	github.com/sigstore/rekor v1.3.6 // indirect
-	github.com/sigstore/sigstore v1.8.4 // indirect
+	github.com/sigstore/sigstore v1.8.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/sosodev/duration v1.3.1 // indirect
@@ -156,7 +156,7 @@ require (
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.lsp.dev/uri v0.3.0 // indirect
-	go.mongodb.org/mongo-driver v1.15.1 // indirect
+	go.mongodb.org/mongo-driver v1.16.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect

go.sum

@@ -1,5 +1,5 @@
-chainguard.dev/apko v0.15.0 h1:lbO/dfa602gxuidh1eqaUNwolvrEa73+Fv/du3ByY6s=
-chainguard.dev/apko v0.15.0/go.mod h1:41l++xjHz0zwntVJg/B5r2qWPUxF4lfvvJhkDY2nPgI=
+chainguard.dev/apko v0.15.1-0.20240702145404-20f57d2660cb h1:E7ePJLQxWamfsH52M7qcZYcyCMHXI3o9T+zGtjw3VyM=
+chainguard.dev/apko v0.15.1-0.20240702145404-20f57d2660cb/go.mod h1:Kg5kGNw6NToAvJ8RQcUV3AiJOmTjXLPa85EvbnY95Ks=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14=
 cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU=
@@ -264,8 +264,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kubescape/go-git-url v0.0.30 h1:PIbg86ae0ftee/p/Tu/6CA1ju6VoJ51G3sQWNHOm6wg=
 github.com/kubescape/go-git-url v0.0.30/go.mod h1:3ddc1HEflms1vMhD9owt/3FBES070UaYTUarcjx8jDk=
-github.com/letsencrypt/boulder v0.0.0-20240617152149-1ece848ae580 h1:RKzkrzUuZfNkFCVXFGADOeyf5FKjhE6YtoqU7byNcyc=
-github.com/letsencrypt/boulder v0.0.0-20240617152149-1ece848ae580/go.mod h1:xN4NICCU1WBlUv60BGgMyGuungNTy/aQqjEntJWmgaM=
+github.com/letsencrypt/boulder v0.0.0-20240627203931-55c274d132fb h1:mN3f/ItB4IJXSpV3x2gzrS7pCcFgw5fKLynVGRo05Oc=
+github.com/letsencrypt/boulder v0.0.0-20240627203931-55c274d132fb/go.mod h1:DNWt6HdzbAMkuzimBEe3fsBBjS3IPGVcUoDB0JQzy/k=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -343,8 +343,8 @@ github.com/sigstore/cosign/v2 v2.2.4 h1:iY4vtEacmu2hkNj1Fh+8EBqBwKs2DHM27/lbNWDF
 github.com/sigstore/cosign/v2 v2.2.4/go.mod h1:JZlRD2uaEjVAvZ1XJ3QkkZJhTqSDVtLaet+C/TMR81Y=
 github.com/sigstore/rekor v1.3.6 h1:QvpMMJVWAp69a3CHzdrLelqEqpTM3ByQRt5B5Kspbi8=
 github.com/sigstore/rekor v1.3.6/go.mod h1:JDTSNNMdQ/PxdsS49DJkJ+pRJCO/83nbR5p3aZQteXc=
-github.com/sigstore/sigstore v1.8.4 h1:g4ICNpiENFnWxjmBzBDWUn62rNFeny/P77HUC8da32w=
-github.com/sigstore/sigstore v1.8.4/go.mod h1:1jIKtkTFEeISen7en+ZPWdDHazqhxco/+v9CNjc7oNg=
+github.com/sigstore/sigstore v1.8.6 h1:g066b/Nw5r5oxhNv4XqJUUzVcyf1b07itUueiQe7rZM=
+github.com/sigstore/sigstore v1.8.6/go.mod h1:UOBrJd9JBQ81DrkpGljzsIFXEtfC30raHvLWFWG857U=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -393,8 +393,8 @@ gitlab.alpinelinux.org/alpine/go v0.10.1 h1:QoidnfDyC9yeIMj+CvYVyjlroZD/Kl7JRXGE
 gitlab.alpinelinux.org/alpine/go v0.10.1/go.mod h1:zwds+1zTmPDgwf/9lOzzn+oZVBr6jyfVgH3zuwkfkzc=
 go.lsp.dev/uri v0.3.0 h1:KcZJmh6nFIBeJzTugn5JTU6OOyG0lDOo3R9KwTxTYbo=
 go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I=
-go.mongodb.org/mongo-driver v1.15.1 h1:l+RvoUOoMXFmADTLfYDm7On9dRm7p4T80/lEQM+r7HU=
-go.mongodb.org/mongo-driver v1.15.1/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
+go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4=
+go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck=

pkg/build/build.go

@@ -246,21 +246,15 @@ func (b *Build) BuildGuest(ctx context.Context, imgConfig apko_types.ImageConfig
 	}
 	defer os.RemoveAll(tmp)
 
-	authOpts := make([]apko_build.Option, 0, len(b.Auth))
-	for domain, auth := range b.Auth {
-		authOpts = append(authOpts, apko_build.WithAuth(domain, auth.User, auth.Pass))
-	}
-
 	bc, err := apko_build.New(ctx, guestFS,
-		append(authOpts,
-			apko_build.WithImageConfiguration(imgConfig),
-			apko_build.WithArch(b.Arch),
-			apko_build.WithExtraKeys(b.ExtraKeys),
-			apko_build.WithExtraBuildRepos(b.ExtraRepos),
-			apko_build.WithExtraPackages(b.ExtraPackages),
-			apko_build.WithCacheDir(b.ApkCacheDir, false), // TODO: Replace with real offline plumbing
-			apko_build.WithTempDir(tmp))...,
-	)
+		apko_build.WithImageConfiguration(imgConfig),
+		apko_build.WithArch(b.Arch),
+		apko_build.WithExtraKeys(b.ExtraKeys),
+		apko_build.WithExtraBuildRepos(b.ExtraRepos),
+		apko_build.WithExtraPackages(b.ExtraPackages),
+		apko_build.WithCacheDir(b.ApkCacheDir, false), // TODO: Replace with real offline plumbing
+		apko_build.WithTempDir(tmp))
+
 	if err != nil {
 		return "", fmt.Errorf("unable to create build context: %w", err)
 	}

pkg/build/test.go

@@ -140,21 +140,14 @@ func (t *Test) BuildGuest(ctx context.Context, imgConfig apko_types.ImageConfigu
 	}
 	defer os.RemoveAll(tmp)
 
-	authOpts := make([]apko_build.Option, 0, len(t.Auth))
-	for domain, auth := range t.Auth {
-		authOpts = append(authOpts, apko_build.WithAuth(domain, auth.User, auth.Pass))
-	}
-
 	bc, err := apko_build.New(ctx, guestFS,
-		append(authOpts,
-			apko_build.WithImageConfiguration(imgConfig),
-			apko_build.WithArch(t.Arch),
-			apko_build.WithExtraKeys(t.ExtraKeys),
-			apko_build.WithExtraBuildRepos(t.ExtraRepos),
-			apko_build.WithExtraPackages(t.ExtraTestPackages),
-			apko_build.WithCacheDir(t.ApkCacheDir, false), // TODO: Replace with real offline plumbing
-			apko_build.WithTempDir(tmp))...,
-	)
+		apko_build.WithImageConfiguration(imgConfig),
+		apko_build.WithArch(t.Arch),
+		apko_build.WithExtraKeys(t.ExtraKeys),
+		apko_build.WithExtraBuildRepos(t.ExtraRepos),
+		apko_build.WithExtraPackages(t.ExtraTestPackages),
+		apko_build.WithCacheDir(t.ApkCacheDir, false), // TODO: Replace with real offline plumbing
+		apko_build.WithTempDir(tmp))
 	if err != nil {
 		return "", fmt.Errorf("unable to create build context: %w", err)
 	}

pkg/linter/linter.go

@@ -29,12 +29,13 @@ import (
 	"slices"
 	"strings"
 
-	"chainguard.dev/apko/pkg/apk/expandapk"
 	"github.com/charmbracelet/log"
 	"github.com/dustin/go-humanize"
 	"golang.org/x/exp/maps"
-
 	"gopkg.in/ini.v1"
+
+	"chainguard.dev/apko/pkg/apk/auth"
+	"chainguard.dev/apko/pkg/apk/expandapk"
 )
 
 type linterFunc func(ctx context.Context, pkgname string, fsys fs.FS) error
@@ -591,6 +592,7 @@ func LintAPK(ctx context.Context, path string, require, warn []string) error {
 		if err != nil {
 			return fmt.Errorf("creating HTTP request: %w", err)
 		}
+		auth.DefaultAuthenticators.AddAuth(ctx, req)
 		resp, err := http.DefaultClient.Do(req)
 		if err != nil {
 			return fmt.Errorf("getting apk %q: %w", path, err)