From 938ad67e193255ebb81b4880271eb315cb75c6bf Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Tue, 18 Jun 2024 14:15:19 -0700 Subject: [PATCH] Bump apko to v0.15.0 Fix everything that breaks. Signed-off-by: Jon Johnson --- go.mod | 14 +++++++------- go.sum | 28 +++++++++++++-------------- pkg/build/build.go | 2 +- pkg/build/test.go | 2 +- pkg/cli/commands.go | 7 ++----- pkg/config/schema.json | 6 ++++++ pkg/container/docker/docker_runner.go | 9 ++++----- pkg/convert/apkbuild/apkbuild.go | 2 +- pkg/convert/gem/gem.go | 2 +- pkg/convert/gem/gem_test.go | 6 +++--- 10 files changed, 40 insertions(+), 38 deletions(-) diff --git a/go.mod b/go.mod index 7cfdd2427..3a2e5cf18 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module chainguard.dev/melange go 1.22.3 require ( - chainguard.dev/apko v0.14.9 + chainguard.dev/apko v0.15.0 cloud.google.com/go/storage v1.42.0 dagger.io/dagger v0.11.6 github.com/chainguard-dev/clog v1.3.1 @@ -11,7 +11,7 @@ require ( github.com/chainguard-dev/yam v0.0.8 github.com/charmbracelet/log v0.4.0 github.com/docker/cli v26.1.4+incompatible - github.com/docker/docker v26.1.4+incompatible + github.com/docker/docker v27.0.0+incompatible github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 github.com/github/go-spdx/v2 v2.2.0 github.com/go-git/go-git/v5 v5.12.0 @@ -36,7 +36,7 @@ require ( go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 - golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 + golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 golang.org/x/sync v0.7.0 golang.org/x/sys v0.21.0 golang.org/x/text v0.16.0 @@ -76,7 +76,7 @@ require ( github.com/chainguard-dev/git-urls v1.0.2 // indirect github.com/charmbracelet/lipgloss v0.11.0 // indirect github.com/charmbracelet/x/ansi v0.1.2 // indirect - github.com/cloudflare/circl v1.3.8 // indirect + github.com/cloudflare/circl v1.3.9 // indirect github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect @@ -121,7 +121,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-20240605191410-3786401f107b // indirect + github.com/letsencrypt/boulder v0.0.0-20240617152149-1ece848ae580 // 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 @@ -154,7 +154,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.0 // indirect + go.mongodb.org/mongo-driver v1.15.1 // 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 @@ -168,7 +168,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect diff --git a/go.sum b/go.sum index a8ada256e..bbdd475d5 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -chainguard.dev/apko v0.14.9 h1:FmI6kCH5ICFL8T+Z6fa76Llxj47SowVfrexdkX7dOkM= -chainguard.dev/apko v0.14.9/go.mod h1:aFEwAkFsf7sXvVFQ2ui6KRK3tbG3mIl5PmPd4JqKGVM= +chainguard.dev/apko v0.15.0 h1:lbO/dfa602gxuidh1eqaUNwolvrEa73+Fv/du3ByY6s= +chainguard.dev/apko v0.15.0/go.mod h1:41l++xjHz0zwntVJg/B5r2qWPUxF4lfvvJhkDY2nPgI= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.114.0 h1:OIPFAdfrFDFO2ve2U7r/H5SwSbBzEdrBdE7xkgwc+kY= cloud.google.com/go v0.114.0/go.mod h1:ZV9La5YYxctro1HTPug5lXH/GefROyW8PPD4T8n9J8E= @@ -76,8 +76,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI= -github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE= +github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ= github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w= @@ -101,8 +101,8 @@ github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwen github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= -github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.0.0+incompatible h1:JRugTYuelmWlW0M3jakcIadDx2HUoUO6+Tf2C5jVfwA= +github.com/docker/docker v27.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -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-20240605191410-3786401f107b h1:g4PQ+zxO6voXxB6qySemWUJgY1gFns/K/2nyJyw6sCQ= -github.com/letsencrypt/boulder v0.0.0-20240605191410-3786401f107b/go.mod h1:xN4NICCU1WBlUv60BGgMyGuungNTy/aQqjEntJWmgaM= +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/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= @@ -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.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc= -go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= +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.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= @@ -427,8 +427,8 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM= -golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= +golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -563,8 +563,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/pkg/build/build.go b/pkg/build/build.go index b28c82554..8317b29ca 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -256,7 +256,7 @@ func (b *Build) BuildGuest(ctx context.Context, imgConfig apko_types.ImageConfig apko_build.WithImageConfiguration(imgConfig), apko_build.WithArch(b.Arch), apko_build.WithExtraKeys(b.ExtraKeys), - apko_build.WithExtraRepos(b.ExtraRepos), + 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))..., diff --git a/pkg/build/test.go b/pkg/build/test.go index 533790333..5556e9a38 100644 --- a/pkg/build/test.go +++ b/pkg/build/test.go @@ -150,7 +150,7 @@ func (t *Test) BuildGuest(ctx context.Context, imgConfig apko_types.ImageConfigu apko_build.WithImageConfiguration(imgConfig), apko_build.WithArch(t.Arch), apko_build.WithExtraKeys(t.ExtraKeys), - apko_build.WithExtraRepos(t.ExtraRepos), + 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))..., diff --git a/pkg/cli/commands.go b/pkg/cli/commands.go index dce0226d0..ffbeaf14c 100644 --- a/pkg/cli/commands.go +++ b/pkg/cli/commands.go @@ -18,6 +18,7 @@ import ( "fmt" "log/slog" "net/http" + "os" "chainguard.dev/apko/pkg/log" "github.com/chainguard-dev/clog/gcp" @@ -40,11 +41,7 @@ func New() *cobra.Command { if gcplog { slog.SetDefault(slog.New(gcp.NewHandler(slog.Level(level)))) } else { - out, err := log.Writer([]string{"builtin:stderr"}) - if err != nil { - return fmt.Errorf("failed to create log writer: %w", err) - } - slog.SetDefault(slog.New(charmlog.NewWithOptions(out, charmlog.Options{ReportTimestamp: true, Level: charmlog.Level(level)}))) + slog.SetDefault(slog.New(charmlog.NewWithOptions(os.Stderr, charmlog.Options{ReportTimestamp: true, Level: charmlog.Level(level)}))) } return nil diff --git a/pkg/config/schema.json b/pkg/config/schema.json index d1551e4a7..e1de68e45 100644 --- a/pkg/config/schema.json +++ b/pkg/config/schema.json @@ -361,6 +361,12 @@ }, "ImageContents": { "properties": { + "build_repositories": { + "items": { + "type": "string" + }, + "type": "array" + }, "repositories": { "items": { "type": "string" diff --git a/pkg/container/docker/docker_runner.go b/pkg/container/docker/docker_runner.go index 2a2298229..6eff37341 100644 --- a/pkg/container/docker/docker_runner.go +++ b/pkg/container/docker/docker_runner.go @@ -31,7 +31,6 @@ import ( mcontainer "chainguard.dev/melange/pkg/container" "github.com/chainguard-dev/clog" "github.com/docker/cli/cli/streams" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/mount" @@ -226,7 +225,7 @@ func (dk *docker) Run(ctx context.Context, cfg *mcontainer.Config, args ...strin environ = append(environ, fmt.Sprintf("%s=%s", k, v)) } - taskIDResp, err := dk.cli.ContainerExecCreate(ctx, cfg.PodID, types.ExecConfig{ + taskIDResp, err := dk.cli.ContainerExecCreate(ctx, cfg.PodID, container.ExecOptions{ User: cfg.RunAs, Cmd: args, WorkingDir: runnerWorkdir, @@ -239,7 +238,7 @@ func (dk *docker) Run(ctx context.Context, cfg *mcontainer.Config, args ...strin return fmt.Errorf("failed to create exec task inside pod: %w", err) } - attachResp, err := dk.cli.ContainerExecAttach(ctx, taskIDResp.ID, types.ExecStartCheck{ + attachResp, err := dk.cli.ContainerExecAttach(ctx, taskIDResp.ID, container.ExecStartOptions{ Tty: false, }) if err != nil { @@ -278,7 +277,7 @@ func (dk *docker) Debug(ctx context.Context, cfg *mcontainer.Config, args ...str h, w := outterm.GetTtySize() size := [2]uint{h, w} - taskIDResp, err := dk.cli.ContainerExecCreate(ctx, cfg.PodID, types.ExecConfig{ + taskIDResp, err := dk.cli.ContainerExecCreate(ctx, cfg.PodID, container.ExecOptions{ Cmd: args, WorkingDir: runnerWorkdir, Env: environ, @@ -292,7 +291,7 @@ func (dk *docker) Debug(ctx context.Context, cfg *mcontainer.Config, args ...str return fmt.Errorf("failed to create debug exec task inside pod: %w", err) } - attachResp, err := dk.cli.ContainerExecAttach(ctx, taskIDResp.ID, types.ExecStartCheck{ + attachResp, err := dk.cli.ContainerExecAttach(ctx, taskIDResp.ID, container.ExecStartOptions{ ConsoleSize: &size, Tty: true, }) diff --git a/pkg/convert/apkbuild/apkbuild.go b/pkg/convert/apkbuild/apkbuild.go index adb64c2d8..a8ed7a50d 100644 --- a/pkg/convert/apkbuild/apkbuild.go +++ b/pkg/convert/apkbuild/apkbuild.go @@ -437,7 +437,7 @@ func (c ApkConvertor) buildEnvironment(additionalRepositories, additionalKeyring }, } - env.Contents.Repositories = append(env.Contents.Repositories, additionalRepositories...) + env.Contents.BuildRepositories = append(env.Contents.BuildRepositories, additionalRepositories...) env.Contents.Keyring = append(env.Contents.Keyring, additionalKeyrings...) for _, makedepend := range c.Apkbuild.Makedepends { env.Contents.Packages = append(env.Contents.Packages, makedepend.Pkgname) diff --git a/pkg/convert/gem/gem.go b/pkg/convert/gem/gem.go index a493d32ba..bc866087b 100644 --- a/pkg/convert/gem/gem.go +++ b/pkg/convert/gem/gem.go @@ -286,7 +286,7 @@ func (c *GemContext) generateEnvironment() apkotypes.ImageConfiguration { } if len(c.AdditionalRepositories) > 0 { - env.Contents.Repositories = append(env.Contents.Repositories, c.AdditionalRepositories...) + env.Contents.BuildRepositories = append(env.Contents.BuildRepositories, c.AdditionalRepositories...) } if len(c.AdditionalKeyrings) > 0 { diff --git a/pkg/convert/gem/gem_test.go b/pkg/convert/gem/gem_test.go index 9ce410393..69fcedf02 100644 --- a/pkg/convert/gem/gem_test.go +++ b/pkg/convert/gem/gem_test.go @@ -171,7 +171,7 @@ func TestGenerateManifest(t *testing.T) { assert.Equal(t, "MIT", got.Package.Copyright[0].License) // Check Environment - assert.Equal(t, []string{"https://packages.wolfi.dev/os"}, got.Environment.Contents.Repositories) + assert.Equal(t, []string{"https://packages.wolfi.dev/os"}, got.Environment.Contents.BuildRepositories) assert.Equal(t, []string{"https://packages.wolfi.dev/os/wolfi-signing.rsa.pub"}, got.Environment.Contents.Keyring) assert.Equal(t, []string{ "build-base", @@ -257,8 +257,8 @@ func TestGeneratePackage(t *testing.T) { func TestGenerateEnvironment(t *testing.T) { expected := apkotypes.ImageConfiguration{ Contents: apkotypes.ImageContents{ - Repositories: []string{"https://packages.wolfi.dev/os", "local /github/workspace/packages"}, - Keyring: []string{"https://packages.wolfi.dev/os/wolfi-signing.rsa.pub", "melange.rsa.pub"}, + BuildRepositories: []string{"https://packages.wolfi.dev/os", "local /github/workspace/packages"}, + Keyring: []string{"https://packages.wolfi.dev/os/wolfi-signing.rsa.pub", "melange.rsa.pub"}, Packages: []string{ "build-base", "busybox",