Bump apko to grab new solver logic (#233)

Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>

docs/data-sources/config.md

@@ -39,7 +39,6 @@ Read-Only:
 - `entrypoint` (Object) (see [below for nested schema](#nestedobjatt--config--entrypoint))
 - `environment` (Map of String)
 - `include` (String)
-- `options` (Map of Object) (see [below for nested schema](#nestedobjatt--config--options))
 - `os-release` (Object) (see [below for nested schema](#nestedobjatt--config--os-release))
 - `paths` (List of Object) (see [below for nested schema](#nestedobjatt--config--paths))
 - `stop-signal` (String)
@@ -98,53 +97,6 @@ Read-Only:
 - `type` (String)
 
 
-<a id="nestedobjatt--config--options"></a>
-### Nested Schema for `config.options`
-
-Read-Only:
-
-- `accounts` (Object) (see [below for nested schema](#nestedobjatt--config--options--accounts))
-- `contents` (Object) (see [below for nested schema](#nestedobjatt--config--options--contents))
-- `entrypoint` (Object) (see [below for nested schema](#nestedobjatt--config--options--entrypoint))
-- `environment` (Map of String)
-
-<a id="nestedobjatt--config--options--accounts"></a>
-### Nested Schema for `config.options.accounts`
-
-Read-Only:
-
-- `run-as` (String)
-
-
-<a id="nestedobjatt--config--options--contents"></a>
-### Nested Schema for `config.options.contents`
-
-Read-Only:
-
-- `packages` (Object) (see [below for nested schema](#nestedobjatt--config--options--contents--packages))
-
-<a id="nestedobjatt--config--options--contents--packages"></a>
-### Nested Schema for `config.options.contents.packages`
-
-Read-Only:
-
-- `add` (List of String)
-- `remove` (List of String)
-
-
-
-<a id="nestedobjatt--config--options--entrypoint"></a>
-### Nested Schema for `config.options.entrypoint`
-
-Read-Only:
-
-- `command` (String)
-- `services` (Map of String)
-- `shell-fragment` (String)
-- `type` (String)
-
-
-
 <a id="nestedobjatt--config--os-release"></a>
 ### Nested Schema for `config.os-release`
 

docs/data-sources/tags.md

@@ -38,7 +38,6 @@ Required:
 - `entrypoint` (Object) (see [below for nested schema](#nestedobjatt--config--entrypoint))
 - `environment` (Map of String)
 - `include` (String)
-- `options` (Map of Object) (see [below for nested schema](#nestedobjatt--config--options))
 - `os-release` (Object) (see [below for nested schema](#nestedobjatt--config--os-release))
 - `paths` (List of Object) (see [below for nested schema](#nestedobjatt--config--paths))
 - `stop-signal` (String)
@@ -97,53 +96,6 @@ Required:
 - `type` (String)
 
 
-<a id="nestedobjatt--config--options"></a>
-### Nested Schema for `config.options`
-
-Required:
-
-- `accounts` (Object) (see [below for nested schema](#nestedobjatt--config--options--accounts))
-- `contents` (Object) (see [below for nested schema](#nestedobjatt--config--options--contents))
-- `entrypoint` (Object) (see [below for nested schema](#nestedobjatt--config--options--entrypoint))
-- `environment` (Map of String)
-
-<a id="nestedobjatt--config--options--accounts"></a>
-### Nested Schema for `config.options.accounts`
-
-Required:
-
-- `run-as` (String)
-
-
-<a id="nestedobjatt--config--options--contents"></a>
-### Nested Schema for `config.options.contents`
-
-Required:
-
-- `packages` (Object) (see [below for nested schema](#nestedobjatt--config--options--contents--packages))
-
-<a id="nestedobjatt--config--options--contents--packages"></a>
-### Nested Schema for `config.options.contents.packages`
-
-Required:
-
-- `add` (List of String)
-- `remove` (List of String)
-
-
-
-<a id="nestedobjatt--config--options--entrypoint"></a>
-### Nested Schema for `config.options.entrypoint`
-
-Required:
-
-- `command` (String)
-- `services` (Map of String)
-- `shell-fragment` (String)
-- `type` (String)
-
-
-
 <a id="nestedobjatt--config--os-release"></a>
 ### Nested Schema for `config.os-release`
 

docs/resources/build.md

@@ -80,7 +80,6 @@ Required:
 - `entrypoint` (Object) (see [below for nested schema](#nestedobjatt--config--entrypoint))
 - `environment` (Map of String)
 - `include` (String)
-- `options` (Map of Object) (see [below for nested schema](#nestedobjatt--config--options))
 - `os-release` (Object) (see [below for nested schema](#nestedobjatt--config--os-release))
 - `paths` (List of Object) (see [below for nested schema](#nestedobjatt--config--paths))
 - `stop-signal` (String)
@@ -139,53 +138,6 @@ Required:
 - `type` (String)
 
 
-<a id="nestedobjatt--config--options"></a>
-### Nested Schema for `config.options`
-
-Required:
-
-- `accounts` (Object) (see [below for nested schema](#nestedobjatt--config--options--accounts))
-- `contents` (Object) (see [below for nested schema](#nestedobjatt--config--options--contents))
-- `entrypoint` (Object) (see [below for nested schema](#nestedobjatt--config--options--entrypoint))
-- `environment` (Map of String)
-
-<a id="nestedobjatt--config--options--accounts"></a>
-### Nested Schema for `config.options.accounts`
-
-Required:
-
-- `run-as` (String)
-
-
-<a id="nestedobjatt--config--options--contents"></a>
-### Nested Schema for `config.options.contents`
-
-Required:
-
-- `packages` (Object) (see [below for nested schema](#nestedobjatt--config--options--contents--packages))
-
-<a id="nestedobjatt--config--options--contents--packages"></a>
-### Nested Schema for `config.options.contents.packages`
-
-Required:
-
-- `add` (List of String)
-- `remove` (List of String)
-
-
-
-<a id="nestedobjatt--config--options--entrypoint"></a>
-### Nested Schema for `config.options.entrypoint`
-
-Required:
-
-- `command` (String)
-- `services` (Map of String)
-- `shell-fragment` (String)
-- `type` (String)
-
-
-
 <a id="nestedobjatt--config--os-release"></a>
 ### Nested Schema for `config.os-release`
 

go.mod

@@ -1,23 +1,23 @@
 module github.com/chainguard-dev/terraform-provider-apko
 
-go 1.21
+go 1.21.2
 
-toolchain go1.21.0
+toolchain go1.21.5
 
 require (
-	chainguard.dev/apko v0.13.1
+	chainguard.dev/apko v0.14.0
 	github.com/chainguard-dev/terraform-provider-oci v0.0.10
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-containerregistry v0.17.0
+	github.com/google/go-containerregistry v0.19.0
 	github.com/hashicorp/terraform-plugin-docs v0.16.0
 	github.com/hashicorp/terraform-plugin-framework v1.3.2
 	github.com/hashicorp/terraform-plugin-go v0.18.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-testing v1.5.1
 	github.com/sigstore/cosign/v2 v2.2.2
-	golang.org/x/sync v0.5.0
+	golang.org/x/sync v0.6.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/apimachinery v0.29.0
+	k8s.io/apimachinery v0.29.1
 	knative.dev/pkg v0.0.0-20230612155445-74c4be5e935e
 )
 
@@ -30,52 +30,55 @@ require (
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
+	github.com/ProtonMail/go-crypto v1.0.0 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/chainguard-dev/go-apk v0.0.0-20231218235333-2acefacd5846 // indirect
+	github.com/chainguard-dev/clog v1.3.0 // indirect
+	github.com/chainguard-dev/go-apk v0.0.0-20240130195846-91a06ffe6715 // indirect
 	github.com/cloudflare/circl v1.3.7 // 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
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
-	github.com/docker/cli v24.0.7+incompatible // indirect
+	github.com/docker/cli v25.0.1+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v24.0.7+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.8.0 // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/docker v25.0.1+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.8.1 // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dominodatalab/os-release v0.0.0-20190522011736-bcdb4a3e3c2f // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/color v1.15.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-git/go-git/v5 v5.11.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.21.5 // indirect
+	github.com/go-openapi/analysis v0.22.2 // indirect
 	github.com/go-openapi/errors v0.21.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.1 // indirect
-	github.com/go-openapi/jsonreference v0.20.3 // indirect
-	github.com/go-openapi/loads v0.21.3 // indirect
-	github.com/go-openapi/runtime v0.26.2 // indirect
-	github.com/go-openapi/spec v0.20.12 // indirect
-	github.com/go-openapi/strfmt v0.21.10 // indirect
-	github.com/go-openapi/swag v0.22.5 // indirect
-	github.com/go-openapi/validate v0.22.4 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/loads v0.21.5 // indirect
+	github.com/go-openapi/runtime v0.27.1 // indirect
+	github.com/go-openapi/spec v0.20.14 // indirect
+	github.com/go-openapi/strfmt v0.22.0 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/go-openapi/validate v0.22.6 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.4.10 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
@@ -98,9 +101,9 @@ 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/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/compress v1.17.5 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/letsencrypt/boulder v0.0.0-20231220194135-d84e8d08f26d // indirect
+	github.com/letsencrypt/boulder v0.0.0-20240130193413-14a8378dd0dc // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -114,7 +117,7 @@ require (
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
 	github.com/package-url/packageurl-go v0.1.2 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -125,7 +128,7 @@ require (
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sigstore/rekor v1.3.4 // indirect
-	github.com/sigstore/sigstore v1.7.6 // indirect
+	github.com/sigstore/sigstore v1.8.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.1 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
@@ -140,23 +143,25 @@ require (
 	github.com/zclconf/go-cty v1.13.3 // indirect
 	go.lsp.dev/uri v0.3.0 // indirect
 	go.mongodb.org/mongo-driver v1.13.1 // indirect
-	go.opentelemetry.io/otel v1.21.0 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
-	go.opentelemetry.io/otel/trace v1.21.0 // indirect
-	golang.org/x/build v0.0.0-20231219194848-b67688644ae0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
+	go.opentelemetry.io/otel v1.22.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
+	go.opentelemetry.io/otel/metric v1.22.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.22.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/oauth2 v0.15.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.17.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/go-jose/go-jose.v2 v2.6.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect