From fb654b3836d46a28f3b9e10b76a34da7324c7445 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Thu, 14 Aug 2025 14:55:03 +0200 Subject: [PATCH 01/11] update runtime to v1.7.1 (#609) --- .github/workflows/ci.yaml | 2 +- .golangci.yaml | 7 ++ MAINTAINERS.md | 4 +- cmd/topaz-db/cmd/cli.go | 3 +- go.mod | 60 ++++++----- go.sum | 141 +++++++++++++------------ makefile | 2 +- pkg/app/handlers/config.go | 3 +- pkg/app/impl/jwt.go | 1 - pkg/app/tests/authz/authz_test.go | 5 - pkg/app/topaz.go | 42 ++++---- pkg/cc/config/generator.go | 1 + pkg/cc/config/helper.go | 1 + pkg/cc/config/topaz_config.go | 9 +- pkg/cli/cc/cc.go | 1 + pkg/cli/cc/ports.go | 2 +- pkg/cli/cmd/access/actionsearch.go | 1 + pkg/cli/cmd/access/evaluation.go | 1 + pkg/cli/cmd/access/evaluations.go | 1 + pkg/cli/cmd/access/resourcesearch.go | 1 + pkg/cli/cmd/access/subjectsearch.go | 1 + pkg/cli/cmd/authorizer/decisiontree.go | 1 + pkg/cli/cmd/authorizer/eval.go | 1 + pkg/cli/cmd/authorizer/get.go | 3 +- pkg/cli/cmd/authorizer/list.go | 3 +- pkg/cli/cmd/authorizer/query.go | 1 + pkg/cli/cmd/common/test.go | 16 +-- pkg/cli/cmd/directory/backup.go | 3 +- pkg/cli/cmd/directory/check.go | 1 + pkg/cli/cmd/directory/checks.go | 1 + pkg/cli/cmd/directory/exporter.go | 3 +- pkg/cli/cmd/directory/importer.go | 3 +- pkg/cli/cmd/directory/manifest.go | 9 +- pkg/cli/cmd/directory/object.go | 4 + pkg/cli/cmd/directory/relation.go | 4 + pkg/cli/cmd/directory/restore.go | 3 +- pkg/cli/cmd/directory/search.go | 1 + pkg/cli/cmd/directory/stats.go | 3 +- pkg/cli/cmd/templates/apply.go | 4 +- pkg/cli/cmd/templates/install.go | 3 +- pkg/cli/cmd/topaz/restart.go | 1 + pkg/cli/cmd/topaz/start.go | 1 + pkg/cli/prompter/prompter.go | 3 + pkg/service/builder/service_factory.go | 3 +- pkg/service/builder/service_manager.go | 71 +++++++------ plugins/edge/plugin.go | 28 ++--- 46 files changed, 260 insertions(+), 203 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a5506796..b6b4bc96 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,7 +21,7 @@ env: PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'main' || '' }} GO_VERSION: "1.24" GO_RELEASER_VERSION: "v2.8.2" - GO_LANGCI_LINT_VERSION: "v2.0.2" + GO_LANGCI_LINT_VERSION: "v2.4.0" GO_TESTSUM_VERSION: "1.12.1" SYFT_VERSION: "v1.13.0" diff --git a/.golangci.yaml b/.golangci.yaml index 4f187347..b309e532 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -21,12 +21,14 @@ linters: - gochecknoglobals # no configuration options - nilnil - nlreturn # redundant with wsl + - noinlineerr - paralleltest - revive - tagalign - thelper - varnamelen - wrapcheck + - wsl settings: cyclop: @@ -83,6 +85,11 @@ linters: - pkg: pkg/app/handlers rules: json: camel + + wsl_v5: + allow-first-in-block: true + allow-whole-block: false + branch-max-lines: 2 exclusions: generated: lax diff --git a/MAINTAINERS.md b/MAINTAINERS.md index d8c2e9de..7f95b5b9 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -4,5 +4,5 @@ The following table lists Topaz project maintainers and areas of expertise in al | Name | GitHub | Email | Organization | Repositories/Area of Expertise | Added/Renewed On | | --- | --- | --- | --- | --- | --- | -| Dani Carabas | @carabasdaniel | dani@aserto.com | Aserto | all repositories | 2022-10-23 | -| Gert Drapers | @gertd | gert@aserto.com | Aserto | all repositories | 2022-10-23 | +| Dani Carabas | @carabasdaniel | carabas.milan@gmail.com | self | all repositories | 2022-10-23 | +| Gert Drapers | @gertd | gert@d5s.io | D5S | all repositories | 2022-10-23 | diff --git a/cmd/topaz-db/cmd/cli.go b/cmd/topaz-db/cmd/cli.go index b098afc5..65b42bbd 100644 --- a/cmd/topaz-db/cmd/cli.go +++ b/cmd/topaz-db/cmd/cli.go @@ -24,7 +24,8 @@ type LoadCmd struct { } type SyncCmd struct { + dsc.Config + DBFile string `arg:"" help:"db file name" type:"existingfile"` Mode []string `flag:"" short:"m" enum:"manifest,full,diff,watermark" required:"" help:"sync mode"` - dsc.Config } diff --git a/go.mod b/go.mod index cdac2fc5..433c8f00 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/aserto-dev/topaz -go 1.24 +go 1.24.0 -toolchain go1.24.5 +toolchain go1.24.6 require ( github.com/Masterminds/semver/v3 v3.4.0 @@ -21,7 +21,7 @@ require ( github.com/aserto-dev/logger v0.0.9 github.com/aserto-dev/openapi-authorizer v0.20.6 github.com/aserto-dev/openapi-directory v0.33.5 - github.com/aserto-dev/runtime v1.6.0 + github.com/aserto-dev/runtime v1.7.1 github.com/aserto-dev/self-decision-logger v0.0.12 github.com/authzen/access.go v0.0.6 github.com/cli/browser v1.3.0 @@ -45,10 +45,10 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 github.com/moby/term v0.5.2 github.com/olekukonko/tablewriter v0.0.5 - github.com/open-policy-agent/opa v1.6.0 + github.com/open-policy-agent/opa v1.7.1 github.com/opencontainers/image-spec v1.1.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.22.0 + github.com/prometheus/client_golang v1.23.0 github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb github.com/rs/cors v1.11.1 github.com/rs/zerolog v1.34.0 @@ -60,9 +60,9 @@ require ( github.com/testcontainers/testcontainers-go v0.37.0 go.etcd.io/bbolt v1.4.2 golang.org/x/sync v0.16.0 - golang.org/x/sys v0.34.0 + golang.org/x/sys v0.35.0 google.golang.org/grpc v1.74.2 - google.golang.org/protobuf v1.36.6 + google.golang.org/protobuf v1.36.7 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) @@ -77,11 +77,12 @@ require ( github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/containerd/containerd/v2 v2.1.1 // indirect + github.com/containerd/containerd/v2 v2.1.4 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/platforms v1.0.0-rc.1 // indirect + github.com/containerd/typeurl/v2 v2.2.3 // indirect github.com/cpuguy83/dockercfg v0.3.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect @@ -153,9 +154,9 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.62.0 // indirect - github.com/prometheus/procfs v0.15.1 // indirect - github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/prometheus/common v0.65.0 // indirect + github.com/prometheus/procfs v0.17.0 // indirect + github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/sagikazarmark/locafero v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect @@ -164,34 +165,35 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.12.0 // indirect github.com/spf13/cast v1.7.1 // indirect - github.com/spf13/pflag v1.0.6 // indirect + github.com/spf13/pflag v1.0.7 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/tchap/go-patricia/v2 v2.3.2 // indirect + github.com/tchap/go-patricia/v2 v2.3.3 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.9.0 // indirect - github.com/vektah/gqlparser/v2 v2.5.28 // indirect + github.com/vektah/gqlparser/v2 v2.5.30 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yashtewari/glob-intersection v0.2.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect - go.opentelemetry.io/otel v1.36.0 // indirect - go.opentelemetry.io/otel/metric v1.36.0 // indirect - go.opentelemetry.io/otel/sdk v1.36.0 // indirect - go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect + go.opentelemetry.io/otel v1.37.0 // indirect + go.opentelemetry.io/otel/metric v1.37.0 // indirect + go.opentelemetry.io/otel/sdk v1.37.0 // indirect + go.opentelemetry.io/otel/trace v1.37.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.40.0 // indirect - golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect - golang.org/x/mod v0.26.0 // indirect - golang.org/x/net v0.42.0 // indirect - golang.org/x/term v0.33.0 // indirect - golang.org/x/text v0.27.0 // indirect + go.yaml.in/yaml/v2 v2.4.2 // indirect + golang.org/x/crypto v0.41.0 // indirect + golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect + golang.org/x/mod v0.27.0 // indirect + golang.org/x/net v0.43.0 // indirect + golang.org/x/term v0.34.0 // indirect + golang.org/x/text v0.28.0 // indirect golang.org/x/time v0.12.0 // indirect - golang.org/x/tools v0.35.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect + golang.org/x/tools v0.36.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect gopkg.in/yaml.v3 v3.0.1 // indirect oras.land/oras-go/v2 v2.6.0 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect ) diff --git a/go.sum b/go.sum index b175cb52..14192ec8 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ github.com/aserto-dev/openapi-authorizer v0.20.6 h1:IW6sAj17kDYW4iHRvS5pSzWYLoym github.com/aserto-dev/openapi-authorizer v0.20.6/go.mod h1:SPwUWm12v9ProAdssQ/ommYftQ0KXJUbtQQFOWYsbHY= github.com/aserto-dev/openapi-directory v0.33.5 h1:uiNoLTkYE4qEiVBvjbq7A2AqsI+fA/iM5m5Gpaic3NY= github.com/aserto-dev/openapi-directory v0.33.5/go.mod h1:t8jFi3PfdC5k3f/fvYT6DIU+OHzn+Ptidlw83W7h7lo= -github.com/aserto-dev/runtime v1.6.0 h1:DrDgrJ8L3uF9owpLKOC1PcGlxIbIKSU8Cc76bVqTaSc= -github.com/aserto-dev/runtime v1.6.0/go.mod h1:FK+Sdbrgpv0xu9yK0IDucNTzC6UmaheNK5nuJTqSyHk= +github.com/aserto-dev/runtime v1.7.1 h1:bdbP9wuIYdokID3pbhBv6M3L5QMuL2Fsmg3PY7JB+k8= +github.com/aserto-dev/runtime v1.7.1/go.mod h1:fpfbXpU6FVIEQeEU6x8tufpq3Tj/8p6ELLR4WQZy2r8= github.com/aserto-dev/self-decision-logger v0.0.12 h1:oMU43OCjgEMcsAx5EraWTncqyZHBea1H1+Dyyd8I3hI= github.com/aserto-dev/self-decision-logger v0.0.12/go.mod h1:nF3SyHJoMS5KbGm+EHF2BlDyNpzjPgodfp6H4MWS6QU= github.com/authzen/access.go v0.0.6 h1:yrsv1PSkXV+8flncvRjnL223Pbfks1xX63IGu+D4BDg= @@ -78,8 +78,8 @@ github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo= github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/containerd/containerd/v2 v2.1.1 h1:znnkm7Ajz8lg8BcIPMhc/9yjBRN3B+OkNKqKisKfwwM= -github.com/containerd/containerd/v2 v2.1.1/go.mod h1:zIfkQj4RIodclYQkX7GSSswSwgP8d/XxDOtOAoSDIGU= +github.com/containerd/containerd/v2 v2.1.4 h1:/hXWjiSFd6ftrBOBGfAZ6T30LJcx1dBjdKEeI8xucKQ= +github.com/containerd/containerd/v2 v2.1.4/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= @@ -88,6 +88,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E= github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4= +github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= +github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA= github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= @@ -102,8 +104,8 @@ github.com/deckarep/golang-set/v2 v2.8.0 h1:swm0rlPCmdWn9mESxKOjWk8hXSqoxOp+Zlfu github.com/deckarep/golang-set/v2 v2.8.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= -github.com/dgraph-io/badger/v4 v4.7.0 h1:Q+J8HApYAY7UMpL8d9owqiB+odzEc0zn/aqOD9jhc6Y= -github.com/dgraph-io/badger/v4 v4.7.0/go.mod h1:He7TzG3YBy3j4f5baj5B7Zl2XyfNe5bl4Udl0aPemVA= +github.com/dgraph-io/badger/v4 v4.8.0 h1:JYph1ChBijCw8SLeybvPINizbDKWZ5n/GYbz2yhN/bs= +github.com/dgraph-io/badger/v4 v4.8.0/go.mod h1:U6on6e8k/RTbUWxqKR0MvugJuVmkxSNc79ap4917h4w= github.com/dgraph-io/ristretto/v2 v2.2.0 h1:bkY3XzJcXoMuELV8F+vS8kzNgicwQFAaGINAEJdWGOM= github.com/dgraph-io/ristretto/v2 v2.2.0/go.mod h1:RZrm63UmcBAaYWC1DotLYBmTvgkrs0+XhBd7Npn7/zI= github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= @@ -324,8 +326,8 @@ github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349 h1:t05Ww3DxZutOqbMN+ github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/open-policy-agent/opa v1.6.0 h1:/S/cnNQJ2MUMNzizHPbisTWBHowmLkPrugY5jjkPlRQ= -github.com/open-policy-agent/opa v1.6.0/go.mod h1:zFmw4P+W62+CWGYRDDswfVYSCnPo6oYaktQnfIaRFC4= +github.com/open-policy-agent/opa v1.7.1 h1:bhA2UGq5oS25471WB9aCJBWEp5/7WK+Nyb2PMAChQIg= +github.com/open-policy-agent/opa v1.7.1/go.mod h1:7cPuErOAt7k/oVWAVJnxqAC6mwArrAazkvk0RXiih2A= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= @@ -347,17 +349,17 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= -github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= +github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc= +github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= -github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= -github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= -github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE= +github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= +github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0= +github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= +github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg= +github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb h1:n7UJ8X9UnrTZBYXnd1kAIBc067SWyuPIrsocjketYW8= github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -378,8 +380,8 @@ github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI= github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= +github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shirou/gopsutil/v4 v4.25.5 h1:rtd9piuSMGeU8g1RMXjZs9y9luK5BwtnG7dZaQUJAsc= github.com/shirou/gopsutil/v4 v4.25.5/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -395,8 +397,9 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= -github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M= +github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4= github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -413,8 +416,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/tchap/go-patricia/v2 v2.3.2 h1:xTHFutuitO2zqKAQ5rCROYgUb7Or/+IC3fts9/Yc7nM= -github.com/tchap/go-patricia/v2 v2.3.2/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= +github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc= +github.com/tchap/go-patricia/v2 v2.3.3/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= github.com/testcontainers/testcontainers-go v0.37.0 h1:L2Qc0vkTw2EHWQ08djon0D2uw7Z/PtHS/QzZZ5Ra/hg= github.com/testcontainers/testcontainers-go v0.37.0/go.mod h1:QPzbxZhQ6Bclip9igjLFj6z0hs01bU8lrl2dHQmgFGM= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= @@ -429,8 +432,8 @@ github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPD github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/vektah/gqlparser/v2 v2.5.28 h1:bIulcl3LF69ba6EiZVGD88y4MkM+Jxrf3P2MX8xLRkY= -github.com/vektah/gqlparser/v2 v2.5.28/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo= +github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE= +github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -446,26 +449,26 @@ go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I= go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= -go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= -go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0/go.mod h1:90PoxvaEB5n6AOdZvi+yWJQoE95U8Dhhw2bSyRqnTD0= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 h1:JgtbA0xkWHnTmYk7YusopJFX6uleBmAuZ8n05NEh8nQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0/go.mod h1:179AK5aar5R3eS9FucPy6rggvU0g52cvKId8pv4+v0c= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 h1:nRVXXvf78e00EwY6Wp0YII8ww2JVWshZ20HfTlE11AM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ= -go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= -go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= -go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= -go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis= -go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4= -go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= -go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= -go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI= -go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY= +go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= +go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA= +go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= +go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= +go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= +go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= +go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= +go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= +go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os= +go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -474,6 +477,10 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE= +go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -482,11 +489,11 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= -golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= +golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= +golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 h1:R9PFI6EUdfVKgwKjZef7QIwGcBKu86OEFpJ9nUEP2l4= -golang.org/x/exp v0.0.0-20250718183923-645b1fa84792/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc= +golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE= +golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4= 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= @@ -499,8 +506,8 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg= -golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ= +golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= +golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -517,8 +524,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= -golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= +golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= +golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -558,8 +565,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= -golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= +golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -570,8 +577,8 @@ golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= -golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= -golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= +golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= +golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -581,8 +588,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= -golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= +golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= +golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -599,8 +606,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0= -golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw= +golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= +golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -612,10 +619,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= -google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 h1:0UOBWO4dC+e51ui0NFKSPbkHHiQ4TmrEfEZMLDyRmY8= -google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0/go.mod h1:8ytArBbtOy2xfht+y2fqKd5DRDJRUQhqbyEnQ4bDChs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58= +google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -623,8 +630,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4= google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM= -google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= -google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= +google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -643,5 +650,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc= oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/makefile b/makefile index 84c08a4b..ed2c3ac9 100644 --- a/makefile +++ b/makefile @@ -19,7 +19,7 @@ GO_VER := 1.24 VAULT_VER := 1.8.12 SVU_VER := 3.1.0 GOTESTSUM_VER := 1.12.1 -GOLANGCI-LINT_VER := 2.0.2 +GOLANGCI-LINT_VER := 2.4.0 GORELEASER_VER := 2.8.2 WIRE_VER := 0.6.0 CHECK2DECISION_VER := 0.1.0 diff --git a/pkg/app/handlers/config.go b/pkg/app/handlers/config.go index 4429f3b5..789acd91 100644 --- a/pkg/app/handlers/config.go +++ b/pkg/app/handlers/config.go @@ -40,10 +40,11 @@ type TopazCfgV1 struct { } type TopazCfgV2 struct { + *TopazCfg + Type string `json:"configType"` Name string `json:"name"` Address string `json:"address"` - *TopazCfg } type CfgV2Response struct { diff --git a/pkg/app/impl/jwt.go b/pkg/app/impl/jwt.go index 59591e85..aae7abab 100644 --- a/pkg/app/impl/jwt.go +++ b/pkg/app/impl/jwt.go @@ -88,7 +88,6 @@ func (s *AuthorizerServer) jwtParseStringOptions(ctx context.Context, jwtToken j } jwtKeysURL, err := s.jwksURLFromCache(ctx, jwtToken.Issuer()) - if err != nil { return nil, errors.Wrap(err, "token didn't have a JWKS endpoint we could use for verification") } else { diff --git a/pkg/app/tests/authz/authz_test.go b/pkg/app/tests/authz/authz_test.go index 4a073249..bcc87d1d 100644 --- a/pkg/app/tests/authz/authz_test.go +++ b/pkg/app/tests/authz/authz_test.go @@ -119,7 +119,6 @@ func DecisionTreeWithMissingPath(ctx context.Context, azClient authorizer.Author Options: &authorizer.DecisionTreeOptions{}, ResourceContext: &structpb.Struct{}, }) - if errX != nil { t.Logf("ERR >>> %s\n", errX) } @@ -148,7 +147,6 @@ func DecisionTreeWithMissingIdentity(ctx context.Context, azClient authorizer.Au Options: &authorizer.DecisionTreeOptions{}, ResourceContext: &structpb.Struct{}, }) - if errX != nil { t.Logf("ERR >>> %s\n", errX) } @@ -177,7 +175,6 @@ func DecisionTreeWithUserID(ctx context.Context, azClient authorizer.AuthorizerC Options: &authorizer.DecisionTreeOptions{}, ResourceContext: &structpb.Struct{}, }) - if errX != nil { t.Logf("ERR >>> %s\n", errX) } @@ -204,7 +201,6 @@ func IsWithMissingIdentity(ctx context.Context, azClient authorizer.AuthorizerCl }, ResourceContext: &structpb.Struct{}, }) - if errX != nil { t.Logf("ERR >>> %s\n", errX) } @@ -240,7 +236,6 @@ func QueryWithMissingIdentity(ctx context.Context, azClient authorizer.Authorize }, ResourceContext: &structpb.Struct{}, }) - if errX != nil { t.Logf("ERR >>> %s\n", errX) } diff --git a/pkg/app/topaz.go b/pkg/app/topaz.go index 422bed0e..c9fa5175 100644 --- a/pkg/app/topaz.go +++ b/pkg/app/topaz.go @@ -234,6 +234,27 @@ func (e *Topaz) ConfigServices() error { return nil } +func (e *Topaz) GetDecisionLogger(cfg config.DecisionLogConfig) (decisionlog.DecisionLogger, error) { + switch cfg.Type { + case "self": + return self.New(e.Context, cfg.Config, e.Logger, KeepAliveDialOption()...) + + case "file": + logPath := cfg.Config["log_file_path"] + maxSize, _ := cfg.Config["max_file_size_mb"].(int) + maxFiles, _ := cfg.Config["max_file_count"].(int) + + return file.New(e.Context, &file.Config{ + LogFilePath: fmt.Sprintf("%v", logPath), + MaxFileSizeMB: maxSize, + MaxFileCount: maxFiles, + }, e.Logger) + + default: + return nop.New(e.Context, e.Logger) + } +} + func (e *Topaz) setupHealthAndMetrics() ([]grpc.ServerOption, error) { if e.Configuration.APIConfig.Health.ListenAddress != "" { err := e.Manager.SetupHealthServer(e.Configuration.APIConfig.Health.ListenAddress, &e.Configuration.APIConfig.Health.Certificates) @@ -324,27 +345,6 @@ func KeepAliveDialOption() []grpc.DialOption { return []grpc.DialOption{grpc.WithKeepaliveParams(kacp)} } -func (e *Topaz) GetDecisionLogger(cfg config.DecisionLogConfig) (decisionlog.DecisionLogger, error) { - switch cfg.Type { - case "self": - return self.New(e.Context, cfg.Config, e.Logger, KeepAliveDialOption()...) - - case "file": - logPath := cfg.Config["log_file_path"] - maxSize, _ := cfg.Config["max_file_size_mb"].(int) - maxFiles, _ := cfg.Config["max_file_count"].(int) - - return file.New(e.Context, &file.Config{ - LogFilePath: fmt.Sprintf("%v", logPath), - MaxFileSizeMB: maxSize, - MaxFileCount: maxFiles, - }, e.Logger) - - default: - return nop.New(e.Context, e.Logger) - } -} - func (e *Topaz) validateConfig() error { if readerConfig, ok := e.Configuration.APIConfig.Services["reader"]; ok { if readerConfig.GRPC.ListenAddress != e.Configuration.DirectoryResolver.Address { diff --git a/pkg/cc/config/generator.go b/pkg/cc/config/generator.go index c20f58c8..e18411af 100644 --- a/pkg/cc/config/generator.go +++ b/pkg/cc/config/generator.go @@ -12,6 +12,7 @@ import ( type Generator struct { templateParams + ConfigName string } diff --git a/pkg/cc/config/helper.go b/pkg/cc/config/helper.go index 9c274525..2553592f 100644 --- a/pkg/cc/config/helper.go +++ b/pkg/cc/config/helper.go @@ -2,6 +2,7 @@ package config type currentConfig struct { *Loader + err error } diff --git a/pkg/cc/config/topaz_config.go b/pkg/cc/config/topaz_config.go index 46850a25..9efbfd85 100644 --- a/pkg/cc/config/topaz_config.go +++ b/pkg/cc/config/topaz_config.go @@ -12,10 +12,11 @@ import ( const ConfigFileVersion = 2 type Config struct { - Common `json:"common,squash"` //nolint:staticcheck // squash is used by mapstructure - Auth AuthnConfig `json:"auth"` - DecisionLogger DecisionLogConfig `json:"decision_logger"` - ControllerConfig controller.Config `json:"controller"` + Common `json:"common,squash"` //nolint:staticcheck // squash is used by mapstructure + + Auth AuthnConfig `json:"auth"` + DecisionLogger DecisionLogConfig `json:"decision_logger"` + ControllerConfig controller.Config `json:"controller"` } type DecisionLogConfig struct { diff --git a/pkg/cli/cc/cc.go b/pkg/cli/cc/cc.go index a4a17bdf..a3c9453c 100644 --- a/pkg/cli/cc/cc.go +++ b/pkg/cli/cc/cc.go @@ -40,6 +40,7 @@ type ActiveConfig struct { } type RunningConfig struct { ActiveConfig + ContainerName string `json:"container_name"` } diff --git a/pkg/cli/cc/ports.go b/pkg/cli/cc/ports.go index 18050c40..eb9c283a 100644 --- a/pkg/cli/cc/ports.go +++ b/pkg/cli/cc/ports.go @@ -73,7 +73,7 @@ func WaitForPorts(ports []string, expectedStatus PortStatus) error { func portStatus(listenAddress string) PortStatus { timeout := 1 * time.Second - conn, err := net.DialTimeout("tcp", listenAddress, timeout) + conn, err := net.DialTimeout("tcp", listenAddress, timeout) //nolint:noctx if err != nil { return PortClosed } diff --git a/pkg/cli/cmd/access/actionsearch.go b/pkg/cli/cmd/access/actionsearch.go index 03c2b114..125b640c 100644 --- a/pkg/cli/cmd/access/actionsearch.go +++ b/pkg/cli/cmd/access/actionsearch.go @@ -14,6 +14,7 @@ import ( type ActionSearchCmd struct { clients.RequestArgs dsc.Config + req dsa1.ActionSearchRequest resp dsa1.ActionSearchResponse } diff --git a/pkg/cli/cmd/access/evaluation.go b/pkg/cli/cmd/access/evaluation.go index 5542dc74..e653d8c0 100644 --- a/pkg/cli/cmd/access/evaluation.go +++ b/pkg/cli/cmd/access/evaluation.go @@ -14,6 +14,7 @@ import ( type EvaluationCmd struct { clients.RequestArgs dsc.Config + req dsa1.EvaluationRequest resp dsa1.EvaluationResponse } diff --git a/pkg/cli/cmd/access/evaluations.go b/pkg/cli/cmd/access/evaluations.go index 117d5f68..b6e847f2 100644 --- a/pkg/cli/cmd/access/evaluations.go +++ b/pkg/cli/cmd/access/evaluations.go @@ -14,6 +14,7 @@ import ( type EvaluationsCmd struct { clients.RequestArgs dsc.Config + req dsa1.EvaluationRequest resp dsa1.EvaluationResponse } diff --git a/pkg/cli/cmd/access/resourcesearch.go b/pkg/cli/cmd/access/resourcesearch.go index ce6d69ce..5f9ba1b0 100644 --- a/pkg/cli/cmd/access/resourcesearch.go +++ b/pkg/cli/cmd/access/resourcesearch.go @@ -14,6 +14,7 @@ import ( type ResourceSearchCmd struct { clients.RequestArgs dsc.Config + req dsa1.ResourceSearchRequest resp dsa1.ResourceSearchResponse } diff --git a/pkg/cli/cmd/access/subjectsearch.go b/pkg/cli/cmd/access/subjectsearch.go index bb2bf920..67d62ca7 100644 --- a/pkg/cli/cmd/access/subjectsearch.go +++ b/pkg/cli/cmd/access/subjectsearch.go @@ -14,6 +14,7 @@ import ( type SubjectSearchCmd struct { clients.RequestArgs dsc.Config + req dsa1.SubjectSearchRequest resp dsa1.SubjectSearchResponse } diff --git a/pkg/cli/cmd/authorizer/decisiontree.go b/pkg/cli/cmd/authorizer/decisiontree.go index a5978e5a..e288b360 100644 --- a/pkg/cli/cmd/authorizer/decisiontree.go +++ b/pkg/cli/cmd/authorizer/decisiontree.go @@ -15,6 +15,7 @@ import ( type DecisionTreeCmd struct { clients.RequestArgs azc.Config + req authorizer.DecisionTreeRequest resp authorizer.DecisionTreeResponse } diff --git a/pkg/cli/cmd/authorizer/eval.go b/pkg/cli/cmd/authorizer/eval.go index 4d83c632..c456e86c 100644 --- a/pkg/cli/cmd/authorizer/eval.go +++ b/pkg/cli/cmd/authorizer/eval.go @@ -14,6 +14,7 @@ import ( type EvalCmd struct { clients.RequestArgs azc.Config + req authorizer.IsRequest resp authorizer.IsResponse } diff --git a/pkg/cli/cmd/authorizer/get.go b/pkg/cli/cmd/authorizer/get.go index ae933727..9f7e9899 100644 --- a/pkg/cli/cmd/authorizer/get.go +++ b/pkg/cli/cmd/authorizer/get.go @@ -13,8 +13,9 @@ import ( type GetPolicyCmd struct { clients.RequestArgs - Raw bool `name:"raw" help:"return raw request output"` azc.Config + + Raw bool `name:"raw" help:"return raw request output"` req authorizer.GetPolicyRequest resp authorizer.GetPolicyResponse } diff --git a/pkg/cli/cmd/authorizer/list.go b/pkg/cli/cmd/authorizer/list.go index 8ef26ad6..561ebfd3 100644 --- a/pkg/cli/cmd/authorizer/list.go +++ b/pkg/cli/cmd/authorizer/list.go @@ -16,8 +16,9 @@ import ( type ListPoliciesCmd struct { clients.RequestArgs - Raw bool `name:"raw" help:"return raw request output"` azc.Config + + Raw bool `name:"raw" help:"return raw request output"` req authorizer.ListPoliciesRequest resp authorizer.ListPoliciesResponse } diff --git a/pkg/cli/cmd/authorizer/query.go b/pkg/cli/cmd/authorizer/query.go index 68627083..29be5b33 100644 --- a/pkg/cli/cmd/authorizer/query.go +++ b/pkg/cli/cmd/authorizer/query.go @@ -14,6 +14,7 @@ import ( type QueryCmd struct { clients.RequestArgs azc.Config + req authorizer.QueryRequest resp authorizer.QueryResponse } diff --git a/pkg/cli/cmd/common/test.go b/pkg/cli/cmd/common/test.go index 33894a87..1b07468f 100644 --- a/pkg/cli/cmd/common/test.go +++ b/pkg/cli/cmd/common/test.go @@ -142,6 +142,14 @@ func PrintDesc(descFlag, description string, result *CheckResult, expected bool) } } +type TestResults struct { + total int32 + passed int32 + failed int32 + errored int32 + skipped int32 +} + func NewTestResults(assertions []json.RawMessage) *TestResults { return &TestResults{ total: int32(len(assertions)), //nolint: gosec // G115: integer overflow conversion int -> int32. @@ -151,14 +159,6 @@ func NewTestResults(assertions []json.RawMessage) *TestResults { } } -type TestResults struct { - total int32 - passed int32 - failed int32 - errored int32 - skipped int32 -} - func (t *TestResults) IncrTotal() { atomic.AddInt32(&t.total, 1) } diff --git a/pkg/cli/cmd/directory/backup.go b/pkg/cli/cmd/directory/backup.go index 585c9b78..586a3bb8 100644 --- a/pkg/cli/cmd/directory/backup.go +++ b/pkg/cli/cmd/directory/backup.go @@ -10,8 +10,9 @@ import ( ) type BackupCmd struct { - File string `arg:"" default:"backup.tar.gz" help:"absolute file path to make backup to"` dsc.Config + + File string `arg:"" default:"backup.tar.gz" help:"absolute file path to make backup to"` } const defaultFileName = "backup.tar.gz" diff --git a/pkg/cli/cmd/directory/check.go b/pkg/cli/cmd/directory/check.go index 4ed0dea9..a51148ea 100644 --- a/pkg/cli/cmd/directory/check.go +++ b/pkg/cli/cmd/directory/check.go @@ -12,6 +12,7 @@ import ( type CheckCmd struct { clients.RequestArgs dsc.Config + req reader.CheckRequest resp reader.CheckResponse } diff --git a/pkg/cli/cmd/directory/checks.go b/pkg/cli/cmd/directory/checks.go index a9baa499..b6d9bf61 100644 --- a/pkg/cli/cmd/directory/checks.go +++ b/pkg/cli/cmd/directory/checks.go @@ -12,6 +12,7 @@ import ( type ChecksCmd struct { clients.RequestArgs dsc.Config + req reader.ChecksRequest resp reader.ChecksResponse } diff --git a/pkg/cli/cmd/directory/exporter.go b/pkg/cli/cmd/directory/exporter.go index 31bf2aa5..0a7c5584 100644 --- a/pkg/cli/cmd/directory/exporter.go +++ b/pkg/cli/cmd/directory/exporter.go @@ -9,8 +9,9 @@ import ( ) type ExportCmd struct { - Directory string `short:"d" required:"" help:"directory to write .json data" default:"${cwd}"` dsc.Config + + Directory string `short:"d" required:"" help:"directory to write .json data" default:"${cwd}"` } func (cmd *ExportCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/directory/importer.go b/pkg/cli/cmd/directory/importer.go index f1d85290..cde4be69 100644 --- a/pkg/cli/cmd/directory/importer.go +++ b/pkg/cli/cmd/directory/importer.go @@ -11,8 +11,9 @@ import ( ) type ImportCmd struct { - Directory string `short:"d" required:"" help:"directory containing .json data" default:"${cwd}"` dsc.Config + + Directory string `short:"d" required:"" help:"directory containing .json data" default:"${cwd}"` } func (cmd *ImportCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/directory/manifest.go b/pkg/cli/cmd/directory/manifest.go index 516f36f9..005f364b 100644 --- a/pkg/cli/cmd/directory/manifest.go +++ b/pkg/cli/cmd/directory/manifest.go @@ -11,20 +11,23 @@ import ( ) type GetManifestCmd struct { + dsc.Config + Path string `arg:"path" help:"filepath to manifest file" type:"path" optional:""` Stdout bool `flag:"" help:"output manifest to --stdout"` - dsc.Config } type SetManifestCmd struct { + dsc.Config + Path string `arg:"" help:"filepath to manifest file" type:"path" optional:""` Stdin bool `flag:"" help:"set manifest from --stdin"` - dsc.Config } type DeleteManifestCmd struct { - Force bool `flag:"" help:"do not ask for conformation to delete manifest"` dsc.Config + + Force bool `flag:"" help:"do not ask for conformation to delete manifest"` } func (cmd *GetManifestCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/directory/object.go b/pkg/cli/cmd/directory/object.go index 5d584d7d..3b44b0c5 100644 --- a/pkg/cli/cmd/directory/object.go +++ b/pkg/cli/cmd/directory/object.go @@ -20,6 +20,7 @@ import ( type GetObjectCmd struct { clients.RequestArgs dsc.Config + req reader.GetObjectRequest resp reader.GetObjectResponse } @@ -57,6 +58,7 @@ func (cmd *GetObjectCmd) template() proto.Message { type SetObjectCmd struct { clients.RequestArgs dsc.Config + req writer.SetObjectRequest resp writer.SetObjectResponse } @@ -99,6 +101,7 @@ func (cmd *SetObjectCmd) template() proto.Message { type DeleteObjectCmd struct { clients.RequestArgs dsc.Config + req writer.DeleteObjectRequest resp writer.DeleteObjectResponse } @@ -135,6 +138,7 @@ func (cmd *DeleteObjectCmd) template() proto.Message { type ListObjectsCmd struct { clients.RequestArgs dsc.Config + req reader.GetObjectsRequest resp reader.GetObjectsResponse } diff --git a/pkg/cli/cmd/directory/relation.go b/pkg/cli/cmd/directory/relation.go index e977b6d2..b1067af2 100644 --- a/pkg/cli/cmd/directory/relation.go +++ b/pkg/cli/cmd/directory/relation.go @@ -16,6 +16,7 @@ import ( type GetRelationCmd struct { clients.RequestArgs dsc.Config + req reader.GetRelationRequest resp reader.GetRelationResponse } @@ -51,6 +52,7 @@ func (cmd *GetRelationCmd) template() proto.Message { type SetRelationCmd struct { clients.RequestArgs dsc.Config + req writer.SetRelationRequest resp writer.SetRelationResponse } @@ -90,6 +92,7 @@ func (cmd *SetRelationCmd) template() proto.Message { type DeleteRelationCmd struct { clients.RequestArgs dsc.Config + req writer.DeleteRelationRequest resp writer.DeleteRelationResponse } @@ -124,6 +127,7 @@ func (cmd *DeleteRelationCmd) template() proto.Message { type ListRelationsCmd struct { clients.RequestArgs dsc.Config + req reader.GetRelationsRequest resp reader.GetRelationsResponse } diff --git a/pkg/cli/cmd/directory/restore.go b/pkg/cli/cmd/directory/restore.go index 6d86d2e2..e72b4649 100644 --- a/pkg/cli/cmd/directory/restore.go +++ b/pkg/cli/cmd/directory/restore.go @@ -10,8 +10,9 @@ import ( ) type RestoreCmd struct { - File string `arg:"" default:"backup.tar.gz" help:"absolute file path to local backup tarball"` dsc.Config + + File string `arg:"" default:"backup.tar.gz" help:"absolute file path to local backup tarball"` } func (cmd *RestoreCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/directory/search.go b/pkg/cli/cmd/directory/search.go index 1fa7123a..6ac1b412 100644 --- a/pkg/cli/cmd/directory/search.go +++ b/pkg/cli/cmd/directory/search.go @@ -12,6 +12,7 @@ import ( type SearchCmd struct { clients.RequestArgs dsc.Config + req reader.GetGraphRequest resp reader.GetGraphResponse } diff --git a/pkg/cli/cmd/directory/stats.go b/pkg/cli/cmd/directory/stats.go index 97d0f6bf..9ce1b2eb 100644 --- a/pkg/cli/cmd/directory/stats.go +++ b/pkg/cli/cmd/directory/stats.go @@ -18,8 +18,9 @@ import ( ) type StatsCmd struct { - Output string `flag:"" short:"o" enum:"table,json" default:"table" help:"output format"` dsc.Config + + Output string `flag:"" short:"o" enum:"table,json" default:"table" help:"output format"` } func (cmd *StatsCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/templates/apply.go b/pkg/cli/cmd/templates/apply.go index b7d07ead..d978e48e 100644 --- a/pkg/cli/cmd/templates/apply.go +++ b/pkg/cli/cmd/templates/apply.go @@ -15,10 +15,10 @@ import ( ) type ApplyTemplateCmd struct { + dsc.Config + Name string `arg:"" required:"" help:"template name"` Force bool `flag:"" short:"f" default:"false" required:"false" help:"skip confirmation prompt"` - - dsc.Config } func (cmd *ApplyTemplateCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/templates/install.go b/pkg/cli/cmd/templates/install.go index 6b1fc016..51d08060 100644 --- a/pkg/cli/cmd/templates/install.go +++ b/pkg/cli/cmd/templates/install.go @@ -22,6 +22,8 @@ import ( ) type InstallTemplateCmd struct { + dsc.Config + Name string `arg:"" required:"" help:"template name"` Force bool `flag:"" short:"f" default:"false" required:"false" help:"skip confirmation prompt"` NoConfigure bool `optional:"" default:"false" help:"do not run configure step, to prevent changes to the config .yaml file"` @@ -36,7 +38,6 @@ type InstallTemplateCmd struct { TemplatesURL string `optional:"" default:"${topaz_tmpl_url}" env:"TOPAZ_TMPL_URL" help:"URL of template catalog"` ContainerVersion string `optional:"" hidden:"" default:"" env:"CONTAINER_VERSION"` ConfigName string `optional:"" help:"set config name"` - dsc.Config } func (cmd *InstallTemplateCmd) Run(c *cc.CommonCtx) error { diff --git a/pkg/cli/cmd/topaz/restart.go b/pkg/cli/cmd/topaz/restart.go index 7ce3652f..c4254e46 100644 --- a/pkg/cli/cmd/topaz/restart.go +++ b/pkg/cli/cmd/topaz/restart.go @@ -4,6 +4,7 @@ import "github.com/aserto-dev/topaz/pkg/cli/cc" type RestartCmd struct { StartRunCmd + Wait bool `optional:"" default:"false" help:"wait for ports to be opened"` } diff --git a/pkg/cli/cmd/topaz/start.go b/pkg/cli/cmd/topaz/start.go index 7d6487a0..dc952bc4 100644 --- a/pkg/cli/cmd/topaz/start.go +++ b/pkg/cli/cmd/topaz/start.go @@ -7,6 +7,7 @@ import ( type StartCmd struct { StartRunCmd + Wait bool `optional:"" default:"false" help:"wait for ports to be opened"` } diff --git a/pkg/cli/prompter/prompter.go b/pkg/cli/prompter/prompter.go index dbe45cce..d86ef16f 100644 --- a/pkg/cli/prompter/prompter.go +++ b/pkg/cli/prompter/prompter.go @@ -68,6 +68,7 @@ func (f *prompt) init() error { f.app.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { if event.Key() == tcell.KeyESC || event.Key() == tcell.KeyCtrlC { f.rc <- false + f.app.Stop() return nil @@ -83,11 +84,13 @@ func (f *prompt) init() error { f.form.AddButton("Submit", func() { f.rc <- true + f.app.Stop() }) f.form.AddButton("Cancel", func() { f.rc <- false + f.app.Stop() }) diff --git a/pkg/service/builder/service_factory.go b/pkg/service/builder/service_factory.go index 8df8c251..c4cbe241 100644 --- a/pkg/service/builder/service_factory.go +++ b/pkg/service/builder/service_factory.go @@ -66,7 +66,7 @@ func (f *ServiceFactory) CreateService( grpcOpts.Registrations(grpcServer) reflection.Register(grpcServer) - listener, err := net.Listen("tcp", config.GRPC.ListenAddress) + listener, err := net.Listen("tcp", config.GRPC.ListenAddress) //nolint:noctx if err != nil { return nil, err } @@ -169,6 +169,7 @@ func (f *ServiceFactory) gatewayMux(allowedHeaders []string, errorHandler runtim if lo.Contains(allowedHeaders, key) { return key, true } + return runtime.DefaultHeaderMatcher(key) }), runtime.WithMetadata(captureGatewayRoute), diff --git a/pkg/service/builder/service_manager.go b/pkg/service/builder/service_manager.go index adada4ff..9a433cd2 100644 --- a/pkg/service/builder/service_manager.go +++ b/pkg/service/builder/service_manager.go @@ -67,7 +67,7 @@ func (s *ServiceManager) SetupHealthServer(address string, certCfg *aserto.TLSCo healthServer.Address = address s.HealthServer = healthServer - healthListener, err := net.Listen("tcp", address) + healthListener, err := net.Listen("tcp", address) //nolint:noctx s.logger.Info().Msgf("Starting %s health server", address) @@ -183,39 +183,6 @@ func (s *ServiceManager) StartServers(ctx context.Context) error { return nil } -func (s *ServiceManager) startGateway(serverDetails *Service) { - httpServer := serverDetails.Gateway - if httpServer.Server == nil { - return - } - - s.errGroup.Go(func() error { - s.logger.Info().Msgf("Starting %s gateway server", httpServer.Server.Addr) - - if httpServer.Certs.HasCert() { - if err := httpServer.Server.ListenAndServeTLS(httpServer.Certs.Cert, httpServer.Certs.Key); err != nil { - return err - } - } else { - if err := httpServer.Server.ListenAndServe(); err != nil { - return err - } - } - - return nil - }) -} - -func (s *ServiceManager) logDetails(address string, element any) { - ref := reflect.ValueOf(element).Elem() - typeOfT := ref.Type() - - for i := range ref.NumField() { - f := ref.Field(i) - s.logger.Debug().Str("address", address).Msgf("%s = %v\n", typeOfT.Field(i).Name, f.Interface()) - } -} - func (s *ServiceManager) StopServers(ctx context.Context) { timeout := time.Duration(s.shutdownTimeout) * time.Second timeoutContext, cancel := context.WithTimeout(ctx, timeout) @@ -273,12 +240,48 @@ func (s *ServiceManager) StopServers(ctx context.Context) { } } +func (s *ServiceManager) startGateway(serverDetails *Service) { + httpServer := serverDetails.Gateway + if httpServer.Server == nil { + return + } + + s.errGroup.Go(func() error { + s.logger.Info().Msgf("Starting %s gateway server", httpServer.Server.Addr) + + if httpServer.Certs.HasCert() { + if err := httpServer.Server.ListenAndServeTLS(httpServer.Certs.Cert, httpServer.Certs.Key); err != nil { + return err + } + } else { + if err := httpServer.Server.ListenAndServe(); err != nil { + return err + } + } + + return nil + }) +} + +func (s *ServiceManager) logDetails(address string, element any) { + ref := reflect.ValueOf(element).Elem() + typeOfT := ref.Type() + + for i := range ref.NumField() { + f := ref.Field(i) + s.logger.Debug().Str("address", address).Msgf("%s = %v\n", typeOfT.Field(i).Name, f.Interface()) + } +} + func shutDown(server *grpc.Server, timeout time.Duration) bool { result := make(chan bool, 1) + go func() { server.GracefulStop() + result <- true }() + select { case <-time.After(timeout): server.Stop() diff --git a/plugins/edge/plugin.go b/plugins/edge/plugin.go index 92aea378..c7ca3a1a 100644 --- a/plugins/edge/plugin.go +++ b/plugins/edge/plugin.go @@ -85,10 +85,6 @@ func newEdgePlugin(logger *zerolog.Logger, cfg *Config, topazConfig *topaz.Confi } } -func (p *Plugin) resetContext() { - p.ctx, p.cancel = context.WithCancel(context.Background()) -} - func (p *Plugin) Start(ctx context.Context) error { p.logger.Info().Str("id", p.manager.ID).Bool("enabled", p.config.Enabled).Int("interval", p.config.SyncInterval).Msg("EdgePlugin.Start") @@ -131,6 +127,7 @@ func (p *Plugin) Reconfigure(ctx context.Context, config any) { if newConfig.Enabled { p.resetContext() + go p.scheduler() } else { // set health status to NOT_SERVING when plugin switches to disabled. @@ -149,6 +146,19 @@ func (p *Plugin) Reconfigure(ctx context.Context, config any) { p.config.SessionID = uuid.NewString() } +func (p *Plugin) SyncNow(mode api.SyncMode) { + if p.hasLoopBack() { + p.logger.Trace().Str("mode", mode.String()).Msg("sync now event ignored, operating with remote directory mode") + return + } + + p.syncNow <- mode +} + +func (p *Plugin) resetContext() { + p.ctx, p.cancel = context.WithCancel(context.Background()) +} + // A loopback configuration exists when Topaz is configured with a remote directory AND // an edge sync that points to the same directory instance and tenant as the edge-sync configuration. // The edge sync can be either explicitly configured in the Topaz configuration file or @@ -160,15 +170,6 @@ func (p *Plugin) hasLoopBack() bool { p.config.TenantID == p.topazConfig.DirectoryResolver.TenantID) } -func (p *Plugin) SyncNow(mode api.SyncMode) { - if p.hasLoopBack() { - p.logger.Trace().Str("mode", mode.String()).Msg("sync now event ignored, operating with remote directory mode") - return - } - - p.syncNow <- mode -} - const cycles int64 = 4 func (p *Plugin) scheduler() { @@ -279,6 +280,7 @@ func (p *Plugin) task(mode api.SyncMode) { } ctx, cancel := context.WithCancel(context.Background()) + defer func() { p.logger.Trace().Msg("task cleanup") cancel() From 8042dcd301bbbb1727619e51561892b197229d16 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Sat, 16 Aug 2025 12:42:32 +0200 Subject: [PATCH 02/11] topaz-db (#611) --- cmd/topaz-db/cmd/sync.go | 2 +- cmd/topaz-db/main.go | 3 +++ cmd/topaz-db/pkg/inproc/inproc.go | 9 +++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmd/topaz-db/cmd/sync.go b/cmd/topaz-db/cmd/sync.go index 4231af1b..74cbcee6 100644 --- a/cmd/topaz-db/cmd/sync.go +++ b/cmd/topaz-db/cmd/sync.go @@ -21,7 +21,7 @@ func (cmd *SyncCmd) Run(ctx context.Context) error { // validate modes for _, m := range cmd.Mode { - mode := datasync.StrToMode(strings.ToLower(m)) + mode := datasync.StrToMode(strings.ToUpper(m)) if mode == datasync.Unknown { return errors.Errorf("unknown mode: %s", m) } diff --git a/cmd/topaz-db/main.go b/cmd/topaz-db/main.go index 884af3b4..005c7c12 100644 --- a/cmd/topaz-db/main.go +++ b/cmd/topaz-db/main.go @@ -9,6 +9,7 @@ import ( "github.com/alecthomas/kong" "github.com/aserto-dev/topaz/cmd/topaz-db/cmd" + "github.com/aserto-dev/topaz/pkg/cli/cc" "github.com/aserto-dev/topaz/pkg/cli/x" ) @@ -37,7 +38,9 @@ func main() { "directory_token": "", "tenant_id": os.Getenv(x.EnvAsertoTenantID), "insecure": strconv.FormatBool(false), + "plaintext": strconv.FormatBool(false), "no_check": strconv.FormatBool(false), + "timeout": cc.Timeout().String(), }, ) diff --git a/cmd/topaz-db/pkg/inproc/inproc.go b/cmd/topaz-db/pkg/inproc/inproc.go index 6e37bf29..3a8cfbad 100644 --- a/cmd/topaz-db/pkg/inproc/inproc.go +++ b/cmd/topaz-db/pkg/inproc/inproc.go @@ -50,12 +50,17 @@ func NewServer(ctx context.Context, logger *zerolog.Logger, cfg *directory.Confi } }() - conn, _ := grpc.NewClient("", - grpc.WithContextDialer(func(context.Context, string) (net.Conn, error) { + conn, err := grpc.NewClient( + "passthrough://bufnet", + grpc.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) { return listener.Dial() }), grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithBlock(), //nolint:staticcheck ) + if err != nil { + panic(err) + } return conn, s.GracefulStop } From 66c8127a2b7f55a0c33b89dd3c7f26b575d62128 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Sun, 17 Aug 2025 13:59:03 +0200 Subject: [PATCH 03/11] address CVE-2025-30153 (#613) --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 433c8f00..d05d8e83 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/gdamore/encoding v1.0.1 // indirect - github.com/getkin/kin-openapi v0.129.0 // indirect + github.com/getkin/kin-openapi v0.131.0 // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -144,8 +144,8 @@ require ( github.com/nats-io/nats.go v1.41.1 // indirect github.com/nats-io/nkeys v0.4.10 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80 // indirect - github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349 // indirect + github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect + github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/panmari/cuckoofilter v1.0.6 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect diff --git a/go.sum b/go.sum index 14192ec8..654977c0 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uh github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo= github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU= github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw= -github.com/getkin/kin-openapi v0.129.0 h1:QGYTNcmyP5X0AtFQ2Dkou9DGBJsUETeLH9rFrJXZh30= -github.com/getkin/kin-openapi v0.129.0/go.mod h1:gmWI+b/J45xqpyK5wJmRRZse5wefA5H0RDMK46kLUtI= +github.com/getkin/kin-openapi v0.131.0 h1:NO2UeHnFKRYhZ8wg6Nyh5Cq7dHk4suQQr72a4pMrDxE= +github.com/getkin/kin-openapi v0.131.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a h1:v6zMvHuY9yue4+QkG/HQ/W67wvtQmWJ4SDo9aK/GIno= github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a/go.mod h1:I79BieaU4fxrw4LMXby6q5OS9XnoR9UIKLOzDFjUmuw= github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= @@ -320,10 +320,10 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1 h1:dOYG7LS/WK00RWZc8XGgcUTlTxpp3mKhdR2Q9z9HbXM= github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1/go.mod h1:mpRZBD8SJ55OIICQ3iWH0Yz3cjzA61JdqMLoWXeB2+8= -github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80 h1:nZspmSkneBbtxU9TopEAE0CY+SBJLxO8LPUlw2vG4pU= -github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80/go.mod h1:7tFDb+Y51LcDpn26GccuUgQXUk6t0CXZsivKjyimYX8= -github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349 h1:t05Ww3DxZutOqbMN+7OIuqDwXbhl32HiZGpLy26BAPc= -github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/open-policy-agent/opa v1.7.1 h1:bhA2UGq5oS25471WB9aCJBWEp5/7WK+Nyb2PMAChQIg= From 532b02110feafa213cd5b3959e3036ef00a63c45 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Wed, 3 Sep 2025 15:39:26 +0200 Subject: [PATCH 04/11] runtime v1.8.0 (#614) * update runtime-v1.8.0 --- .github/workflows/ci.yaml | 14 ++-- .github/workflows/pr_checks.yaml | 2 +- go.mod | 51 ++++++------ go.sum | 139 +++++++++++++------------------ makefile | 6 +- 5 files changed, 94 insertions(+), 118 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b6b4bc96..e0d2e50a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,10 +19,10 @@ on: env: VAULT_ADDR: https://vault.aserto.com/ PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'main' || '' }} - GO_VERSION: "1.24" + GO_VERSION: "1.25" GO_RELEASER_VERSION: "v2.8.2" GO_LANGCI_LINT_VERSION: "v2.4.0" - GO_TESTSUM_VERSION: "1.12.1" + GO_TESTSUM_VERSION: "1.12.3" SYFT_VERSION: "v1.13.0" jobs: @@ -42,7 +42,7 @@ jobs: kv/data/github "DOCKER_PUSH_TOKEN" | DOCKER_PASSWORD; kv/data/github "READ_WRITE_TOKEN" | READ_WRITE_TOKEN; - - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Go uses: actions/setup-go@v5 @@ -80,7 +80,7 @@ jobs: args: build --clean --snapshot --single-target - name: Lint - uses: golangci/golangci-lint-action@v7 + uses: golangci/golangci-lint-action@v8 with: version: ${{ env.GO_LANGCI_LINT_VERSION }} args: --timeout=30m @@ -141,7 +141,7 @@ jobs: kv/data/github "DOCKER_PUSH_TOKEN" | DOCKER_PASSWORD; kv/data/github "READ_WRITE_TOKEN" | READ_WRITE_TOKEN; - - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - @@ -217,7 +217,7 @@ jobs: kv/data/github "READ_WRITE_TOKEN" | READ_WRITE_TOKEN; kv/data/github "ASERTO_TAP" | ASERTO_TAP; - - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - @@ -281,7 +281,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml index de9ab9c1..52f3c08a 100644 --- a/.github/workflows/pr_checks.yaml +++ b/.github/workflows/pr_checks.yaml @@ -6,7 +6,7 @@ jobs: check-commits: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - name: gitleaks-check diff --git a/go.mod b/go.mod index d05d8e83..e3afd7fb 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/aserto-dev/topaz -go 1.24.0 +go 1.24.6 -toolchain go1.24.6 +toolchain go1.25.0 require ( github.com/Masterminds/semver/v3 v3.4.0 @@ -21,22 +21,22 @@ require ( github.com/aserto-dev/logger v0.0.9 github.com/aserto-dev/openapi-authorizer v0.20.6 github.com/aserto-dev/openapi-directory v0.33.5 - github.com/aserto-dev/runtime v1.7.1 + github.com/aserto-dev/runtime v1.8.0 github.com/aserto-dev/self-decision-logger v0.0.12 github.com/authzen/access.go v0.0.6 github.com/cli/browser v1.3.0 github.com/docker/docker v28.2.2+incompatible github.com/docker/go-connections v0.5.0 github.com/fatih/color v1.18.0 - github.com/gdamore/tcell/v2 v2.8.1 + github.com/gdamore/tcell/v2 v2.9.0 github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a github.com/go-viper/mapstructure/v2 v2.4.0 github.com/google/uuid v1.6.0 - github.com/google/wire v0.6.0 + github.com/google/wire v0.7.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 github.com/itchyny/gojq v0.12.17 github.com/lestrrat-go/jwx/v2 v2.1.6 github.com/magefile/mage v1.15.0 @@ -45,24 +45,24 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 github.com/moby/term v0.5.2 github.com/olekukonko/tablewriter v0.0.5 - github.com/open-policy-agent/opa v1.7.1 + github.com/open-policy-agent/opa v1.8.0 github.com/opencontainers/image-spec v1.1.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.23.0 - github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb + github.com/rivo/tview v0.42.0 github.com/rs/cors v1.11.1 github.com/rs/zerolog v1.34.0 github.com/samber/lo v1.51.0 github.com/slok/go-http-metrics v0.13.0 github.com/spf13/cobra v1.9.1 github.com/spf13/viper v1.20.1 - github.com/stretchr/testify v1.10.0 - github.com/testcontainers/testcontainers-go v0.37.0 + github.com/stretchr/testify v1.11.1 + github.com/testcontainers/testcontainers-go v0.38.0 go.etcd.io/bbolt v1.4.2 golang.org/x/sync v0.16.0 golang.org/x/sys v0.35.0 - google.golang.org/grpc v1.74.2 - google.golang.org/protobuf v1.36.7 + google.golang.org/grpc v1.75.0 + google.golang.org/protobuf v1.36.8 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) @@ -102,22 +102,25 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/goccy/go-json v0.10.4 // indirect + github.com/goccy/go-json v0.10.5 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/go-tpm v0.9.3 // indirect github.com/google/subcommands v1.2.0 // indirect - github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 // indirect + github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/itchyny/timefmt-go v0.1.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/compress v1.18.0 // indirect - github.com/lestrrat-go/blackmagic v1.0.3 // indirect + github.com/lestrrat-go/blackmagic v1.0.4 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect github.com/lestrrat-go/httprc v1.0.6 // indirect + github.com/lestrrat-go/httprc/v3 v3.0.1 // indirect github.com/lestrrat-go/iter v1.0.2 // indirect + github.com/lestrrat-go/jwx/v3 v3.0.10 // indirect github.com/lestrrat-go/option v1.0.1 // indirect + github.com/lestrrat-go/option/v2 v2.0.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect github.com/magiconair/properties v1.8.10 // indirect @@ -132,7 +135,6 @@ require ( github.com/moby/go-archive v0.1.0 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect - github.com/moby/sys/atomicwriter v0.1.0 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/sys/user v0.4.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect @@ -170,29 +172,30 @@ require ( github.com/tchap/go-patricia/v2 v2.3.3 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.9.0 // indirect + github.com/valyala/fastjson v1.6.4 // indirect github.com/vektah/gqlparser/v2 v2.5.30 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yashtewari/glob-intersection v0.2.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect - go.opentelemetry.io/otel v1.37.0 // indirect - go.opentelemetry.io/otel/metric v1.37.0 // indirect - go.opentelemetry.io/otel/sdk v1.37.0 // indirect - go.opentelemetry.io/otel/trace v1.37.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/sdk v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect golang.org/x/crypto v0.41.0 // indirect - golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect + golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect golang.org/x/term v0.34.0 // indirect golang.org/x/text v0.28.0 // indirect golang.org/x/time v0.12.0 // indirect golang.org/x/tools v0.36.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect oras.land/oras-go/v2 v2.6.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect diff --git a/go.sum b/go.sum index 654977c0..7915f9d1 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ github.com/aserto-dev/openapi-authorizer v0.20.6 h1:IW6sAj17kDYW4iHRvS5pSzWYLoym github.com/aserto-dev/openapi-authorizer v0.20.6/go.mod h1:SPwUWm12v9ProAdssQ/ommYftQ0KXJUbtQQFOWYsbHY= github.com/aserto-dev/openapi-directory v0.33.5 h1:uiNoLTkYE4qEiVBvjbq7A2AqsI+fA/iM5m5Gpaic3NY= github.com/aserto-dev/openapi-directory v0.33.5/go.mod h1:t8jFi3PfdC5k3f/fvYT6DIU+OHzn+Ptidlw83W7h7lo= -github.com/aserto-dev/runtime v1.7.1 h1:bdbP9wuIYdokID3pbhBv6M3L5QMuL2Fsmg3PY7JB+k8= -github.com/aserto-dev/runtime v1.7.1/go.mod h1:fpfbXpU6FVIEQeEU6x8tufpq3Tj/8p6ELLR4WQZy2r8= +github.com/aserto-dev/runtime v1.8.0 h1:skrCQIEye5sLytWCZAF5KzhsI2n5xnNeZHB0D1i9qyY= +github.com/aserto-dev/runtime v1.8.0/go.mod h1:NbKGwt1lqOSUjQKpV7jX86qvbLNBWWnp9qts0sqyeBY= github.com/aserto-dev/self-decision-logger v0.0.12 h1:oMU43OCjgEMcsAx5EraWTncqyZHBea1H1+Dyyd8I3hI= github.com/aserto-dev/self-decision-logger v0.0.12/go.mod h1:nF3SyHJoMS5KbGm+EHF2BlDyNpzjPgodfp6H4MWS6QU= github.com/authzen/access.go v0.0.6 h1:yrsv1PSkXV+8flncvRjnL223Pbfks1xX63IGu+D4BDg= @@ -143,8 +143,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw= github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo= -github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU= -github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw= +github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys= +github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo= github.com/getkin/kin-openapi v0.131.0 h1:NO2UeHnFKRYhZ8wg6Nyh5Cq7dHk4suQQr72a4pMrDxE= github.com/getkin/kin-openapi v0.131.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a h1:v6zMvHuY9yue4+QkG/HQ/W67wvtQmWJ4SDo9aK/GIno= @@ -172,8 +172,8 @@ github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9L github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= -github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -197,18 +197,18 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= -github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA= +github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4= +github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20= -github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 h1:KcFzXwzM/kGhIRHvc8jdixfIJjVzuUJdnv+5xsPutog= -github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -238,18 +238,24 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/lestrrat-go/blackmagic v1.0.3 h1:94HXkVLxkZO9vJI/w2u1T0DAoprShFd13xtnSINtDWs= -github.com/lestrrat-go/blackmagic v1.0.3/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw= +github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA= +github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw= github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k= github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= +github.com/lestrrat-go/httprc/v3 v3.0.1 h1:3n7Es68YYGZb2Jf+k//llA4FTZMl3yCwIjFIk4ubevI= +github.com/lestrrat-go/httprc/v3 v3.0.1/go.mod h1:2uAvmbXE4Xq8kAUjVrZOq1tZVYYYs5iP62Cmtru00xk= github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVfecA= github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU= +github.com/lestrrat-go/jwx/v3 v3.0.10 h1:XuoCBhZBncRIjMQ32HdEc76rH0xK/Qv2wq5TBouYJDw= +github.com/lestrrat-go/jwx/v3 v3.0.10/go.mod h1:kNMedLgTpHvPJkK5EMVa1JFz+UVyY2dMmZKu3qjl/Pk= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= +github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss= +github.com/lestrrat-go/option/v2 v2.0.0/go.mod h1:oSySsmzMoR0iRzCDCaUfsCzxQHUEuhOViQObyy7S6Vg= 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/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0= @@ -326,8 +332,8 @@ github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletI github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/open-policy-agent/opa v1.7.1 h1:bhA2UGq5oS25471WB9aCJBWEp5/7WK+Nyb2PMAChQIg= -github.com/open-policy-agent/opa v1.7.1/go.mod h1:7cPuErOAt7k/oVWAVJnxqAC6mwArrAazkvk0RXiih2A= +github.com/open-policy-agent/opa v1.8.0 h1:4JdYuZcANeUF1v/87NGpirocpaZzJA0PcuL7xfmsMNM= +github.com/open-policy-agent/opa v1.8.0/go.mod h1:vOVZuIJQISnaYcZtQ58yTDkVCp1FmGPwK43pO9qPDqM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= @@ -360,10 +366,9 @@ github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7D github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb h1:n7UJ8X9UnrTZBYXnd1kAIBc067SWyuPIrsocjketYW8= -github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY= +github.com/rivo/tview v0.42.0 h1:b/ftp+RxtDsHSaynXTbJb+/n/BxDEi+W3UfF5jILK6c= +github.com/rivo/tview v0.42.0/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= @@ -412,14 +417,14 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc= github.com/tchap/go-patricia/v2 v2.3.3/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= -github.com/testcontainers/testcontainers-go v0.37.0 h1:L2Qc0vkTw2EHWQ08djon0D2uw7Z/PtHS/QzZZ5Ra/hg= -github.com/testcontainers/testcontainers-go v0.37.0/go.mod h1:QPzbxZhQ6Bclip9igjLFj6z0hs01bU8lrl2dHQmgFGM= +github.com/testcontainers/testcontainers-go v0.38.0 h1:d7uEapLcv2P8AvH8ahLqDMMxda2W9gQN1nRbHS28HBw= +github.com/testcontainers/testcontainers-go v0.38.0/go.mod h1:C52c9MoHpWO+C4aqmgSU+hxlR5jlEayWtgYrb8Pzz1w= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -432,6 +437,8 @@ github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPD github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ= +github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE= github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= @@ -449,24 +456,24 @@ go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I= go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY= -go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= -go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA= -go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= -go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= -go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= -go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= -go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= -go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= -go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= -go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= +go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os= go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -479,21 +486,17 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= -go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE= -go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE= -golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4= +golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0= +golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4= 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= @@ -502,10 +505,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -519,11 +518,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -534,10 +528,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -558,36 +548,20 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= @@ -603,15 +577,14 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= +gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -619,19 +592,19 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= -google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58= -google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= +google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 h1:APHvLLYBhtZvsbnpkfknDZ7NyH4z5+ub/I0u8L3Oz6g= +google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1/go.mod h1:xUjFWUnWDpZ/C0Gu0qloASKFb6f8/QXiiXhSPFsD668= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 h1:pmJpJEvT846VzausCQ5d7KreSROcDqmO388w5YbnltA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4= -google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM= -google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= -google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= +google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= +google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= +google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/makefile b/makefile index ed2c3ac9..3494e6ac 100644 --- a/makefile +++ b/makefile @@ -15,13 +15,13 @@ EXT_DIR := ${PWD}/.ext EXT_BIN_DIR := ${EXT_DIR}/bin EXT_TMP_DIR := ${EXT_DIR}/tmp -GO_VER := 1.24 +GO_VER := 1.25 VAULT_VER := 1.8.12 SVU_VER := 3.1.0 -GOTESTSUM_VER := 1.12.1 +GOTESTSUM_VER := 1.12.3 GOLANGCI-LINT_VER := 2.4.0 GORELEASER_VER := 2.8.2 -WIRE_VER := 0.6.0 +WIRE_VER := 0.7.0 CHECK2DECISION_VER := 0.1.0 SYFT_VER := 1.13.0 From be36924b716f2fe7429371722403d00a0a3f705b Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Wed, 3 Sep 2025 19:57:25 +0200 Subject: [PATCH 05/11] go-edge-ds@v0.33.21 (#615) Integrate bbolt@v1.4.3 https://github.com/etcd-io/bbolt/blob/main/CHANGELOG/CHANGELOG-1.4.md#v1432025-08-19 --- go.mod | 4 ++-- go.sum | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e3afd7fb..e71ce28c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/aserto-dev/go-aserto v0.33.9 github.com/aserto-dev/go-authorizer v0.20.14 github.com/aserto-dev/go-directory v0.33.10 - github.com/aserto-dev/go-edge-ds v0.33.20 + github.com/aserto-dev/go-edge-ds v0.33.21 github.com/aserto-dev/go-grpc v0.9.7 github.com/aserto-dev/go-topaz-ui v0.1.25 github.com/aserto-dev/header v0.0.11 @@ -58,7 +58,7 @@ require ( github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.11.1 github.com/testcontainers/testcontainers-go v0.38.0 - go.etcd.io/bbolt v1.4.2 + go.etcd.io/bbolt v1.4.3 golang.org/x/sync v0.16.0 golang.org/x/sys v0.35.0 google.golang.org/grpc v1.75.0 diff --git a/go.sum b/go.sum index 7915f9d1..0ba480b7 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,10 @@ github.com/aserto-dev/go-decision-logs v0.1.5 h1:5VEFOWJvWi8ZfsA5sDVERDo6qiy2B4K github.com/aserto-dev/go-decision-logs v0.1.5/go.mod h1:x16+Yb6sNi+Twrrdu7BCPa58Yb+uUPfA6r0JaZydJr8= github.com/aserto-dev/go-directory v0.33.10 h1:PLevCAWc9QeLZZv5Wc+yGk4psSd3507y1+9Fps+CzdI= github.com/aserto-dev/go-directory v0.33.10/go.mod h1:CYRXxtDtf4zSwYYBBkGqW3b7HWJWvoIEBWgah9SGMAM= -github.com/aserto-dev/go-edge-ds v0.33.20 h1:9GBu/WR8VUok/mixXNAPrYvS/BYeMQsTQ+ZXjME91LA= -github.com/aserto-dev/go-edge-ds v0.33.20/go.mod h1:0OB6qRyHwo0czemQOipUg1Es8kqhRgo8Vs0H8ByVYtw= +github.com/aserto-dev/go-edge-ds v0.33.21-0.20250903140229-882e3bebb08e h1:4ns1jwzGqp6MQI+Sf+m/EztIoHNipMN+gUVACTiHZBA= +github.com/aserto-dev/go-edge-ds v0.33.21-0.20250903140229-882e3bebb08e/go.mod h1:FBDgXiYP9ZUM9ebGPN5lLsaf7+JUqd70yCoJqTzp3WA= +github.com/aserto-dev/go-edge-ds v0.33.21 h1:kehbMCUsd3OovaDz7WE6SJ159qUmI9YDoqC1UUIh5PQ= +github.com/aserto-dev/go-edge-ds v0.33.21/go.mod h1:FBDgXiYP9ZUM9ebGPN5lLsaf7+JUqd70yCoJqTzp3WA= github.com/aserto-dev/go-grpc v0.9.7 h1:9RcqbO/laXHl2x0TYRC6fvN3Gds4vl5/wLmiTfLZoAo= github.com/aserto-dev/go-grpc v0.9.7/go.mod h1:eTf2AZ6b+TbompDRe2NQWCeYmuDwU5wMVGTTOo3ObGE= github.com/aserto-dev/go-topaz-ui v0.1.25 h1:be4U67A2HkDsGAv3k8O+h5d7N39sVy5m6ewRkviWpP0= @@ -452,8 +454,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I= -go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM= +go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo= +go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= From cfe6872689c8b23cfb45f6cbae34277d510e6bbb Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Wed, 1 Oct 2025 08:32:09 +0200 Subject: [PATCH 06/11] upd to runtime v1.9.0 (#617) --- go.mod | 66 ++++++++++++++----------- go.sum | 153 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 118 insertions(+), 101 deletions(-) diff --git a/go.mod b/go.mod index e71ce28c..14fed22a 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/aserto-dev/topaz -go 1.24.6 +go 1.24.7 -toolchain go1.25.0 +toolchain go1.25.1 require ( github.com/Masterminds/semver/v3 v3.4.0 @@ -21,7 +21,7 @@ require ( github.com/aserto-dev/logger v0.0.9 github.com/aserto-dev/openapi-authorizer v0.20.6 github.com/aserto-dev/openapi-directory v0.33.5 - github.com/aserto-dev/runtime v1.8.0 + github.com/aserto-dev/runtime v1.9.0 github.com/aserto-dev/self-decision-logger v0.0.12 github.com/authzen/access.go v0.0.6 github.com/cli/browser v1.3.0 @@ -45,24 +45,24 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 github.com/moby/term v0.5.2 github.com/olekukonko/tablewriter v0.0.5 - github.com/open-policy-agent/opa v1.8.0 + github.com/open-policy-agent/opa v1.9.0 github.com/opencontainers/image-spec v1.1.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.23.0 + github.com/prometheus/client_golang v1.23.2 github.com/rivo/tview v0.42.0 github.com/rs/cors v1.11.1 github.com/rs/zerolog v1.34.0 github.com/samber/lo v1.51.0 github.com/slok/go-http-metrics v0.13.0 - github.com/spf13/cobra v1.9.1 - github.com/spf13/viper v1.20.1 + github.com/spf13/cobra v1.10.1 + github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.11.1 github.com/testcontainers/testcontainers-go v0.38.0 go.etcd.io/bbolt v1.4.3 - golang.org/x/sync v0.16.0 - golang.org/x/sys v0.35.0 - google.golang.org/grpc v1.75.0 - google.golang.org/protobuf v1.36.8 + golang.org/x/sync v0.17.0 + golang.org/x/sys v0.36.0 + google.golang.org/grpc v1.75.1 + google.golang.org/protobuf v1.36.9 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) @@ -109,16 +109,22 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect + github.com/huandu/go-clone v1.7.3 // indirect + github.com/huandu/go-sqlbuilder v1.37.0 // indirect + github.com/huandu/xstrings v1.5.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/itchyny/timefmt-go v0.1.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/lestrrat-go/blackmagic v1.0.4 // indirect + github.com/lestrrat-go/dsig v1.0.0 // indirect + github.com/lestrrat-go/dsig-secp256k1 v1.0.0 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect github.com/lestrrat-go/httprc v1.0.6 // indirect github.com/lestrrat-go/httprc/v3 v3.0.1 // indirect github.com/lestrrat-go/iter v1.0.2 // indirect - github.com/lestrrat-go/jwx/v3 v3.0.10 // indirect + github.com/lestrrat-go/jwx/v3 v3.0.11 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/lestrrat-go/option/v2 v2.0.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect @@ -156,18 +162,18 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.65.0 // indirect + github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.17.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/sagikazarmark/locafero v0.7.0 // indirect - github.com/segmentio/asm v1.2.0 // indirect + github.com/sagikazarmark/locafero v0.11.0 // indirect + github.com/segmentio/asm v1.2.1 // indirect github.com/shirou/gopsutil/v4 v4.25.5 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect - github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.12.0 // indirect - github.com/spf13/cast v1.7.1 // indirect - github.com/spf13/pflag v1.0.7 // indirect + github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af // indirect + github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect + github.com/spf13/afero v1.15.0 // indirect + github.com/spf13/cast v1.10.0 // indirect + github.com/spf13/pflag v1.0.10 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/tchap/go-patricia/v2 v2.3.3 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect @@ -178,24 +184,24 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yashtewari/glob-intersection v0.2.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - go.yaml.in/yaml/v2 v2.4.2 // indirect - golang.org/x/crypto v0.41.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/crypto v0.42.0 // indirect golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.43.0 // indirect - golang.org/x/term v0.34.0 // indirect - golang.org/x/text v0.28.0 // indirect - golang.org/x/time v0.12.0 // indirect + golang.org/x/net v0.44.0 // indirect + golang.org/x/term v0.35.0 // indirect + golang.org/x/text v0.29.0 // indirect + golang.org/x/time v0.13.0 // indirect golang.org/x/tools v0.36.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect oras.land/oras-go/v2 v2.6.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect diff --git a/go.sum b/go.sum index 0ba480b7..eed8d466 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,6 @@ github.com/aserto-dev/go-decision-logs v0.1.5 h1:5VEFOWJvWi8ZfsA5sDVERDo6qiy2B4K github.com/aserto-dev/go-decision-logs v0.1.5/go.mod h1:x16+Yb6sNi+Twrrdu7BCPa58Yb+uUPfA6r0JaZydJr8= github.com/aserto-dev/go-directory v0.33.10 h1:PLevCAWc9QeLZZv5Wc+yGk4psSd3507y1+9Fps+CzdI= github.com/aserto-dev/go-directory v0.33.10/go.mod h1:CYRXxtDtf4zSwYYBBkGqW3b7HWJWvoIEBWgah9SGMAM= -github.com/aserto-dev/go-edge-ds v0.33.21-0.20250903140229-882e3bebb08e h1:4ns1jwzGqp6MQI+Sf+m/EztIoHNipMN+gUVACTiHZBA= -github.com/aserto-dev/go-edge-ds v0.33.21-0.20250903140229-882e3bebb08e/go.mod h1:FBDgXiYP9ZUM9ebGPN5lLsaf7+JUqd70yCoJqTzp3WA= github.com/aserto-dev/go-edge-ds v0.33.21 h1:kehbMCUsd3OovaDz7WE6SJ159qUmI9YDoqC1UUIh5PQ= github.com/aserto-dev/go-edge-ds v0.33.21/go.mod h1:FBDgXiYP9ZUM9ebGPN5lLsaf7+JUqd70yCoJqTzp3WA= github.com/aserto-dev/go-grpc v0.9.7 h1:9RcqbO/laXHl2x0TYRC6fvN3Gds4vl5/wLmiTfLZoAo= @@ -58,8 +56,8 @@ github.com/aserto-dev/openapi-authorizer v0.20.6 h1:IW6sAj17kDYW4iHRvS5pSzWYLoym github.com/aserto-dev/openapi-authorizer v0.20.6/go.mod h1:SPwUWm12v9ProAdssQ/ommYftQ0KXJUbtQQFOWYsbHY= github.com/aserto-dev/openapi-directory v0.33.5 h1:uiNoLTkYE4qEiVBvjbq7A2AqsI+fA/iM5m5Gpaic3NY= github.com/aserto-dev/openapi-directory v0.33.5/go.mod h1:t8jFi3PfdC5k3f/fvYT6DIU+OHzn+Ptidlw83W7h7lo= -github.com/aserto-dev/runtime v1.8.0 h1:skrCQIEye5sLytWCZAF5KzhsI2n5xnNeZHB0D1i9qyY= -github.com/aserto-dev/runtime v1.8.0/go.mod h1:NbKGwt1lqOSUjQKpV7jX86qvbLNBWWnp9qts0sqyeBY= +github.com/aserto-dev/runtime v1.9.0 h1:Eh9fSOHMKWn7zH3NTYZbYDTXRxVdynQlSZI5mGoy61E= +github.com/aserto-dev/runtime v1.9.0/go.mod h1:eGqkF4I0HZByAJdO5etegnsE3BIJ6wkao9HMLh6Hy6E= github.com/aserto-dev/self-decision-logger v0.0.12 h1:oMU43OCjgEMcsAx5EraWTncqyZHBea1H1+Dyyd8I3hI= github.com/aserto-dev/self-decision-logger v0.0.12/go.mod h1:nF3SyHJoMS5KbGm+EHF2BlDyNpzjPgodfp6H4MWS6QU= github.com/authzen/access.go v0.0.6 h1:yrsv1PSkXV+8flncvRjnL223Pbfks1xX63IGu+D4BDg= @@ -71,8 +69,8 @@ github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HV github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8= -github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= +github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= +github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -216,8 +214,19 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= +github.com/huandu/go-assert v1.1.6 h1:oaAfYxq9KNDi9qswn/6aE0EydfxSa+tWZC1KabNitYs= +github.com/huandu/go-assert v1.1.6/go.mod h1:JuIfbmYG9ykwvuxoJ3V8TB5QP+3+ajIA54Y44TmkMxs= +github.com/huandu/go-clone v1.7.3 h1:rtQODA+ABThEn6J5LBTppJfKmZy/FwfpMUWa8d01TTQ= +github.com/huandu/go-clone v1.7.3/go.mod h1:ReGivhG6op3GYr+UY3lS6mxjKp7MIGTknuU5TbTVaXE= +github.com/huandu/go-sqlbuilder v1.37.0 h1:hXgk2rTnlgFgKsmFpizhe6g/oz1wxef4qk3ixFhK6a0= +github.com/huandu/go-sqlbuilder v1.37.0/go.mod h1:zdONH67liL+/TvoUMwnZP/sUYGSSvHh9psLe/HpXn8E= +github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI= +github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg= @@ -242,6 +251,10 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA= github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw= +github.com/lestrrat-go/dsig v1.0.0 h1:OE09s2r9Z81kxzJYRn07TFM9XA4akrUdoMwr0L8xj38= +github.com/lestrrat-go/dsig v1.0.0/go.mod h1:dEgoOYYEJvW6XGbLasr8TFcAxoWrKlbQvmJgCR0qkDo= +github.com/lestrrat-go/dsig-secp256k1 v1.0.0 h1:JpDe4Aybfl0soBvoVwjqDbp+9S1Y2OM7gcrVVMFPOzY= +github.com/lestrrat-go/dsig-secp256k1 v1.0.0/go.mod h1:CxUgAhssb8FToqbL8NjSPoGQlnO4w3LG1P0qPWQm/NU= github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k= @@ -252,8 +265,8 @@ github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzlt github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVfecA= github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU= -github.com/lestrrat-go/jwx/v3 v3.0.10 h1:XuoCBhZBncRIjMQ32HdEc76rH0xK/Qv2wq5TBouYJDw= -github.com/lestrrat-go/jwx/v3 v3.0.10/go.mod h1:kNMedLgTpHvPJkK5EMVa1JFz+UVyY2dMmZKu3qjl/Pk= +github.com/lestrrat-go/jwx/v3 v3.0.11 h1:yEeUGNUuNjcez/Voxvr7XPTYNraSQTENJgtVTfwvG/w= +github.com/lestrrat-go/jwx/v3 v3.0.11/go.mod h1:XSOAh2SiXm0QgRe3DulLZLyt+wUuEdFo81zuKTLcvgQ= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss= @@ -334,8 +347,8 @@ github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletI github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/open-policy-agent/opa v1.8.0 h1:4JdYuZcANeUF1v/87NGpirocpaZzJA0PcuL7xfmsMNM= -github.com/open-policy-agent/opa v1.8.0/go.mod h1:vOVZuIJQISnaYcZtQ58yTDkVCp1FmGPwK43pO9qPDqM= +github.com/open-policy-agent/opa v1.9.0 h1:QWFNwbcc29IRy0xwD3hRrMc/RtSersLY1Z6TaID3vgI= +github.com/open-policy-agent/opa v1.9.0/go.mod h1:72+lKmTda0O48m1VKAxxYl7MjP/EWFZu9fxHQK2xihs= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= @@ -357,13 +370,13 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc= -github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE= +github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= +github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE= -github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= +github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs= +github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0= github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg= @@ -381,34 +394,34 @@ github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo= -github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k= +github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= +github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI= github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= -github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= -github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= +github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shirou/gopsutil/v4 v4.25.5 h1:rtd9piuSMGeU8g1RMXjZs9y9luK5BwtnG7dZaQUJAsc= github.com/shirou/gopsutil/v4 v4.25.5/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0= +github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/slok/go-http-metrics v0.13.0 h1:lQDyJJx9wKhmbliyUsZ2l6peGnXRHjsjoqPt5VYzcP8= github.com/slok/go-http-metrics v0.13.0/go.mod h1:HIr7t/HbN2sJaunvnt9wKP9xoBBVZFo1/KiHU3b0w+4= -github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= -github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4= -github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= -github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= -github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= -github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M= -github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4= -github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4= +github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= +github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= +github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= +github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= +github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= +github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= +github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= @@ -456,18 +469,18 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo= go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E= -go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= -go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= +go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= @@ -476,26 +489,24 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6 go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= -go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os= -go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo= +go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4= +go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= -go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= -go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= -golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0= golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4= @@ -520,8 +531,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -530,8 +541,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -552,22 +563,22 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= -golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= -golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= -golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= +golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -592,21 +603,21 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= -google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 h1:APHvLLYBhtZvsbnpkfknDZ7NyH4z5+ub/I0u8L3Oz6g= -google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1/go.mod h1:xUjFWUnWDpZ/C0Gu0qloASKFb6f8/QXiiXhSPFsD668= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 h1:pmJpJEvT846VzausCQ5d7KreSROcDqmO388w5YbnltA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og= +google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= +google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 h1:8XJ4pajGwOlasW+L13MnEGA8W4115jJySQtVfS2/IBU= +google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 h1:i8QOKZfYg6AbGVZzUAY3LrNWCKF8O6zFisU9Wl9RER4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= -google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= -google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= -google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= +google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= +google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= +google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw= +google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= From 7893edd73b7ba3734c2b1b89f770ee753eca4394 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:16:52 +0200 Subject: [PATCH 07/11] fix issue-618 (#619) --- plugins/edge/plugin.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/edge/plugin.go b/plugins/edge/plugin.go index c7ca3a1a..2825f984 100644 --- a/plugins/edge/plugin.go +++ b/plugins/edge/plugin.go @@ -345,11 +345,12 @@ func (p *Plugin) task(mode api.SyncMode) { } func (p *Plugin) exec(ctx context.Context, ds *directory.Directory, conn *grpc.ClientConn, opts []datasync.Option) { - if err := ds.DataSyncClient().Sync(ctx, conn, opts...); err != nil { + err := ds.DataSyncClient().Sync(ctx, conn, opts...) + if err != nil { p.logger.Error().Err(err).Msg(syncTask) } - if p.config.Enabled { + if p.config.Enabled && err == nil { app.SetServiceStatus(p.logger, "sync", grpc_health_v1.HealthCheckResponse_SERVING) } From 6476d4a09bdb4305a47c5b7f2c653975f046c2f8 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Mon, 3 Nov 2025 19:55:26 +0100 Subject: [PATCH 08/11] upd golang to v1.25.3 (#621) --- .github/workflows/ci.yaml | 10 ++-- .gitignore | 4 ++ builtins/edge/ds/checks.go | 2 +- controller/controller.go | 2 +- go.mod | 46 +++++++-------- go.sum | 80 ++++++++++++++------------ makefile | 6 +- pkg/app/directory/simple_resolver.go | 2 +- pkg/app/middlewares/policy_instance.go | 4 +- pkg/app/topaz.go | 1 + pkg/app/topaz/wire.go | 1 - pkg/cc/config/config.go | 2 +- pkg/cc/wire.go | 1 - pkg/cli/cmd/certs/generate.go | 2 +- pkg/cli/cmd/templates/template.go | 2 +- pkg/cli/dockerx/docker.go | 6 +- 16 files changed, 89 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e0d2e50a..0591e6fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,8 +21,8 @@ env: PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'main' || '' }} GO_VERSION: "1.25" GO_RELEASER_VERSION: "v2.8.2" - GO_LANGCI_LINT_VERSION: "v2.4.0" - GO_TESTSUM_VERSION: "1.12.3" + GO_LANGCI_LINT_VERSION: "v2.6.0" + GO_TESTSUM_VERSION: "1.13.0" SYFT_VERSION: "v1.13.0" jobs: @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v5 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ env.GO_VERSION }} - @@ -146,7 +146,7 @@ jobs: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ env.GO_VERSION }} - @@ -222,7 +222,7 @@ jobs: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ env.GO_VERSION }} - diff --git a/.gitignore b/.gitignore index 34ef20f1..5dd2aed2 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,7 @@ __debug_bin* # latest container test-snapshot .container-tag.env .qodo + +# LLM agent configs +AGENTS.md +CLAUDE.md diff --git a/builtins/edge/ds/checks.go b/builtins/edge/ds/checks.go index 06b236ff..4c14e36a 100644 --- a/builtins/edge/ds/checks.go +++ b/builtins/edge/ds/checks.go @@ -18,7 +18,7 @@ import ( "google.golang.org/protobuf/types/known/structpb" ) -// RegisterCheck - ds.checks +// RegisterChecks - ds.checks // // ds.checks({ // "object_type": "", diff --git a/controller/controller.go b/controller/controller.go index 274991d5..ef6edb20 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -75,7 +75,7 @@ func NewController(logger *zerolog.Logger, policyName, host string, cfg *Config, const expBackoff = 2 -// run context dependant controller. +// Start context dependant controller. func (c *Controller) Start(ctx context.Context) func() { ctx, cancel := context.WithCancel(ctx) errGroup := errgroup.Group{} diff --git a/go.mod b/go.mod index 14fed22a..d21cca4a 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/aserto-dev/topaz -go 1.24.7 +go 1.24.9 -toolchain go1.25.1 +toolchain go1.25.3 require ( github.com/Masterminds/semver/v3 v3.4.0 @@ -25,8 +25,8 @@ require ( github.com/aserto-dev/self-decision-logger v0.0.12 github.com/authzen/access.go v0.0.6 github.com/cli/browser v1.3.0 - github.com/docker/docker v28.2.2+incompatible - github.com/docker/go-connections v0.5.0 + github.com/docker/docker v28.3.3+incompatible + github.com/docker/go-connections v0.6.0 github.com/fatih/color v1.18.0 github.com/gdamore/tcell/v2 v2.9.0 github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a @@ -36,12 +36,12 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 github.com/itchyny/gojq v0.12.17 github.com/lestrrat-go/jwx/v2 v2.1.6 github.com/magefile/mage v1.15.0 github.com/mattn/go-isatty v0.0.20 - github.com/mennanov/fmutils v0.3.3 + github.com/mennanov/fmutils v0.3.4 github.com/mitchellh/go-wordwrap v1.0.1 github.com/moby/term v0.5.2 github.com/olekukonko/tablewriter v0.0.5 @@ -52,22 +52,22 @@ require ( github.com/rivo/tview v0.42.0 github.com/rs/cors v1.11.1 github.com/rs/zerolog v1.34.0 - github.com/samber/lo v1.51.0 + github.com/samber/lo v1.52.0 github.com/slok/go-http-metrics v0.13.0 github.com/spf13/cobra v1.10.1 github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.11.1 - github.com/testcontainers/testcontainers-go v0.38.0 + github.com/testcontainers/testcontainers-go v0.39.0 go.etcd.io/bbolt v1.4.3 golang.org/x/sync v0.17.0 - golang.org/x/sys v0.36.0 - google.golang.org/grpc v1.75.1 - google.golang.org/protobuf v1.36.9 + golang.org/x/sys v0.37.0 + google.golang.org/grpc v1.76.0 + google.golang.org/protobuf v1.36.10 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) require ( - dario.cat/mergo v1.0.1 // indirect + dario.cat/mergo v1.0.2 // indirect github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/agnivade/levenshtein v1.2.1 // indirect @@ -168,7 +168,7 @@ require ( github.com/rivo/uniseg v0.4.7 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect github.com/segmentio/asm v1.2.1 // indirect - github.com/shirou/gopsutil/v4 v4.25.5 // indirect + github.com/shirou/gopsutil/v4 v4.25.6 // indirect github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af // indirect github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect @@ -192,16 +192,16 @@ require ( go.opentelemetry.io/otel/trace v1.38.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.42.0 // indirect - golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect - golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.44.0 // indirect - golang.org/x/term v0.35.0 // indirect - golang.org/x/text v0.29.0 // indirect - golang.org/x/time v0.13.0 // indirect - golang.org/x/tools v0.36.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect + golang.org/x/crypto v0.43.0 // indirect + golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect + golang.org/x/mod v0.29.0 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/term v0.36.0 // indirect + golang.org/x/text v0.30.0 // indirect + golang.org/x/time v0.14.0 // indirect + golang.org/x/tools v0.38.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect gopkg.in/yaml.v3 v3.0.1 // indirect oras.land/oras-go/v2 v2.6.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect diff --git a/go.sum b/go.sum index eed8d466..835e6b2f 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= -dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= +dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= @@ -115,10 +115,10 @@ github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54 h1:SG7nF6SRlWhcT7c github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw= -github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= -github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= +github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94= +github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= @@ -207,8 +207,8 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4z github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -291,8 +291,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mennanov/fmutils v0.3.3 h1:s4R1k0gh8hP5jNCYLR/wMuMH/tt6ChNKsfFKWfgfL8s= -github.com/mennanov/fmutils v0.3.3/go.mod h1:XlZAw1XIDjV0Kt0LYpv8leyGVoHVg3i7ma5EngZdQ7I= +github.com/mennanov/fmutils v0.3.4 h1:6JNnCVFcZ2Cl7FJB9VU7bfS36VdWlNlAPWuOTOHZ0fk= +github.com/mennanov/fmutils v0.3.4/go.mod h1:XlZAw1XIDjV0Kt0LYpv8leyGVoHVg3i7ma5EngZdQ7I= github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM= github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk= github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q= @@ -396,14 +396,14 @@ github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= -github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI= -github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= +github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw= +github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/shirou/gopsutil/v4 v4.25.5 h1:rtd9piuSMGeU8g1RMXjZs9y9luK5BwtnG7dZaQUJAsc= -github.com/shirou/gopsutil/v4 v4.25.5/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c= +github.com/shirou/gopsutil/v4 v4.25.6 h1:kLysI2JsKorfaFPcYmcJqbzROzsBWEOAtw6A7dIfqXs= +github.com/shirou/gopsutil/v4 v4.25.6/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0= github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -438,8 +438,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc= github.com/tchap/go-patricia/v2 v2.3.3/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= -github.com/testcontainers/testcontainers-go v0.38.0 h1:d7uEapLcv2P8AvH8ahLqDMMxda2W9gQN1nRbHS28HBw= -github.com/testcontainers/testcontainers-go v0.38.0/go.mod h1:C52c9MoHpWO+C4aqmgSU+hxlR5jlEayWtgYrb8Pzz1w= +github.com/testcontainers/testcontainers-go v0.39.0 h1:uCUJ5tA+fcxbFAB0uP3pIK3EJ2IjjDUHFSZ1H1UxAts= +github.com/testcontainers/testcontainers-go v0.39.0/go.mod h1:qmHpkG7H5uPf/EvOORKvS6EuDkBUPE3zpVGaH9NL7f8= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -505,11 +505,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= -golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0= -golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4= +golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY= +golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70= 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= @@ -518,8 +518,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= +golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -531,8 +531,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -563,22 +563,22 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= -golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= -golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= -golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= +golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= +golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -590,8 +590,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -606,9 +606,11 @@ google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 h1:8XJ4pajGwOlasW+L13MnEGA8W4115jJySQtVfS2/IBU= -google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk= +google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda h1:+2XxjfsAu6vqFxwGBRcHiMaDCuZiqXGDUDVWVtrFAnE= +google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo= google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 h1:i8QOKZfYg6AbGVZzUAY3LrNWCKF8O6zFisU9Wl9RER4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -616,8 +618,10 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= -google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw= -google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= +google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= +google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/makefile b/makefile index 3494e6ac..bff661dd 100644 --- a/makefile +++ b/makefile @@ -17,9 +17,9 @@ EXT_TMP_DIR := ${EXT_DIR}/tmp GO_VER := 1.25 VAULT_VER := 1.8.12 -SVU_VER := 3.1.0 -GOTESTSUM_VER := 1.12.3 -GOLANGCI-LINT_VER := 2.4.0 +SVU_VER := 3.3.0 +GOTESTSUM_VER := 1.13.0 +GOLANGCI-LINT_VER := 2.6.0 GORELEASER_VER := 2.8.2 WIRE_VER := 0.7.0 CHECK2DECISION_VER := 0.1.0 diff --git a/pkg/app/directory/simple_resolver.go b/pkg/app/directory/simple_resolver.go index f2c08bcb..9d4e255a 100644 --- a/pkg/app/directory/simple_resolver.go +++ b/pkg/app/directory/simple_resolver.go @@ -16,7 +16,7 @@ type Resolver struct { var _ resolvers.DirectoryResolver = &Resolver{} -// The simple directory resolver returns a simple directory reader client. +// NewResolver returns a simple directory reader client. func NewResolver(logger *zerolog.Logger, cfg *client.Config) (*Resolver, error) { l := logger.With().Interface("client", cfg).Logger() l.Debug().Msg("new directory resolver") diff --git a/pkg/app/middlewares/policy_instance.go b/pkg/app/middlewares/policy_instance.go index 7ce5f821..276f989a 100644 --- a/pkg/app/middlewares/policy_instance.go +++ b/pkg/app/middlewares/policy_instance.go @@ -29,7 +29,7 @@ func NewInstanceMiddleware(cfg *config.Config, logger *zerolog.Logger) *PolicyIn var _ grpcutil.Middleware = &PolicyInstanceMiddleware{} -// If the unary operation is an Is request attach configured instance information to request. +// Unary, if the unary operation is an `Is` request, attach configured instance information to request. func (m *PolicyInstanceMiddleware) Unary() grpc.UnaryServerInterceptor { return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { request, ok := req.(*authorizer.IsRequest) @@ -43,7 +43,7 @@ func (m *PolicyInstanceMiddleware) Unary() grpc.UnaryServerInterceptor { } } -// passthrough as Is call is Unary type operation. +// Stream, passthrough as Is call is Unary type operation. func (m *PolicyInstanceMiddleware) Stream() grpc.StreamServerInterceptor { return func(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { ctx := stream.Context() diff --git a/pkg/app/topaz.go b/pkg/app/topaz.go index c9fa5175..3f42cdee 100644 --- a/pkg/app/topaz.go +++ b/pkg/app/topaz.go @@ -184,6 +184,7 @@ func (e *Topaz) ConfigServices() error { return err } } + return nil }, ErrorHandler: cerr.CustomErrorHandler, diff --git a/pkg/app/topaz/wire.go b/pkg/app/topaz/wire.go index 49bf60cd..b51efbca 100644 --- a/pkg/app/topaz/wire.go +++ b/pkg/app/topaz/wire.go @@ -1,5 +1,4 @@ //go:build wireinject -// +build wireinject package topaz diff --git a/pkg/cc/config/config.go b/pkg/cc/config/config.go index ad19da12..788cc3b4 100644 --- a/pkg/cc/config/config.go +++ b/pkg/cc/config/config.go @@ -40,7 +40,7 @@ type ServicesConfig struct { Services map[string]*builder.API `json:"services"` } -// Config holds the configuration for the app. +// Common holds the shared configuration elements. type Common struct { Version int `json:"version"` Logging logger.Config `json:"logging"` diff --git a/pkg/cc/wire.go b/pkg/cc/wire.go index 083269e2..0e10bbfd 100644 --- a/pkg/cc/wire.go +++ b/pkg/cc/wire.go @@ -1,5 +1,4 @@ //go:build wireinject -// +build wireinject package cc diff --git a/pkg/cli/cmd/certs/generate.go b/pkg/cli/cmd/certs/generate.go index 9d7a69c3..48200197 100644 --- a/pkg/cli/cmd/certs/generate.go +++ b/pkg/cli/cmd/certs/generate.go @@ -16,7 +16,7 @@ type GenerateCertsCmd struct { DNSNames []string `flag:"" default:"localhost" help:"list of DNS names used to generate dev certs"` } -// Generate a pair of gateway and grpc certificates. +// Run generates a pair of gateway and grpc certificates. func (cmd *GenerateCertsCmd) Run(c *cc.CommonCtx) error { certsDir := cmd.CertsDir if _, err := os.Stat(certsDir); os.IsNotExist(err) { diff --git a/pkg/cli/cmd/templates/template.go b/pkg/cli/cmd/templates/template.go index fd2282b5..b6d2d3bd 100644 --- a/pkg/cli/cmd/templates/template.go +++ b/pkg/cli/cmd/templates/template.go @@ -50,7 +50,7 @@ type template struct { Name string `json:"name"` Resource string `json:"resource"` Local bool `json:"local"` - } `json:"policy,omitempty"` + } `json:"policy"` IdentityData []string `json:"idp_data,omitempty"` DomainData []string `json:"domain_data,omitempty"` Assertions []string `json:"assertions,omitempty"` diff --git a/pkg/cli/dockerx/docker.go b/pkg/cli/dockerx/docker.go index 808e6f24..455727e4 100644 --- a/pkg/cli/dockerx/docker.go +++ b/pkg/cli/dockerx/docker.go @@ -81,7 +81,7 @@ func (dc *DockerClient) PullImage(img, platform string) error { return nil } -// Remove container image as image-name:tag. +// RemoveImage removes an image-name:tag from the docker host. func (dc *DockerClient) RemoveImage(img string) error { images, err := dc.cli.ImageList(dc.ctx, image.ListOptions{ Filters: filters.NewArgs( @@ -104,7 +104,7 @@ func (dc *DockerClient) RemoveImage(img string) error { return nil } -// Check if image exists in local container store. +// ImageExists checks if image exists in local container store. func (dc *DockerClient) ImageExists(img string) bool { images, err := dc.cli.ImageList(dc.ctx, image.ListOptions{ Filters: filters.NewArgs( @@ -412,7 +412,7 @@ func (dc *DockerClient) Run(opts ...RunOption) error { return nil } -// Starts starts a container like `docker start` using the provided settings. +// Start starts a container instance like `docker start` using the provided settings. func (dc *DockerClient) Start(opts ...RunOption) error { r := &runner{ config: &container.Config{}, From 61ded54b6c41cf0731defdf4f0ce055147823480 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Mon, 3 Nov 2025 21:01:16 +0100 Subject: [PATCH 09/11] move ds builtins from builtins/edge/ds to builtins/ds (#620) Move ds builtins from builtins/edge/ds to builtins/ds --- builtins/{edge => }/ds/check.go | 0 builtins/{edge => }/ds/checks.go | 0 builtins/{edge => }/ds/graph.go | 0 builtins/{edge => }/ds/helper.go | 0 builtins/{edge => }/ds/identity.go | 0 builtins/{edge => }/ds/object.go | 0 builtins/{edge => }/ds/relation.go | 0 builtins/{edge => }/ds/user.go | 0 makefile | 19 +------------------ pkg/app/topaz/runtime_resolver.go | 2 +- 10 files changed, 2 insertions(+), 19 deletions(-) rename builtins/{edge => }/ds/check.go (100%) rename builtins/{edge => }/ds/checks.go (100%) rename builtins/{edge => }/ds/graph.go (100%) rename builtins/{edge => }/ds/helper.go (100%) rename builtins/{edge => }/ds/identity.go (100%) rename builtins/{edge => }/ds/object.go (100%) rename builtins/{edge => }/ds/relation.go (100%) rename builtins/{edge => }/ds/user.go (100%) diff --git a/builtins/edge/ds/check.go b/builtins/ds/check.go similarity index 100% rename from builtins/edge/ds/check.go rename to builtins/ds/check.go diff --git a/builtins/edge/ds/checks.go b/builtins/ds/checks.go similarity index 100% rename from builtins/edge/ds/checks.go rename to builtins/ds/checks.go diff --git a/builtins/edge/ds/graph.go b/builtins/ds/graph.go similarity index 100% rename from builtins/edge/ds/graph.go rename to builtins/ds/graph.go diff --git a/builtins/edge/ds/helper.go b/builtins/ds/helper.go similarity index 100% rename from builtins/edge/ds/helper.go rename to builtins/ds/helper.go diff --git a/builtins/edge/ds/identity.go b/builtins/ds/identity.go similarity index 100% rename from builtins/edge/ds/identity.go rename to builtins/ds/identity.go diff --git a/builtins/edge/ds/object.go b/builtins/ds/object.go similarity index 100% rename from builtins/edge/ds/object.go rename to builtins/ds/object.go diff --git a/builtins/edge/ds/relation.go b/builtins/ds/relation.go similarity index 100% rename from builtins/edge/ds/relation.go rename to builtins/ds/relation.go diff --git a/builtins/edge/ds/user.go b/builtins/ds/user.go similarity index 100% rename from builtins/edge/ds/user.go rename to builtins/ds/user.go diff --git a/makefile b/makefile index bff661dd..41acbf5f 100644 --- a/makefile +++ b/makefile @@ -22,7 +22,6 @@ GOTESTSUM_VER := 1.13.0 GOLANGCI-LINT_VER := 2.6.0 GORELEASER_VER := 2.8.2 WIRE_VER := 0.7.0 -CHECK2DECISION_VER := 0.1.0 SYFT_VER := 1.13.0 RELEASE_TAG := $$(${EXT_BIN_DIR}/svu current) @@ -30,7 +29,7 @@ RELEASE_TAG := $$(${EXT_BIN_DIR}/svu current) .DEFAULT_GOAL := build .PHONY: deps -deps: info install-vault install-svu install-goreleaser install-golangci-lint install-gotestsum install-wire install-check2decision install-syft +deps: info install-vault install-svu install-goreleaser install-golangci-lint install-gotestsum install-wire install-syft @echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)" .PHONY: gover @@ -119,14 +118,6 @@ write-version: @echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)" @git describe --tags > ./VERSION.txt -ASSETS = "assets/v32/api-auth/test/api-auth_" "assets/v32/gdrive/test/gdrive_" "assets/v32/github/test/github_" "assets/v32/multi-tenant/test/multi-tenant_" "assets/v32/slack/test/slack_" \ - "assets/v33/api-auth/test/api-auth_" "assets/v33/gdrive/test/gdrive_" "assets/v33/github/test/github_" "assets/v33/multi-tenant/test/multi-tenant_" "assets/v33/slack/test/slack_" -.PHONY: update-assets -update-assets: $(ASSETS) -$(ASSETS): install-check2decision - @echo -e "$(ATTN_COLOR)==> github.com/aserto-dev/topaz/$@ $(NO_COLOR)" - @${EXT_BIN_DIR}/check2decision -i "$@assertions.json" -o "$@decisions.json" - TEMPLATES = "assets/v32/api-auth.json" "assets/v32/gdrive.json" "assets/v32/github.json" "assets/v32/multi-tenant.json" "assets/v32/peoplefinder.json" "assets/v32/simple-rbac.json" "assets/v32/slack.json" "assets/v32/todo.json" \ "assets/v33/api-auth.json" "assets/v33/gdrive.json" "assets/v33/github.json" "assets/v33/multi-tenant.json" "assets/v33/peoplefinder.json" "assets/v33/simple-rbac.json" "assets/v33/slack.json" "assets/v33/todo.json" .PHONY: test-templates @@ -196,14 +187,6 @@ install-wire: ${EXT_TMP_DIR} ${EXT_BIN_DIR} @echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)" @GOBIN=${EXT_BIN_DIR} go install github.com/google/wire/cmd/wire@v${WIRE_VER} -.PHONY: install-check2decision -install-check2decision: ${EXT_TMP_DIR} ${EXT_BIN_DIR} - @echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)" - @gh release download v${CHECK2DECISION_VER} --repo https://github.com/aserto-dev/check2decision --pattern "check2decision-${GOOS}-${GOARCH}.zip" --output "${EXT_TMP_DIR}/check2decision.zip" --clobber - @unzip -o ${EXT_TMP_DIR}/check2decision.zip check2decision -d ${EXT_BIN_DIR}/ &> /dev/null - @chmod +x ${EXT_BIN_DIR}/check2decision - @${EXT_BIN_DIR}/check2decision --version - .PHONY: install-syft install-syft: ${EXT_TMP_DIR} ${EXT_BIN_DIR} @echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)" diff --git a/pkg/app/topaz/runtime_resolver.go b/pkg/app/topaz/runtime_resolver.go index 8cc0f91b..12a787a1 100644 --- a/pkg/app/topaz/runtime_resolver.go +++ b/pkg/app/topaz/runtime_resolver.go @@ -10,7 +10,7 @@ import ( "github.com/aserto-dev/go-authorizer/pkg/aerr" "github.com/aserto-dev/go-grpc/aserto/api/v2" runtime "github.com/aserto-dev/runtime" - "github.com/aserto-dev/topaz/builtins/edge/ds" + "github.com/aserto-dev/topaz/builtins/ds" "github.com/aserto-dev/topaz/controller" "github.com/aserto-dev/topaz/decisionlog" "github.com/aserto-dev/topaz/pkg/app/management" From c19a54543c488306e40467683589d04396242526 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Mon, 3 Nov 2025 22:21:02 +0100 Subject: [PATCH 10/11] fix builtins helper (#622) --- builtins/ds/check.go | 17 +++++++++-------- builtins/ds/checks.go | 7 ++++--- builtins/ds/graph.go | 9 +++++---- builtins/ds/identity.go | 7 ++++--- builtins/ds/object.go | 7 ++++--- builtins/ds/relation.go | 17 +++++++++-------- builtins/ds/user.go | 7 ++++--- builtins/{ds => }/helper.go | 8 ++++---- go.sum | 4 ---- 9 files changed, 43 insertions(+), 40 deletions(-) rename builtins/{ds => }/helper.go (90%) diff --git a/builtins/ds/check.go b/builtins/ds/check.go index 44514545..de61ef4f 100644 --- a/builtins/ds/check.go +++ b/builtins/ds/check.go @@ -2,6 +2,7 @@ package ds import ( dsr3 "github.com/aserto-dev/go-directory/aserto/directory/reader/v3" + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/resolvers" "github.com/open-policy-agent/opa/v1/ast" @@ -36,7 +37,7 @@ func RegisterCheck(logger *zerolog.Logger, fnName string, dr resolvers.Directory } if proto.Equal(&args, &dsr3.CheckRequest{}) { - return helpMsg(fnName, &dsr3.CheckRequest{ + return builtins.HelpMsg(fnName, &dsr3.CheckRequest{ ObjectType: "", ObjectId: "", Relation: "", @@ -47,7 +48,7 @@ func RegisterCheck(logger *zerolog.Logger, fnName string, dr resolvers.Directory resp, err := dr.GetDS().Check(bctx.Context, &args) if err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } @@ -77,12 +78,12 @@ func RegisterCheckRelation(logger *zerolog.Logger, fnName string, dr resolvers.D var args dsr3.CheckRelationRequest if err := ast.As(op1.Value, &args); err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } if proto.Equal(&args, &dsr3.CheckRelationRequest{}) { - return helpMsg(fnName, &dsr3.CheckRelationRequest{ + return builtins.HelpMsg(fnName, &dsr3.CheckRelationRequest{ ObjectType: "", ObjectId: "", Relation: "", @@ -95,7 +96,7 @@ func RegisterCheckRelation(logger *zerolog.Logger, fnName string, dr resolvers.D //nolint: staticcheck // SA1019: client.CheckRelation is deprecated resp, err := dr.GetDS().CheckRelation(bctx.Context, &args) if err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } @@ -125,12 +126,12 @@ func RegisterCheckPermission(logger *zerolog.Logger, fnName string, dr resolvers var args dsr3.CheckPermissionRequest if err := ast.As(op1.Value, &args); err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } if proto.Equal(&args, &dsr3.CheckPermissionRequest{}) { - return helpMsg(fnName, &dsr3.CheckPermissionRequest{ + return builtins.HelpMsg(fnName, &dsr3.CheckPermissionRequest{ ObjectType: "", ObjectId: "", Permission: "", @@ -143,7 +144,7 @@ func RegisterCheckPermission(logger *zerolog.Logger, fnName string, dr resolvers //nolint: staticcheck // SA1019: client.CheckPermission is deprecated resp, err := dr.GetDS().CheckPermission(bctx.Context, &args) if err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } diff --git a/builtins/ds/checks.go b/builtins/ds/checks.go index 4c14e36a..865c7e8b 100644 --- a/builtins/ds/checks.go +++ b/builtins/ds/checks.go @@ -4,6 +4,7 @@ import ( "bytes" dsr3 "github.com/aserto-dev/go-directory/aserto/directory/reader/v3" + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/resolvers" "github.com/open-policy-agent/opa/v1/ast" @@ -42,7 +43,7 @@ func RegisterChecks(logger *zerolog.Logger, fnName string, dr resolvers.Director } if proto.Equal(&args, &dsr3.ChecksRequest{}) { - return helpMsg(fnName, &dsr3.ChecksRequest{ + return builtins.HelpMsg(fnName, &dsr3.ChecksRequest{ Default: &dsr3.CheckRequest{ ObjectType: "", ObjectId: "", @@ -72,12 +73,12 @@ func RegisterChecks(logger *zerolog.Logger, fnName string, dr resolvers.Director resp, err := dr.GetDS().Checks(bctx.Context, &args) if err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } buf := new(bytes.Buffer) - if err := ProtoToBuf(buf, resp); err != nil { + if err := builtins.ProtoToBuf(buf, resp); err != nil { return nil, err } diff --git a/builtins/ds/graph.go b/builtins/ds/graph.go index 59ccb315..7f54ba00 100644 --- a/builtins/ds/graph.go +++ b/builtins/ds/graph.go @@ -4,6 +4,7 @@ import ( "bytes" dsr3 "github.com/aserto-dev/go-directory/aserto/directory/reader/v3" + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/resolvers" "github.com/open-policy-agent/opa/v1/ast" @@ -36,12 +37,12 @@ func RegisterGraph(logger *zerolog.Logger, fnName string, dr resolvers.Directory var args dsr3.GetGraphRequest if err := ast.As(op1.Value, &args); err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } if proto.Equal(&args, &dsr3.GetGraphRequest{}) { - return helpMsg(fnName, &dsr3.GetGraphRequest{ + return builtins.HelpMsg(fnName, &dsr3.GetGraphRequest{ ObjectType: "", ObjectId: "", Relation: "", @@ -55,13 +56,13 @@ func RegisterGraph(logger *zerolog.Logger, fnName string, dr resolvers.Directory resp, err := dr.GetDS().GetGraph(bctx.Context, &args) if err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } buf := new(bytes.Buffer) if len(resp.GetResults()) > 0 { - if err := ProtoToBuf(buf, resp); err != nil { + if err := builtins.ProtoToBuf(buf, resp); err != nil { return nil, err } } diff --git a/builtins/ds/identity.go b/builtins/ds/identity.go index 64da2e8c..633c8feb 100644 --- a/builtins/ds/identity.go +++ b/builtins/ds/identity.go @@ -1,6 +1,7 @@ package ds import ( + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/directory" "github.com/aserto-dev/topaz/resolvers" "google.golang.org/grpc/codes" @@ -30,7 +31,7 @@ func RegisterIdentity(logger *zerolog.Logger, fnName string, dr resolvers.Direct } if err := ast.As(op1.Value, &args); err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } @@ -39,14 +40,14 @@ func RegisterIdentity(logger *zerolog.Logger, fnName string, dr resolvers.Direct ID string `json:"id"` } - return help(fnName, argsV3{}) + return builtins.Help(fnName, argsV3{}) } user, err := directory.ResolveIdentity(bctx.Context, dr.GetDS(), args.ID) switch { case status.Code(err) == codes.NotFound: - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) astVal, err := ast.InterfaceToValue(map[string]any{}) if err != nil { diff --git a/builtins/ds/object.go b/builtins/ds/object.go index 1bcf1bb8..5d846035 100644 --- a/builtins/ds/object.go +++ b/builtins/ds/object.go @@ -4,6 +4,7 @@ import ( "bytes" dsr3 "github.com/aserto-dev/go-directory/aserto/directory/reader/v3" + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/resolvers" "google.golang.org/protobuf/encoding/protojson" @@ -53,7 +54,7 @@ func RegisterObject(logger *zerolog.Logger, fnName string, dr resolvers.Director } if proto.Equal(req, &dsr3.GetObjectRequest{}) { - return helpMsg(fnName, &dsr3.GetObjectRequest{ + return builtins.HelpMsg(fnName, &dsr3.GetObjectRequest{ ObjectType: "", ObjectId: "", WithRelations: false, @@ -64,7 +65,7 @@ func RegisterObject(logger *zerolog.Logger, fnName string, dr resolvers.Director switch { case status.Code(err) == codes.NotFound: - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) astVal, err := ast.InterfaceToValue(map[string]any{}) if err != nil { @@ -77,7 +78,7 @@ func RegisterObject(logger *zerolog.Logger, fnName string, dr resolvers.Director } buf := new(bytes.Buffer) - if err := ProtoToBuf(buf, resp); err != nil { + if err := builtins.ProtoToBuf(buf, resp); err != nil { return nil, err } diff --git a/builtins/ds/relation.go b/builtins/ds/relation.go index f8f969ba..ff8c30e0 100644 --- a/builtins/ds/relation.go +++ b/builtins/ds/relation.go @@ -5,6 +5,7 @@ import ( dsc3 "github.com/aserto-dev/go-directory/aserto/directory/common/v3" dsr3 "github.com/aserto-dev/go-directory/aserto/directory/reader/v3" + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/pkg/cli/x" "github.com/aserto-dev/topaz/resolvers" "github.com/samber/lo" @@ -40,12 +41,12 @@ func RegisterRelation(logger *zerolog.Logger, fnName string, dr resolvers.Direct var args dsr3.GetRelationRequest if err := ast.As(op1.Value, &args); err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } if proto.Equal(&args, &dsr3.GetRelationRequest{}) { - return helpMsg(fnName, &dsr3.GetRelationRequest{ + return builtins.HelpMsg(fnName, &dsr3.GetRelationRequest{ ObjectType: "", ObjectId: "", Relation: "", @@ -60,7 +61,7 @@ func RegisterRelation(logger *zerolog.Logger, fnName string, dr resolvers.Direct switch { case status.Code(err) == codes.NotFound: - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) astVal, err := ast.InterfaceToValue(map[string]any{}) if err != nil { @@ -80,7 +81,7 @@ func RegisterRelation(logger *zerolog.Logger, fnName string, dr resolvers.Direct result = resp } - if err := ProtoToBuf(buf, result); err != nil { + if err := builtins.ProtoToBuf(buf, result); err != nil { return nil, err } @@ -115,12 +116,12 @@ func RegisterRelations(logger *zerolog.Logger, fnName string, dr resolvers.Direc var args dsr3.GetRelationsRequest if err := ast.As(op1.Value, &args); err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } if proto.Equal(&args, &dsr3.GetRelationsRequest{}) { - return helpMsg(fnName, &dsr3.GetRelationsRequest{}) + return builtins.HelpMsg(fnName, &dsr3.GetRelationsRequest{}) } args.Page = &dsc3.PaginationRequest{Size: x.MaxPaginationSize, Token: ""} @@ -130,7 +131,7 @@ func RegisterRelations(logger *zerolog.Logger, fnName string, dr resolvers.Direc for { r, err := dr.GetDS().GetRelations(bctx.Context, &args) if err != nil { - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) return nil, err } @@ -151,7 +152,7 @@ func RegisterRelations(logger *zerolog.Logger, fnName string, dr resolvers.Direc result = resp } - if err := ProtoToBuf(buf, result); err != nil { + if err := builtins.ProtoToBuf(buf, result); err != nil { return nil, err } diff --git a/builtins/ds/user.go b/builtins/ds/user.go index 079f3673..eddef9f0 100644 --- a/builtins/ds/user.go +++ b/builtins/ds/user.go @@ -4,6 +4,7 @@ import ( "bytes" dsr3 "github.com/aserto-dev/go-directory/aserto/directory/reader/v3" + "github.com/aserto-dev/topaz/builtins" "github.com/aserto-dev/topaz/resolvers" "github.com/open-policy-agent/opa/v1/ast" @@ -41,7 +42,7 @@ func RegisterUser(logger *zerolog.Logger, fnName string, dr resolvers.DirectoryR ID string `json:"id"` } - return help(fnName, argsV3{}) + return builtins.Help(fnName, argsV3{}) } resp, err := dr.GetDS().GetObject(bctx.Context, &dsr3.GetObjectRequest{ @@ -52,7 +53,7 @@ func RegisterUser(logger *zerolog.Logger, fnName string, dr resolvers.DirectoryR switch { case status.Code(err) == codes.NotFound: - traceError(&bctx, fnName, err) + builtins.TraceError(&bctx, fnName, err) astVal, err := ast.InterfaceToValue(map[string]any{}) if err != nil { @@ -72,7 +73,7 @@ func RegisterUser(logger *zerolog.Logger, fnName string, dr resolvers.DirectoryR result = resp.GetResult() } - if err := ProtoToBuf(buf, result); err != nil { + if err := builtins.ProtoToBuf(buf, result); err != nil { return nil, err } diff --git a/builtins/ds/helper.go b/builtins/helper.go similarity index 90% rename from builtins/ds/helper.go rename to builtins/helper.go index f2e1d149..3783a135 100644 --- a/builtins/ds/helper.go +++ b/builtins/helper.go @@ -1,4 +1,4 @@ -package ds +package builtins import ( "bytes" @@ -12,7 +12,7 @@ import ( "google.golang.org/protobuf/proto" ) -func help(fnName string, args any) (*ast.Term, error) { +func Help(fnName string, args any) (*ast.Term, error) { m := map[string]any{fnName: args} val, err := ast.InterfaceToValue(m) @@ -23,7 +23,7 @@ func help(fnName string, args any) (*ast.Term, error) { return ast.NewTerm(val), nil } -func helpMsg(fnName string, msg proto.Message) (*ast.Term, error) { +func HelpMsg(fnName string, msg proto.Message) (*ast.Term, error) { v, err := ProtoToInterface(msg) if err != nil { return nil, err @@ -74,7 +74,7 @@ func BufToProto(r io.Reader, msg proto.Message) error { }.Unmarshal(buf.Bytes(), msg) } -func traceError(bctx *topdown.BuiltinContext, fnName string, err error) { +func TraceError(bctx *topdown.BuiltinContext, fnName string, err error) { if bctx.TraceEnabled { if len(bctx.QueryTracers) > 0 { bctx.QueryTracers[0].TraceEvent(topdown.Event{ diff --git a/go.sum b/go.sum index 835e6b2f..ef17cb46 100644 --- a/go.sum +++ b/go.sum @@ -605,10 +605,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 h1:8XJ4pajGwOlasW+L13MnEGA8W4115jJySQtVfS2/IBU= google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda h1:+2XxjfsAu6vqFxwGBRcHiMaDCuZiqXGDUDVWVtrFAnE= google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 h1:i8QOKZfYg6AbGVZzUAY3LrNWCKF8O6zFisU9Wl9RER4= google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0= google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -616,8 +614,6 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= -google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= From 1f413c708e8f38887502b176632237181fe99235 Mon Sep 17 00:00:00 2001 From: Gert Drapers <1533850+gertd@users.noreply.github.com> Date: Sun, 9 Nov 2025 10:36:30 +0100 Subject: [PATCH 11/11] refactor tablewriter (#623) * upd olekukonko/tablewriter@v0.0.5 to @v1.1.0 (aligns with OPA (runtime) dependency 1.10+) * upd linter 2.6.0 -> 2.6.1 * upd header ds stats command * rm deadcode from templates list cmd --- .github/workflows/ci.yaml | 2 +- .vscode/settings.json | 1 + go.mod | 9 +++- go.sum | 20 +++++--- makefile | 2 +- pkg/cli/certs/generator.go | 28 ++++++++--- pkg/cli/cmd/authorizer/list.go | 13 +++-- pkg/cli/cmd/certs/list.go | 15 ++++-- pkg/cli/cmd/certs/remove.go | 14 ++++-- pkg/cli/cmd/certs/trust.go | 19 ++++++-- pkg/cli/cmd/configure/list.go | 12 +++-- pkg/cli/cmd/directory/stats.go | 43 ++++++++--------- pkg/cli/cmd/templates/list.go | 17 +++---- pkg/cli/cmd/templates/verify.go | 15 ++++-- pkg/cli/table/table.go | 86 ++++++++++----------------------- 15 files changed, 160 insertions(+), 136 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0591e6fc..3196926e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,7 +21,7 @@ env: PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'main' || '' }} GO_VERSION: "1.25" GO_RELEASER_VERSION: "v2.8.2" - GO_LANGCI_LINT_VERSION: "v2.6.0" + GO_LANGCI_LINT_VERSION: "v2.6.1" GO_TESTSUM_VERSION: "1.13.0" SYFT_VERSION: "v1.13.0" diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b15cb1f..83810f78 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -172,6 +172,7 @@ "stylecheck", "sver", "syft", + "tablewriter", "tcell", "templ", "testdata", diff --git a/go.mod b/go.mod index d21cca4a..bc44a363 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/mennanov/fmutils v0.3.4 github.com/mitchellh/go-wordwrap v1.0.1 github.com/moby/term v0.5.2 - github.com/olekukonko/tablewriter v0.0.5 + github.com/olekukonko/tablewriter v1.1.0 github.com/open-policy-agent/opa v1.9.0 github.com/opencontainers/image-spec v1.1.1 github.com/pkg/errors v0.9.1 @@ -77,6 +77,8 @@ require ( github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/clipperhouse/stringish v0.1.1 // indirect + github.com/clipperhouse/uax29/v2 v2.3.0 // indirect github.com/containerd/containerd/v2 v2.1.4 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect @@ -132,7 +134,7 @@ require ( github.com/magiconair/properties v1.8.10 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/mattn/go-runewidth v0.0.19 // indirect github.com/minio/highwayhash v1.0.3 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect @@ -154,6 +156,9 @@ require ( github.com/nats-io/nuid v1.0.1 // indirect github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect + github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect + github.com/olekukonko/errors v1.1.0 // indirect + github.com/olekukonko/ll v0.1.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/panmari/cuckoofilter v1.0.6 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect diff --git a/go.sum b/go.sum index ef17cb46..f1b5d167 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,10 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo= github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs= +github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA= +github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4= +github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/containerd/containerd/v2 v2.1.4 h1:/hXWjiSFd6ftrBOBGfAZ6T30LJcx1dBjdKEeI8xucKQ= github.com/containerd/containerd/v2 v2.1.4/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM= @@ -288,9 +292,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= -github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw= +github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mennanov/fmutils v0.3.4 h1:6JNnCVFcZ2Cl7FJB9VU7bfS36VdWlNlAPWuOTOHZ0fk= github.com/mennanov/fmutils v0.3.4/go.mod h1:XlZAw1XIDjV0Kt0LYpv8leyGVoHVg3i7ma5EngZdQ7I= github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM= @@ -345,8 +348,14 @@ github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//J github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc= +github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0= +github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM= +github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y= +github.com/olekukonko/ll v0.1.2 h1:lkg/k/9mlsy0SxO5aC+WEpbdT5K83ddnNhAepz7TQc0= +github.com/olekukonko/ll v0.1.2/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew= +github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY= +github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo= github.com/open-policy-agent/opa v1.9.0 h1:QWFNwbcc29IRy0xwD3hRrMc/RtSersLY1Z6TaID3vgI= github.com/open-policy-agent/opa v1.9.0/go.mod h1:72+lKmTda0O48m1VKAxxYl7MjP/EWFZu9fxHQK2xihs= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -383,7 +392,6 @@ github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8A github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/tview v0.42.0 h1:b/ftp+RxtDsHSaynXTbJb+/n/BxDEi+W3UfF5jILK6c= github.com/rivo/tview v0.42.0/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY= -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= diff --git a/makefile b/makefile index 41acbf5f..a268f3de 100644 --- a/makefile +++ b/makefile @@ -19,7 +19,7 @@ GO_VER := 1.25 VAULT_VER := 1.8.12 SVU_VER := 3.3.0 GOTESTSUM_VER := 1.13.0 -GOLANGCI-LINT_VER := 2.6.0 +GOLANGCI-LINT_VER := 2.6.1 GORELEASER_VER := 2.8.2 WIRE_VER := 0.7.0 SYFT_VER := 1.13.0 diff --git a/pkg/cli/certs/generator.go b/pkg/cli/certs/generator.go index b42f593a..af72c461 100644 --- a/pkg/cli/certs/generator.go +++ b/pkg/cli/certs/generator.go @@ -39,12 +39,18 @@ func GenerateCerts(c *cc.CommonCtx, force bool, dnsNames []string, certPaths ... } if len(existingFiles) != 0 { - tab := table.New(c.StdErr()).WithColumns("File", "Action") + tab := table.New(c.StdErr()) + defer tab.Close() + + tab.Header("File", "Action") + + data := [][]any{} for _, fqn := range existingFiles { - tab.WithRow(filepath.Base(fqn), "skipped, file already exists") + data = append(data, []any{filepath.Base(fqn), "skipped, file already exists"}) } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } @@ -57,7 +63,12 @@ func generate(c *cc.CommonCtx, dnsNames []string, certPaths ...*CertPaths) error logger := zerolog.Nop() generator := certs.NewGenerator(&logger) - tab := table.New(c.StdErr()).WithColumns("File", "Action") + tab := table.New(c.StdErr()) + defer tab.Close() + + tab.Header("File", "Action") + + data := [][]any{} for _, certPaths := range certPaths { if err := generator.MakeDevCert(&certs.CertGenConfig{ @@ -70,12 +81,13 @@ func generate(c *cc.CommonCtx, dnsNames []string, certPaths ...*CertPaths) error return errors.Wrap(err, "failed to create dev certs") } - tab.WithRow(filepath.Base(certPaths.CA), "generated") - tab.WithRow(filepath.Base(certPaths.Cert), "generated") - tab.WithRow(filepath.Base(certPaths.Key), "generated") + data = append(data, []any{filepath.Base(certPaths.CA), "generated"}) + data = append(data, []any{filepath.Base(certPaths.Cert), "generated"}) + data = append(data, []any{filepath.Base(certPaths.Key), "generated"}) } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } diff --git a/pkg/cli/cmd/authorizer/list.go b/pkg/cli/cmd/authorizer/list.go index 561ebfd3..5749fadd 100644 --- a/pkg/cli/cmd/authorizer/list.go +++ b/pkg/cli/cmd/authorizer/list.go @@ -40,12 +40,19 @@ func (cmd *ListPoliciesCmd) Run(c *cc.CommonCtx) error { return jsonx.OutputJSONPB(c.StdOut(), &cmd.resp) } - tab := table.New(c.StdOut()).WithColumns("package path", "id") + tab := table.New(c.StdOut()) + defer tab.Close() + + tab.Header("package path", "id") + + data := [][]any{} + for _, module := range cmd.resp.GetResult() { - tab.WithRow(strings.TrimPrefix(module.GetPackagePath(), "data."), module.GetId()) + data = append(data, []any{strings.TrimPrefix(module.GetPackagePath(), "data."), module.GetId()}) } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } diff --git a/pkg/cli/cmd/certs/list.go b/pkg/cli/cmd/certs/list.go index 8e41ac18..0c320e07 100644 --- a/pkg/cli/cmd/certs/list.go +++ b/pkg/cli/cmd/certs/list.go @@ -50,7 +50,10 @@ func (cmd *ListCertsCmd) Run(c *cc.CommonCtx) error { certDetails[fn] = cert } - tab := table.New(c.StdOut()).WithColumns("File", "Not Before", "Not After", "Valid", "CN", "DNS names") + tab := table.New(c.StdOut()) + defer tab.Close() + + tab.Header("File", "Not Before", "Not After", "Valid", "CN", "DNS names") fileNames := make([]string, 0, len(certDetails)) for k := range certDetails { @@ -59,7 +62,7 @@ func (cmd *ListCertsCmd) Run(c *cc.CommonCtx) error { sort.Strings(fileNames) - tab.WithTableNoAutoWrapText() + data := [][]any{} for _, k := range fileNames { isValid := true @@ -67,16 +70,18 @@ func (cmd *ListCertsCmd) Run(c *cc.CommonCtx) error { isValid = false } - tab.WithRow(k, + data = append(data, []any{ + k, certDetails[k].NotBefore.Format(time.RFC3339), certDetails[k].NotAfter.Format(time.RFC3339), strconv.FormatBool(isValid), certDetails[k].Issuer.CommonName, strings.Join(certDetails[k].DNSNames, ","), - ) + }) } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } diff --git a/pkg/cli/cmd/certs/remove.go b/pkg/cli/cmd/certs/remove.go index 59b0edec..28b1709f 100644 --- a/pkg/cli/cmd/certs/remove.go +++ b/pkg/cli/cmd/certs/remove.go @@ -24,7 +24,12 @@ func (cmd *RemoveCertFileCmd) Run(c *cc.CommonCtx) error { c.Con().Info().Msg("certs directory: %s", certsDir) - tab := table.New(c.StdOut()).WithColumns("File", "Action") + tab := table.New(c.StdOut()) + defer tab.Close() + + tab.Header("File", "Action") + + data := [][]any{} // remove cert from trust store, before delete cert file for _, fqn := range getFileList(certsDir, withCACerts()) { @@ -35,7 +40,7 @@ func (cmd *RemoveCertFileCmd) Run(c *cc.CommonCtx) error { fn := filepath.Base(fqn) cn := fmt.Sprintf("%s-%s", certCommonName, strings.TrimSuffix(fn, filepath.Ext(fn))) - tab.WithRow(fn, "removed from trust store") + data = append(data, []any{fn, "removed from trust store"}) if err := certs.RemoveTrustedCert(fqn, cn); err != nil { return err @@ -51,10 +56,11 @@ func (cmd *RemoveCertFileCmd) Run(c *cc.CommonCtx) error { return err } - tab.WithRow(filepath.Base(fqn), "deleted") + data = append(data, []any{filepath.Base(fqn), "deleted"}) } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } diff --git a/pkg/cli/cmd/certs/trust.go b/pkg/cli/cmd/certs/trust.go index dd195f15..5b414b01 100644 --- a/pkg/cli/cmd/certs/trust.go +++ b/pkg/cli/cmd/certs/trust.go @@ -39,13 +39,22 @@ func (cmd *TrustCertsCmd) Run(c *cc.CommonCtx) error { return nil } - tab := table.New(c.StdOut()).WithColumns("File", "Action") + data := [][]any{} - defer tab.Do() + tab := table.New(c.StdOut()) + + defer func() { + tab.Bulk(data) + tab.Render() + tab.Close() + }() + + tab.Header("File", "Action") list := getFileList(certsDir, withCACerts()) if len(list) == 0 { - tab.WithRow("no files found", "no actions performed") + data = append(data, []any{"no files found", "no actions performed"}) + return nil } @@ -62,7 +71,7 @@ func (cmd *TrustCertsCmd) Run(c *cc.CommonCtx) error { return err } - tab.WithRow(fn, "removed from trust store") + data = append(data, []any{fn, "removed from trust store"}) continue } @@ -72,7 +81,7 @@ func (cmd *TrustCertsCmd) Run(c *cc.CommonCtx) error { return err } - tab.WithRow(filepath.Base(fqn), "added to trust store") + data = append(data, []any{filepath.Base(fqn), "added to trust store"}) continue } diff --git a/pkg/cli/cmd/configure/list.go b/pkg/cli/cmd/configure/list.go index 731debc6..c0a37dd4 100644 --- a/pkg/cli/cmd/configure/list.go +++ b/pkg/cli/cmd/configure/list.go @@ -14,7 +14,10 @@ type ListConfigCmd struct { } func (cmd ListConfigCmd) Run(c *cc.CommonCtx) error { - tab := table.New(c.StdOut()).WithColumns("", "Name", "Config File") + tab := table.New(c.StdOut()) + defer tab.Close() + + tab.Header("", "Name", "Config File") files, err := os.ReadDir(cmd.ConfigDir) if err != nil { @@ -25,6 +28,8 @@ func (cmd ListConfigCmd) Run(c *cc.CommonCtx) error { return err } + data := [][]any{} + for i := range files { name := strings.Split(files[i].Name(), ".")[0] active := "" @@ -33,10 +38,11 @@ func (cmd ListConfigCmd) Run(c *cc.CommonCtx) error { active = "*" } - tab.WithRow(active, name, files[i].Name()) + data = append(data, []any{active, name, files[i].Name()}) } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } diff --git a/pkg/cli/cmd/directory/stats.go b/pkg/cli/cmd/directory/stats.go index 9ce1b2eb..5ce2014a 100644 --- a/pkg/cli/cmd/directory/stats.go +++ b/pkg/cli/cmd/directory/stats.go @@ -5,7 +5,6 @@ import ( "fmt" "io" - "github.com/aserto-dev/azm/model" "github.com/aserto-dev/azm/stats" dse3 "github.com/aserto-dev/go-directory/aserto/directory/exporter/v3" "github.com/aserto-dev/topaz/pkg/cli/cc" @@ -79,39 +78,37 @@ func (cmd *StatsCmd) Run(c *cc.CommonCtx) error { } func statsTable(w io.Writer, s *stats.Stats) { - tab := table.New(w).WithColumns("obj-type", "obj-type-count", "rel", "rel-count", "sub-type", "sub-type-count", "sub-rel", "sub-rel-count") - tab.WithTableNoAutoWrapText() + tab := table.New(w) + defer tab.Close() + + tab.Header("ObjType", "Count", "Rel", "Count", "SubType", "Count", "SubRel", "Count") + + data := [][]any{} for ot, objType := range s.ObjectTypes { for or, objRel := range objType.Relations { for st, subType := range objRel.SubjectTypes { - tabRow(tab, ot, objType.ObjCount, or, objRel.Count, st, subType.Count, "", 0) + data = append(data, []any{ + ot.String(), countStr(objType.ObjCount), + or.String(), countStr(objRel.Count), + st.String(), countStr(subType.Count), + "", countStr(0), + }) for sr, subRel := range subType.SubjectRelations { - tabRow(tab, ot, objType.ObjCount, or, objRel.Count, st, subType.Count, sr, subRel.Count) + data = append(data, []any{ + ot.String(), countStr(objType.ObjCount), + or.String(), countStr(objRel.Count), + st.String(), countStr(subType.Count), + sr.String(), countStr(subRel.Count), + }) } } } } - tab.Do() + tab.Bulk(data) + tab.Render() } func countStr(c int32) string { return fmt.Sprintf("%8d", c) } - -func tabRow( - tab *table.TableWriter, - objType model.ObjectName, objTypeCount int32, objRel model.RelationName, objRelCount int32, - subType model.ObjectName, subTypeCount int32, subRel model.RelationName, subRelCount int32, -) { - tab.WithRow( - objType.String(), - countStr(objTypeCount), - objRel.String(), - countStr(objRelCount), - subType.String(), - countStr(subTypeCount), - subRel.String(), - countStr(subRelCount), - ) -} diff --git a/pkg/cli/cmd/templates/list.go b/pkg/cli/cmd/templates/list.go index a1f10cff..178054eb 100644 --- a/pkg/cli/cmd/templates/list.go +++ b/pkg/cli/cmd/templates/list.go @@ -15,19 +15,16 @@ func (cmd *ListTemplatesCmd) Run(c *cc.CommonCtx) error { return err } - maxWidth := 0 - for n := range ctlg { - maxWidth = max(maxWidth, len(n)+1) - } - - tab := table.New(c.StdOut()).WithColumns(colName, colDescription, colDocumentation) - tab.WithTableNoAutoWrapText() - + data := [][]any{} for n, t := range ctlg { - tab.WithRow(n, t.ShortDescription, t.DocumentationURL) + data = append(data, []any{n, t.ShortDescription, t.DocumentationURL}) } - tab.Do() + t := table.New(c.StdOut()) + + t.Header(colName, colDescription, colDocumentation) + t.Bulk(data) + t.Render() return nil } diff --git a/pkg/cli/cmd/templates/verify.go b/pkg/cli/cmd/templates/verify.go index 4b0ce238..5c4d7605 100644 --- a/pkg/cli/cmd/templates/verify.go +++ b/pkg/cli/cmd/templates/verify.go @@ -25,8 +25,12 @@ func (cmd *VerifyTemplateCmd) Run(c *cc.CommonCtx) error { // limit the amount of noise from the azm parser. zerolog.SetGlobalLevel(zerolog.Disabled) - tab := table.New(c.StdOut()).WithColumns("template", "asset", "exists", "parsed", "error") - tab.WithTableNoAutoWrapText() + tab := table.New(c.StdOut()) + defer tab.Close() + + tab.Header("template", "asset", "exists", "parsed", "error") + + data := [][]any{} for tmplName := range catalog { if cmd.Name != "" && tmplName != cmd.Name { @@ -46,7 +50,7 @@ func (cmd *VerifyTemplateCmd) Run(c *cc.CommonCtx) error { errStr = v.err.Error() } - tab.WithRow(tmplName, absURL, strconv.FormatBool(v.exists), strconv.FormatBool(v.parsed), errStr) + data = append(data, []any{tmplName, absURL, strconv.FormatBool(v.exists), strconv.FormatBool(v.parsed), errStr}) } { assets := []string{} @@ -63,12 +67,13 @@ func (cmd *VerifyTemplateCmd) Run(c *cc.CommonCtx) error { errStr = v.err.Error() } - tab.WithRow(tmplName, absURL, strconv.FormatBool(v.exists), strconv.FormatBool(v.parsed), errStr) + data = append(data, []any{tmplName, absURL, strconv.FormatBool(v.exists), strconv.FormatBool(v.parsed), errStr}) } } } - tab.Do() + tab.Bulk(data) + tab.Render() return nil } diff --git a/pkg/cli/table/table.go b/pkg/cli/table/table.go index e9307b4b..d6eaff91 100644 --- a/pkg/cli/table/table.go +++ b/pkg/cli/table/table.go @@ -3,68 +3,34 @@ package table import ( "io" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/renderer" + "github.com/olekukonko/tablewriter/tw" ) -type TableWriter struct { - w io.Writer - table *table -} - -type table struct { - columns [][]string - data [][][]string - noAutoWrap bool -} - -func New(w io.Writer) *TableWriter { - return &TableWriter{ - w: w, - table: &table{}, - } -} - -// WithColumns prints a new table. -func (u *TableWriter) WithColumns(columns ...string) *TableWriter { - u.table.columns = append(u.table.columns, columns) - u.table.data = append(u.table.data, [][]string{}) - - return u -} - -// WithRow adds a row in the latest table. -func (u *TableWriter) WithRow(values ...string) *TableWriter { - if len(u.table.columns) < 1 { - return u.WithColumns(make([]string, len(values))...).WithRow(values...) +func New(w io.Writer) *tablewriter.Table { + opts := []tablewriter.Option{ + tablewriter.WithRendition(tw.Rendition{ + Borders: tw.Border{ + Top: tw.BorderNone.Top, + Bottom: tw.BorderNone.Bottom, + Left: tw.BorderNone.Left, + Right: tw.BorderNone.Right, + }, + }), + tablewriter.WithAlignment(tw.Alignment{tw.AlignLeft}), + tablewriter.WithPadding(tw.PaddingDefault), + tablewriter.WithHeaderAlignment(tw.AlignLeft), + tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{ + Borders: tw.BorderNone, + Symbols: tw.NewSymbols(tw.StyleASCII), + Settings: tw.Settings{ + Separators: tw.SeparatorsNone, + Lines: tw.LinesNone, + }, + Streaming: false, + })), } - u.table.data[len(u.table.data)-1] = append(u.table.data[len(u.table.data)-1], values) - - return u -} - -func (u *TableWriter) WithTableNoAutoWrapText() *TableWriter { - u.table.noAutoWrap = true - return u -} - -func (u *TableWriter) Do() { - for idx, headers := range u.table.columns { - table := tw.NewWriter(u.w) - table.SetHeader(headers) - table.SetBorders(tw.Border{Left: false, Top: false, Right: false, Bottom: false}) - table.SetBorder(false) - table.SetAlignment(tw.ALIGN_LEFT) - table.SetCenterSeparator("") - table.SetHeaderLine(false) - table.SetHeaderAlignment(tw.ALIGN_LEFT) - table.SetColumnSeparator("") - table.SetAutoWrapText(!u.table.noAutoWrap) - - if idx < len(u.table.data) { - table.AppendBulk(u.table.data[idx]) - } - - table.Render() - } + return tablewriter.NewTable(w, opts...) }