Skip to content

Commit

Permalink
go-aserto updates (#441)
Browse files Browse the repository at this point in the history
* update go-aserto
* upd makefile
* fix config info --raw
* fix topaz-db ctx
  • Loading branch information
gertd authored Aug 12, 2024
1 parent 7174a86 commit 0f97b39
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 145 deletions.
2 changes: 1 addition & 1 deletion cmd/topaz-db/cmd/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (cmd *SyncCmd) Run(ctx context.Context) error {
}

// create client conn
conn, err := dsc.NewConn(ctx, &cmd.Config)
conn, err := dsc.NewConn(&cmd.Config)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion cmd/topaz-db/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ func main() {
},
)

if err := kongCtx.Run(ctx); err != nil {
kongCtx.BindTo(ctx, (*context.Context)(nil))

if err := kongCtx.Run(); err != nil {
kongCtx.FatalIfErrorf(err)
}
}
59 changes: 22 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/aserto-dev/topaz

go 1.22.0

toolchain go1.22.5

// replace github.com/aserto-dev/azm => ../azm
// replace github.com/aserto-dev/go-directory => ../go-directory
// replace github.com/aserto-dev/go-edge-ds => ../go-edge-ds
Expand All @@ -17,24 +15,24 @@ require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/adrg/xdg v0.4.0
github.com/alecthomas/kong v0.9.0
github.com/aserto-dev/aserto-grpc v0.2.3
github.com/aserto-dev/aserto-management v0.9.4
github.com/aserto-dev/azm v0.1.12
github.com/aserto-dev/certs v0.0.6
github.com/aserto-dev/errors v0.0.10
github.com/aserto-dev/go-aserto v0.31.5
github.com/aserto-dev/go-authorizer v0.20.8
github.com/aserto-dev/go-directory v0.31.9
github.com/aserto-dev/go-edge-ds v0.32.4
github.com/aserto-dev/go-grpc v0.8.67
github.com/aserto-dev/aserto-grpc v0.2.5
github.com/aserto-dev/aserto-management v0.9.6
github.com/aserto-dev/azm v0.1.13
github.com/aserto-dev/certs v0.0.7
github.com/aserto-dev/errors v0.0.11
github.com/aserto-dev/go-aserto v0.32.0
github.com/aserto-dev/go-authorizer v0.20.10
github.com/aserto-dev/go-directory v0.31.11
github.com/aserto-dev/go-edge-ds v0.32.5
github.com/aserto-dev/go-grpc v0.8.68
github.com/aserto-dev/go-topaz-ui v0.1.11
github.com/aserto-dev/header v0.0.7
github.com/aserto-dev/logger v0.0.4
github.com/aserto-dev/header v0.0.8
github.com/aserto-dev/logger v0.0.5
github.com/aserto-dev/openapi-authorizer v0.20.4
github.com/aserto-dev/openapi-directory v0.31.2
github.com/aserto-dev/runtime v0.67.1
github.com/aserto-dev/self-decision-logger v0.0.5
github.com/aserto-dev/service-host v0.0.15
github.com/aserto-dev/self-decision-logger v0.0.7
github.com/aserto-dev/service-host v0.0.16
github.com/cli/browser v1.3.0
github.com/docker/docker v27.1.1+incompatible
github.com/docker/go-connections v0.5.0
Expand All @@ -57,15 +55,15 @@ require (
github.com/open-policy-agent/opa v0.67.1
github.com/opencontainers/image-spec v1.1.0
github.com/pkg/errors v0.9.1
github.com/rivo/tview v0.0.0-20240805111717-08da3ea4576f
github.com/rivo/tview v0.0.0-20240807205129-e4c497cc59ed
github.com/rs/zerolog v1.33.0
github.com/samber/lo v1.46.0
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
go.opencensus.io v0.24.0
golang.org/x/sync v0.8.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.24.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gopkg.in/natefinch/lumberjack.v2 v2.2.1
Expand All @@ -86,8 +84,6 @@ require (
github.com/bufbuild/protocompile v0.13.0 // indirect
github.com/bufbuild/protovalidate-go v0.6.3 // indirect
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
github.com/containerd/containerd v1.7.20 // indirect
Expand All @@ -97,8 +93,6 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand All @@ -117,12 +111,9 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/cel-go v0.20.1 // indirect
github.com/google/flatbuffers v2.0.8+incompatible // indirect
github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
github.com/google/subcommands v1.2.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
Expand Down Expand Up @@ -162,7 +153,6 @@ require (
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.2 // indirect
github.com/peterh/liner v1.2.2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
Expand All @@ -175,7 +165,6 @@ require (
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/slok/go-http-metrics v0.12.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
Expand All @@ -191,24 +180,20 @@ require (
go.etcd.io/bbolt v1.3.10 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 0f97b39

Please sign in to comment.