diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml-disabled similarity index 100% rename from .github/workflows/docker.yml rename to .github/workflows/docker.yml-disabled diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 85baa057d..b6a38fdca 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -51,21 +51,22 @@ jobs: args: release --rm-dist --snapshot --skip-publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - golangci-lint: - runs-on: ubuntu-latest - strategy: - matrix: - golangci_lint: [v1.47] - steps: - - uses: actions/checkout@v3.0.2 - - name: golangci-lint - uses: golangci/golangci-lint-action@v3.4.0 - with: - version: ${{ matrix.golangci_lint }} - #github-token: ${{ secrets.GITHUB_TOKEN }} - args: --timeout=2m - only-new-issues: false - working-directory: . + # disabled for now, requires updating all the deps and config. + #golangci-lint: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # golangci_lint: [v1.47] + # steps: + # - uses: actions/checkout@v3.0.2 + # - name: golangci-lint + # uses: golangci/golangci-lint-action@v3.4.0 + # with: + # version: ${{ matrix.golangci_lint }} + # #github-token: ${{ secrets.GITHUB_TOKEN }} + # args: --timeout=2m + # only-new-issues: false + # working-directory: . tests-on-windows: needs: golangci-lint # run after golangci-lint action to not produce duplicated errors runs-on: windows-latest diff --git a/Makefile b/Makefile index 2ed43823d..74cef18de 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ update_examples: ## -PROTOS_SRC := $(wildcard ./api/*.proto) $(wildcard ./api/internal/*.proto) +PROTOS_SRC := $(wildcard ./api/*.proto) $(wildcard ./api/pkg/*.proto) GEN_DEPS := $(PROTOS_SRC) Makefile go.sum .PHONY: generate generate: gen.sum @@ -66,9 +66,9 @@ generate_local: ); done @# CUSTOM CHANGE @# due to go module versionning (currently) incompatible with automatic protobuf generated imports - sed -i s@moul.io/depviz/@moul.io/depviz/v3/@g internal/dvserver/dvserver.pb.go + sed -i s@moul.io/depviz/@moul.io/depviz/v3/@g pkg/dvserver/dvserver.pb.go @# END OF CUSTOM CHANGE - go run golang.org/x/tools/cmd/goimports -w ./pkg ./cmd ./internal + go run golang.org/x/tools/cmd/goimports -w ./pkg ./cmd ./pkg shasum $(GEN_DEPS) | sort > gen.sum.tmp mv gen.sum.tmp gen.sum @@ -80,4 +80,4 @@ clean: .PHONY: packr packr: - cd internal/dvserver && go run github.com/gobuffalo/packr/v2/packr2 build && ls -la *-packr.go packrd/packed-packr.go + cd pkg/dvserver && go run github.com/gobuffalo/packr/v2/packr2 build && ls -la *-packr.go packrd/packed-packr.go diff --git a/api/dvmodel.proto b/api/dvmodel.proto index 186a5d17f..1806a4bc6 100644 --- a/api/dvmodel.proto +++ b/api/dvmodel.proto @@ -5,7 +5,7 @@ package depviz.model; import "google/protobuf/timestamp.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -option go_package = "moul.io/depviz/internal/dvmodel"; +option go_package = "moul.io/depviz/pkg/dvmodel"; option (gogoproto.goproto_getters_all) = false; option (gogoproto.marshaler_all) = true; diff --git a/api/dvserver.proto b/api/dvserver.proto index 527cd6d67..2189e3c0b 100644 --- a/api/dvserver.proto +++ b/api/dvserver.proto @@ -8,7 +8,7 @@ import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "dvmodel.proto"; -option go_package = "moul.io/depviz/internal/dvserver"; +option go_package = "moul.io/depviz/pkg/dvserver"; option (gogoproto.sizer_all) = true; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/cmd/depviz/depaware.txt b/cmd/depviz/depaware.txt index 83f075d05..fc30e63b3 100644 --- a/cmd/depviz/depaware.txt +++ b/cmd/depviz/depaware.txt @@ -3,10 +3,10 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de github.com/ajg/form from github.com/go-chi/render github.com/awalterschulze/gographviz from moul.io/graphman/viz github.com/awalterschulze/gographviz/ast from github.com/awalterschulze/gographviz+ - github.com/awalterschulze/gographviz/internal/errors from github.com/awalterschulze/gographviz/internal/parser - github.com/awalterschulze/gographviz/internal/lexer from github.com/awalterschulze/gographviz/internal/parser - github.com/awalterschulze/gographviz/internal/parser from github.com/awalterschulze/gographviz - github.com/awalterschulze/gographviz/internal/token from github.com/awalterschulze/gographviz/ast+ + github.com/awalterschulze/gographviz/pkg/errors from github.com/awalterschulze/gographviz/pkg/parser + github.com/awalterschulze/gographviz/pkg/lexer from github.com/awalterschulze/gographviz/pkg/parser + github.com/awalterschulze/gographviz/pkg/parser from github.com/awalterschulze/gographviz + github.com/awalterschulze/gographviz/pkg/token from github.com/awalterschulze/gographviz/ast+ github.com/beorn7/perks/quantile from github.com/prometheus/client_golang/prometheus 💣 github.com/boltdb/bolt from github.com/hidal-go/hidalgo/kv/bolt github.com/cayleygraph/cayley from moul.io/depviz/v3/cmd/depviz+ @@ -20,15 +20,15 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de github.com/cayleygraph/cayley/graph/path from github.com/cayleygraph/cayley+ github.com/cayleygraph/cayley/graph/proto from github.com/cayleygraph/cayley/graph/kv github.com/cayleygraph/cayley/graph/shape from github.com/cayleygraph/cayley/graph/kv+ - github.com/cayleygraph/cayley/internal/lru from github.com/cayleygraph/cayley/graph/kv + github.com/cayleygraph/cayley/pkg/lru from github.com/cayleygraph/cayley/graph/kv github.com/cayleygraph/cayley/schema from moul.io/depviz/v3/cmd/depviz+ github.com/cayleygraph/cayley/writer from github.com/cayleygraph/cayley github.com/cayleygraph/quad from github.com/cayleygraph/cayley+ - github.com/cayleygraph/quad/gml from moul.io/depviz/v3/internal/dvstore - github.com/cayleygraph/quad/graphml from moul.io/depviz/v3/internal/dvstore - github.com/cayleygraph/quad/json from moul.io/depviz/v3/internal/dvstore - github.com/cayleygraph/quad/jsonld from moul.io/depviz/v3/internal/dvstore - github.com/cayleygraph/quad/nquads from moul.io/depviz/v3/internal/dvstore + github.com/cayleygraph/quad/gml from moul.io/depviz/v3/pkg/dvstore + github.com/cayleygraph/quad/graphml from moul.io/depviz/v3/pkg/dvstore + github.com/cayleygraph/quad/json from moul.io/depviz/v3/pkg/dvstore + github.com/cayleygraph/quad/jsonld from moul.io/depviz/v3/pkg/dvstore + github.com/cayleygraph/quad/nquads from moul.io/depviz/v3/pkg/dvstore github.com/cayleygraph/quad/pquads from github.com/cayleygraph/cayley/graph/kv+ github.com/cayleygraph/quad/pquads/pio from github.com/cayleygraph/quad/pquads github.com/cayleygraph/quad/voc from github.com/cayleygraph/cayley/schema+ @@ -44,14 +44,14 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de github.com/go-chi/render from moul.io/depviz/v3/pkg/chiutil github.com/gobuffalo/logger from github.com/gobuffalo/packr/v2/plog github.com/gobuffalo/packd from github.com/gobuffalo/packr/v2+ - github.com/gobuffalo/packd/internal/takeon/github.com/markbates/errx from github.com/gobuffalo/packd - github.com/gobuffalo/packr/v2 from moul.io/depviz/v3/internal/dvserver + github.com/gobuffalo/packd/pkg/takeon/github.com/markbates/errx from github.com/gobuffalo/packd + github.com/gobuffalo/packr/v2 from moul.io/depviz/v3/pkg/dvserver github.com/gobuffalo/packr/v2/file from github.com/gobuffalo/packr/v2+ github.com/gobuffalo/packr/v2/file/resolver from github.com/gobuffalo/packr/v2+ github.com/gobuffalo/packr/v2/file/resolver/encoding/hex from github.com/gobuffalo/packr/v2/file/resolver github.com/gobuffalo/packr/v2/jam/parser from github.com/gobuffalo/packr/v2 github.com/gobuffalo/packr/v2/plog from github.com/gobuffalo/packr/v2+ - github.com/gogo/gateway from moul.io/depviz/v3/internal/dvserver + github.com/gogo/gateway from moul.io/depviz/v3/pkg/dvserver github.com/gogo/protobuf/gogoproto from github.com/cayleygraph/cayley/graph/proto+ github.com/gogo/protobuf/jsonpb from github.com/gogo/gateway 💣 github.com/gogo/protobuf/proto from github.com/cayleygraph/cayley/graph/proto+ @@ -67,14 +67,14 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de github.com/golang/protobuf/ptypes/duration from github.com/golang/protobuf/ptypes+ github.com/golang/protobuf/ptypes/timestamp from github.com/golang/protobuf/ptypes+ github.com/golang/protobuf/ptypes/wrappers from github.com/grpc-ecosystem/grpc-gateway/runtime - github.com/google/go-github/v30/github from moul.io/depviz/v3/internal/githubprovider + github.com/google/go-github/v30/github from moul.io/depviz/v3/pkg/githubprovider github.com/google/go-querystring/query from github.com/google/go-github/v30/github github.com/grpc-ecosystem/go-grpc-middleware from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap+ github.com/grpc-ecosystem/go-grpc-middleware/logging from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap github.com/grpc-ecosystem/go-grpc-middleware/logging/settable from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap - github.com/grpc-ecosystem/go-grpc-middleware/logging/zap from moul.io/depviz/v3/internal/dvserver + github.com/grpc-ecosystem/go-grpc-middleware/logging/zap from moul.io/depviz/v3/pkg/dvserver github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap - github.com/grpc-ecosystem/go-grpc-middleware/recovery from moul.io/depviz/v3/internal/dvserver + github.com/grpc-ecosystem/go-grpc-middleware/recovery from moul.io/depviz/v3/pkg/dvserver github.com/grpc-ecosystem/go-grpc-middleware/tags from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap github.com/grpc-ecosystem/grpc-gateway/internal from github.com/grpc-ecosystem/grpc-gateway/runtime github.com/grpc-ecosystem/grpc-gateway/runtime from github.com/gogo/gateway+ @@ -88,7 +88,7 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de github.com/markbates/safe from github.com/gobuffalo/packr/v2 github.com/matttproud/golang_protobuf_extensions/pbutil from github.com/prometheus/common/expfmt github.com/oklog/run from moul.io/depviz/v3/cmd/depviz+ - github.com/patrickmn/go-cache from moul.io/depviz/v3/internal/dvserver + github.com/patrickmn/go-cache from moul.io/depviz/v3/pkg/dvserver github.com/peterbourgon/ff/v3 from github.com/peterbourgon/ff/v3/ffcli github.com/peterbourgon/ff/v3/ffcli from moul.io/depviz/v3/cmd/depviz github.com/piprate/json-gold/ld from github.com/cayleygraph/quad/jsonld @@ -100,38 +100,38 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de github.com/prometheus/client_golang/prometheus/promauto from github.com/cayleygraph/cayley/graph/kv github.com/prometheus/client_model/go from github.com/prometheus/client_golang/prometheus+ github.com/prometheus/common/expfmt from github.com/prometheus/client_golang/prometheus - github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg from github.com/prometheus/common/expfmt + github.com/prometheus/common/pkg/bitbucket.org/ww/goautoneg from github.com/prometheus/common/expfmt github.com/prometheus/common/model from github.com/prometheus/client_golang/prometheus+ LD github.com/prometheus/procfs from github.com/prometheus/client_golang/prometheus - LD github.com/prometheus/procfs/internal/fs from github.com/prometheus/procfs - LD github.com/prometheus/procfs/internal/util from github.com/prometheus/procfs - github.com/rs/cors from moul.io/depviz/v3/internal/dvserver + LD github.com/prometheus/procfs/pkg/fs from github.com/prometheus/procfs + LD github.com/prometheus/procfs/pkg/util from github.com/prometheus/procfs + github.com/rs/cors from moul.io/depviz/v3/pkg/dvserver github.com/sirupsen/logrus from github.com/gobuffalo/logger+ github.com/stretchr/testify/assert from github.com/stretchr/testify/require+ - github.com/stretchr/testify/require from moul.io/depviz/v3/internal/dvstore - github.com/treastech/logger from moul.io/depviz/v3/internal/dvserver + github.com/stretchr/testify/require from moul.io/depviz/v3/pkg/dvstore + github.com/treastech/logger from moul.io/depviz/v3/pkg/dvserver 💣 github.com/tylertreat/BoomFilters from github.com/cayleygraph/cayley/graph/kv - github.com/xhit/go-str2duration/v2 from moul.io/depviz/v3/internal/githubprovider + github.com/xhit/go-str2duration/v2 from moul.io/depviz/v3/pkg/githubprovider go.uber.org/atomic from go.uber.org/multierr+ go.uber.org/multierr from go.uber.org/zap+ go.uber.org/zap from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap+ - go.uber.org/zap/buffer from go.uber.org/zap/internal/bufferpool+ - go.uber.org/zap/internal/bufferpool from go.uber.org/zap+ - go.uber.org/zap/internal/color from go.uber.org/zap/zapcore - go.uber.org/zap/internal/exit from go.uber.org/zap/zapcore + go.uber.org/zap/buffer from go.uber.org/zap/pkg/bufferpool+ + go.uber.org/zap/pkg/bufferpool from go.uber.org/zap+ + go.uber.org/zap/pkg/color from go.uber.org/zap/zapcore + go.uber.org/zap/pkg/exit from go.uber.org/zap/zapcore go.uber.org/zap/zapcore from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap+ - google.golang.org/genproto/googleapis/api/annotations from moul.io/depviz/v3/internal/dvserver + google.golang.org/genproto/googleapis/api/annotations from moul.io/depviz/v3/pkg/dvserver google.golang.org/genproto/googleapis/api/httpbody from github.com/grpc-ecosystem/grpc-gateway/runtime - google.golang.org/genproto/googleapis/rpc/status from google.golang.org/grpc/internal/status+ + google.golang.org/genproto/googleapis/rpc/status from google.golang.org/grpc/pkg/status+ google.golang.org/genproto/protobuf/field_mask from github.com/grpc-ecosystem/grpc-gateway/runtime google.golang.org/grpc from github.com/grpc-ecosystem/go-grpc-middleware+ google.golang.org/grpc/attributes from google.golang.org/grpc/credentials+ google.golang.org/grpc/backoff from google.golang.org/grpc+ google.golang.org/grpc/balancer from google.golang.org/grpc+ google.golang.org/grpc/balancer/base from google.golang.org/grpc+ - google.golang.org/grpc/balancer/grpclb/state from google.golang.org/grpc/internal/resolver/dns + google.golang.org/grpc/balancer/grpclb/state from google.golang.org/grpc/pkg/resolver/dns google.golang.org/grpc/balancer/roundrobin from google.golang.org/grpc - google.golang.org/grpc/binarylog/grpc_binarylog_v1 from google.golang.org/grpc/internal/binarylog + google.golang.org/grpc/binarylog/grpc_binarylog_v1 from google.golang.org/grpc/pkg/binarylog google.golang.org/grpc/codes from github.com/grpc-ecosystem/go-grpc-middleware/logging+ google.golang.org/grpc/connectivity from google.golang.org/grpc+ google.golang.org/grpc/credentials from google.golang.org/grpc+ @@ -139,27 +139,27 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de google.golang.org/grpc/encoding/proto from google.golang.org/grpc google.golang.org/grpc/grpclog from github.com/grpc-ecosystem/go-grpc-middleware/logging/zap+ google.golang.org/grpc/internal from google.golang.org/grpc+ - google.golang.org/grpc/internal/backoff from google.golang.org/grpc+ - google.golang.org/grpc/internal/balancerload from google.golang.org/grpc - google.golang.org/grpc/internal/binarylog from google.golang.org/grpc - google.golang.org/grpc/internal/buffer from google.golang.org/grpc - google.golang.org/grpc/internal/channelz from google.golang.org/grpc+ - google.golang.org/grpc/internal/credentials from google.golang.org/grpc/credentials+ - google.golang.org/grpc/internal/envconfig from google.golang.org/grpc+ - google.golang.org/grpc/internal/grpclog from google.golang.org/grpc/grpclog - google.golang.org/grpc/internal/grpcrand from google.golang.org/grpc+ - google.golang.org/grpc/internal/grpcsync from google.golang.org/grpc - google.golang.org/grpc/internal/grpcutil from google.golang.org/grpc+ - google.golang.org/grpc/internal/metadata from google.golang.org/grpc/internal/transport - google.golang.org/grpc/internal/resolver from google.golang.org/grpc - google.golang.org/grpc/internal/resolver/dns from google.golang.org/grpc - google.golang.org/grpc/internal/resolver/passthrough from google.golang.org/grpc - google.golang.org/grpc/internal/resolver/unix from google.golang.org/grpc - google.golang.org/grpc/internal/serviceconfig from google.golang.org/grpc+ - google.golang.org/grpc/internal/status from google.golang.org/grpc/status - google.golang.org/grpc/internal/syscall from google.golang.org/grpc/internal/transport - google.golang.org/grpc/internal/transport from google.golang.org/grpc - google.golang.org/grpc/internal/transport/networktype from google.golang.org/grpc/internal/resolver/unix+ + google.golang.org/grpc/pkg/backoff from google.golang.org/grpc+ + google.golang.org/grpc/pkg/balancerload from google.golang.org/grpc + google.golang.org/grpc/pkg/binarylog from google.golang.org/grpc + google.golang.org/grpc/pkg/buffer from google.golang.org/grpc + google.golang.org/grpc/pkg/channelz from google.golang.org/grpc+ + google.golang.org/grpc/pkg/credentials from google.golang.org/grpc/credentials+ + google.golang.org/grpc/pkg/envconfig from google.golang.org/grpc+ + google.golang.org/grpc/pkg/grpclog from google.golang.org/grpc/grpclog + google.golang.org/grpc/pkg/grpcrand from google.golang.org/grpc+ + google.golang.org/grpc/pkg/grpcsync from google.golang.org/grpc + google.golang.org/grpc/pkg/grpcutil from google.golang.org/grpc+ + google.golang.org/grpc/pkg/metadata from google.golang.org/grpc/pkg/transport + google.golang.org/grpc/pkg/resolver from google.golang.org/grpc + google.golang.org/grpc/pkg/resolver/dns from google.golang.org/grpc + google.golang.org/grpc/pkg/resolver/passthrough from google.golang.org/grpc + google.golang.org/grpc/pkg/resolver/unix from google.golang.org/grpc + google.golang.org/grpc/pkg/serviceconfig from google.golang.org/grpc+ + google.golang.org/grpc/pkg/status from google.golang.org/grpc/status + google.golang.org/grpc/pkg/syscall from google.golang.org/grpc/pkg/transport + google.golang.org/grpc/pkg/transport from google.golang.org/grpc + google.golang.org/grpc/pkg/transport/networktype from google.golang.org/grpc/pkg/resolver/unix+ google.golang.org/grpc/keepalive from google.golang.org/grpc+ google.golang.org/grpc/metadata from github.com/grpc-ecosystem/grpc-gateway/runtime+ google.golang.org/grpc/peer from github.com/grpc-ecosystem/go-grpc-middleware/tags+ @@ -171,25 +171,25 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de google.golang.org/protobuf/encoding/protojson from github.com/golang/protobuf/jsonpb google.golang.org/protobuf/encoding/prototext from github.com/golang/protobuf/proto+ google.golang.org/protobuf/encoding/protowire from github.com/golang/protobuf/proto+ - google.golang.org/protobuf/internal/descfmt from google.golang.org/protobuf/internal/filedesc - google.golang.org/protobuf/internal/descopts from google.golang.org/protobuf/internal/filedesc+ - google.golang.org/protobuf/internal/detrand from google.golang.org/protobuf/internal/descfmt+ - google.golang.org/protobuf/internal/encoding/defval from google.golang.org/protobuf/internal/encoding/tag+ - google.golang.org/protobuf/internal/encoding/json from google.golang.org/protobuf/encoding/protojson - google.golang.org/protobuf/internal/encoding/messageset from google.golang.org/protobuf/encoding/protojson+ - google.golang.org/protobuf/internal/encoding/tag from google.golang.org/protobuf/internal/impl - google.golang.org/protobuf/internal/encoding/text from google.golang.org/protobuf/encoding/prototext+ - google.golang.org/protobuf/internal/errors from google.golang.org/protobuf/encoding/protojson+ - google.golang.org/protobuf/internal/filedesc from google.golang.org/protobuf/internal/encoding/tag+ - google.golang.org/protobuf/internal/filetype from google.golang.org/protobuf/runtime/protoimpl - google.golang.org/protobuf/internal/flags from google.golang.org/protobuf/encoding/protojson+ - google.golang.org/protobuf/internal/genid from google.golang.org/protobuf/encoding/protojson+ - 💣 google.golang.org/protobuf/internal/impl from google.golang.org/protobuf/internal/filetype+ - google.golang.org/protobuf/internal/order from google.golang.org/protobuf/encoding/protojson+ - google.golang.org/protobuf/internal/pragma from google.golang.org/protobuf/encoding/protojson+ - google.golang.org/protobuf/internal/set from google.golang.org/protobuf/encoding/protojson+ - 💣 google.golang.org/protobuf/internal/strs from google.golang.org/protobuf/encoding/protojson+ - google.golang.org/protobuf/internal/version from google.golang.org/protobuf/runtime/protoimpl + google.golang.org/protobuf/pkg/descfmt from google.golang.org/protobuf/pkg/filedesc + google.golang.org/protobuf/pkg/descopts from google.golang.org/protobuf/pkg/filedesc+ + google.golang.org/protobuf/pkg/detrand from google.golang.org/protobuf/pkg/descfmt+ + google.golang.org/protobuf/pkg/encoding/defval from google.golang.org/protobuf/pkg/encoding/tag+ + google.golang.org/protobuf/pkg/encoding/json from google.golang.org/protobuf/encoding/protojson + google.golang.org/protobuf/pkg/encoding/messageset from google.golang.org/protobuf/encoding/protojson+ + google.golang.org/protobuf/pkg/encoding/tag from google.golang.org/protobuf/pkg/impl + google.golang.org/protobuf/pkg/encoding/text from google.golang.org/protobuf/encoding/prototext+ + google.golang.org/protobuf/pkg/errors from google.golang.org/protobuf/encoding/protojson+ + google.golang.org/protobuf/pkg/filedesc from google.golang.org/protobuf/pkg/encoding/tag+ + google.golang.org/protobuf/pkg/filetype from google.golang.org/protobuf/runtime/protoimpl + google.golang.org/protobuf/pkg/flags from google.golang.org/protobuf/encoding/protojson+ + google.golang.org/protobuf/pkg/genid from google.golang.org/protobuf/encoding/protojson+ + 💣 google.golang.org/protobuf/pkg/impl from google.golang.org/protobuf/pkg/filetype+ + google.golang.org/protobuf/pkg/order from google.golang.org/protobuf/encoding/protojson+ + google.golang.org/protobuf/pkg/pragma from google.golang.org/protobuf/encoding/protojson+ + google.golang.org/protobuf/pkg/set from google.golang.org/protobuf/encoding/protojson+ + 💣 google.golang.org/protobuf/pkg/strs from google.golang.org/protobuf/encoding/protojson+ + google.golang.org/protobuf/pkg/version from google.golang.org/protobuf/runtime/protoimpl google.golang.org/protobuf/proto from github.com/golang/protobuf/jsonpb+ google.golang.org/protobuf/reflect/protodesc from github.com/golang/protobuf/descriptor+ 💣 google.golang.org/protobuf/reflect/protoreflect from github.com/golang/protobuf/descriptor+ @@ -202,20 +202,20 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de google.golang.org/protobuf/types/known/fieldmaskpb from google.golang.org/genproto/protobuf/field_mask google.golang.org/protobuf/types/known/timestamppb from github.com/golang/protobuf/ptypes/timestamp+ google.golang.org/protobuf/types/known/wrapperspb from github.com/golang/protobuf/ptypes/wrappers - gopkg.in/yaml.v2 from moul.io/depviz/v3/internal/dvcore + gopkg.in/yaml.v2 from moul.io/depviz/v3/pkg/dvcore gopkg.in/yaml.v3 from github.com/stretchr/testify/assert moul.io/banner from moul.io/depviz/v3/cmd/depviz - moul.io/depviz/v3/internal/dvcore from moul.io/depviz/v3/cmd/depviz+ - moul.io/depviz/v3/internal/dvmodel from moul.io/depviz/v3/internal/dvcore+ - moul.io/depviz/v3/internal/dvparser from moul.io/depviz/v3/cmd/depviz+ - moul.io/depviz/v3/internal/dvserver from moul.io/depviz/v3/cmd/depviz - moul.io/depviz/v3/internal/dvstore from moul.io/depviz/v3/cmd/depviz+ - moul.io/depviz/v3/internal/githubprovider from moul.io/depviz/v3/internal/dvcore - moul.io/depviz/v3/pkg/chiutil from moul.io/depviz/v3/internal/dvserver - moul.io/graphman from moul.io/depviz/v3/internal/dvcore+ - moul.io/graphman/viz from moul.io/depviz/v3/internal/dvcore - moul.io/multipmuri from moul.io/depviz/v3/internal/dvcore+ - moul.io/multipmuri/pmbodyparser from moul.io/depviz/v3/internal/githubprovider + moul.io/depviz/v3/pkg/dvcore from moul.io/depviz/v3/cmd/depviz+ + moul.io/depviz/v3/pkg/dvmodel from moul.io/depviz/v3/pkg/dvcore+ + moul.io/depviz/v3/pkg/dvparser from moul.io/depviz/v3/cmd/depviz+ + moul.io/depviz/v3/pkg/dvserver from moul.io/depviz/v3/cmd/depviz + moul.io/depviz/v3/pkg/dvstore from moul.io/depviz/v3/cmd/depviz+ + moul.io/depviz/v3/pkg/githubprovider from moul.io/depviz/v3/pkg/dvcore + moul.io/depviz/v3/pkg/chiutil from moul.io/depviz/v3/pkg/dvserver + moul.io/graphman from moul.io/depviz/v3/pkg/dvcore+ + moul.io/graphman/viz from moul.io/depviz/v3/pkg/dvcore + moul.io/multipmuri from moul.io/depviz/v3/pkg/dvcore+ + moul.io/multipmuri/pmbodyparser from moul.io/depviz/v3/pkg/githubprovider moul.io/srand from moul.io/depviz/v3/cmd/depviz moul.io/u from moul.io/depviz/v3/cmd/depviz moul.io/zapconfig from moul.io/depviz/v3/cmd/depviz @@ -236,12 +236,12 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de golang.org/x/net/dns/dnsmessage from net golang.org/x/net/http/httpguts from golang.org/x/net/http2+ golang.org/x/net/http/httpproxy from net/http - golang.org/x/net/http2 from google.golang.org/grpc/internal/transport + golang.org/x/net/http2 from google.golang.org/grpc/pkg/transport golang.org/x/net/http2/hpack from golang.org/x/net/http2+ golang.org/x/net/idna from golang.org/x/net/http/httpguts+ D golang.org/x/net/route from net golang.org/x/net/trace from google.golang.org/grpc - golang.org/x/oauth2 from moul.io/depviz/v3/internal/githubprovider + golang.org/x/oauth2 from moul.io/depviz/v3/pkg/githubprovider golang.org/x/oauth2/internal from golang.org/x/oauth2 golang.org/x/sys/cpu from golang.org/x/crypto/chacha20poly1305 LD golang.org/x/sys/unix from github.com/prometheus/procfs+ @@ -256,7 +256,7 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de bytes from bufio+ compress/bzip2 from golang.org/x/crypto/openpgp/packet compress/flate from archive/zip+ - compress/gzip from github.com/awalterschulze/gographviz/internal/parser+ + compress/gzip from github.com/awalterschulze/gographviz/pkg/parser+ compress/zlib from golang.org/x/crypto/openpgp/packet container/heap from github.com/tylertreat/BoomFilters container/list from crypto/tls+ @@ -281,12 +281,12 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de crypto/tls from golang.org/x/net/http2+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509 - embed from crypto/internal/nistec + embed from crypto/pkg/nistec encoding from encoding/gob+ encoding/asn1 from crypto/x509+ encoding/base64 from encoding/json+ encoding/binary from archive/zip+ - encoding/gob from github.com/awalterschulze/gographviz/internal/parser+ + encoding/gob from github.com/awalterschulze/gographviz/pkg/parser+ encoding/hex from crypto/x509+ encoding/json from expvar+ encoding/pem from crypto/tls+ @@ -327,7 +327,7 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de net/http from expvar+ net/http/httptest from github.com/stretchr/testify/assert+ net/http/httptrace from golang.org/x/net/http2+ - net/http/httputil from google.golang.org/grpc/internal/transport + net/http/httputil from google.golang.org/grpc/pkg/transport net/http/internal from net/http+ net/http/pprof from github.com/go-chi/chi/middleware+ net/netip from net @@ -351,7 +351,7 @@ moul.io/depviz/v3/cmd/depviz dependencies: (generated by github.com/tailscale/de sync from archive/zip+ sync/atomic from context+ syscall from crypto/rand+ - testing from moul.io/depviz/v3/internal/dvstore + testing from moul.io/depviz/v3/pkg/dvstore text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+ text/template from github.com/awalterschulze/gographviz+ text/template/parse from html/template+ diff --git a/cmd/depviz/main.go b/cmd/depviz/main.go index 66240bf9f..6f66223c4 100644 --- a/cmd/depviz/main.go +++ b/cmd/depviz/main.go @@ -19,10 +19,10 @@ import ( "github.com/peterbourgon/ff/v3/ffcli" "go.uber.org/zap" "moul.io/banner" - "moul.io/depviz/v3/internal/dvcore" - "moul.io/depviz/v3/internal/dvparser" - "moul.io/depviz/v3/internal/dvserver" - "moul.io/depviz/v3/internal/dvstore" + "moul.io/depviz/v3/pkg/dvcore" + "moul.io/depviz/v3/pkg/dvparser" + "moul.io/depviz/v3/pkg/dvserver" + "moul.io/depviz/v3/pkg/dvstore" "moul.io/srand" "moul.io/u" "moul.io/zapconfig" diff --git a/gen.sum b/gen.sum index 1dd7a6e79..8c761bfcd 100644 --- a/gen.sum +++ b/gen.sum @@ -1,4 +1,4 @@ -82daa64de2f22ea8ef50d81376c4b376aa1e7f2f ./api/dvserver.proto -88ad959456f1a62bde50639586e44e685d46c7c3 Makefile -dae6fbaa6099d504b31ba06ba35e51746660d771 go.sum -fa7dc52caf24e8db45353353c77204803912bbd0 ./api/dvmodel.proto +1b133e802298da421abdc0b19650c29333ba4d5f ./api/dvmodel.proto +1b7d8a3168720ffd5bc5f7c0ff4d1c56edb5de02 ./api/dvserver.proto +225308c9aecbe07888f5182af8b6f4eb000e0908 Makefile +a1a7640b84869df75b836beed919942abbe4ff86 go.sum diff --git a/internal/dvcore/doc.go b/internal/dvcore/doc.go deleted file mode 100644 index ee73251d7..000000000 --- a/internal/dvcore/doc.go +++ /dev/null @@ -1 +0,0 @@ -package dvcore // import "moul.io/depviz/v3/internal/dvcore" diff --git a/internal/dvmodel/doc.go b/internal/dvmodel/doc.go deleted file mode 100644 index edec4aecc..000000000 --- a/internal/dvmodel/doc.go +++ /dev/null @@ -1 +0,0 @@ -package dvmodel // import "moul.io/depviz/v3/internal/dvmodel" diff --git a/internal/dvparser/doc.go b/internal/dvparser/doc.go deleted file mode 100644 index ec49535ed..000000000 --- a/internal/dvparser/doc.go +++ /dev/null @@ -1 +0,0 @@ -package dvparser // import "moul.io/depviz/v3/internal/dvparser" diff --git a/internal/dvserver/doc.go b/internal/dvserver/doc.go deleted file mode 100644 index 3b22119e8..000000000 --- a/internal/dvserver/doc.go +++ /dev/null @@ -1 +0,0 @@ -package dvserver // import "moul.io/depviz/v3/internal/dvserver" diff --git a/internal/dvstore/doc.go b/internal/dvstore/doc.go deleted file mode 100644 index 3daa8a2e7..000000000 --- a/internal/dvstore/doc.go +++ /dev/null @@ -1 +0,0 @@ -package dvstore // import "moul.io/depviz/v3/internal/dvstore" diff --git a/internal/githubprovider/doc.go b/internal/githubprovider/doc.go deleted file mode 100644 index ed8d91463..000000000 --- a/internal/githubprovider/doc.go +++ /dev/null @@ -1 +0,0 @@ -package githubprovider // import "moul.io/depviz/v3/internal/githubprovider" diff --git a/internal/testutil/doc.go b/internal/testutil/doc.go deleted file mode 100644 index 6a05cdd77..000000000 --- a/internal/testutil/doc.go +++ /dev/null @@ -1 +0,0 @@ -package testutil // import "moul.io/depviz/v3/internal/testutil" diff --git a/internal/dvcore/airtable.go b/pkg/dvcore/airtable.go similarity index 100% rename from internal/dvcore/airtable.go rename to pkg/dvcore/airtable.go diff --git a/pkg/dvcore/doc.go b/pkg/dvcore/doc.go new file mode 100644 index 000000000..944ee478e --- /dev/null +++ b/pkg/dvcore/doc.go @@ -0,0 +1 @@ +package dvcore // import "moul.io/depviz/v3/pkg/dvcore" diff --git a/internal/dvcore/fetch.go b/pkg/dvcore/fetch.go similarity index 96% rename from internal/dvcore/fetch.go rename to pkg/dvcore/fetch.go index d20c752b4..4cf93ac52 100644 --- a/internal/dvcore/fetch.go +++ b/pkg/dvcore/fetch.go @@ -6,7 +6,7 @@ import ( "github.com/cayleygraph/cayley" "github.com/cayleygraph/cayley/schema" "go.uber.org/zap" - "moul.io/depviz/v3/internal/dvparser" + "moul.io/depviz/v3/pkg/dvparser" "moul.io/multipmuri" ) diff --git a/internal/dvcore/gen.go b/pkg/dvcore/gen.go similarity index 97% rename from internal/dvcore/gen.go rename to pkg/dvcore/gen.go index 497c04504..027084639 100644 --- a/internal/dvcore/gen.go +++ b/pkg/dvcore/gen.go @@ -13,10 +13,10 @@ import ( "github.com/cayleygraph/cayley/schema" "go.uber.org/zap" yaml "gopkg.in/yaml.v2" - "moul.io/depviz/v3/internal/dvmodel" - "moul.io/depviz/v3/internal/dvparser" - "moul.io/depviz/v3/internal/dvstore" - "moul.io/depviz/v3/internal/githubprovider" + "moul.io/depviz/v3/pkg/dvmodel" + "moul.io/depviz/v3/pkg/dvparser" + "moul.io/depviz/v3/pkg/dvstore" + "moul.io/depviz/v3/pkg/githubprovider" "moul.io/graphman" "moul.io/graphman/viz" "moul.io/multipmuri" diff --git a/internal/dvcore/gen_test.go b/pkg/dvcore/gen_test.go similarity index 96% rename from internal/dvcore/gen_test.go rename to pkg/dvcore/gen_test.go index c5f1a165e..ba587d89a 100644 --- a/internal/dvcore/gen_test.go +++ b/pkg/dvcore/gen_test.go @@ -8,8 +8,8 @@ import ( "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/quad" "github.com/stretchr/testify/assert" - "moul.io/depviz/v3/internal/dvstore" - "moul.io/depviz/v3/internal/testutil" + "moul.io/depviz/v3/pkg/dvstore" + "moul.io/depviz/v3/pkg/testutil" "moul.io/multipmuri" ) diff --git a/internal/dvcore/store.go b/pkg/dvcore/store.go similarity index 97% rename from internal/dvcore/store.go rename to pkg/dvcore/store.go index 74342a9a3..df6a7f6ff 100644 --- a/internal/dvcore/store.go +++ b/pkg/dvcore/store.go @@ -6,7 +6,7 @@ import ( "github.com/cayleygraph/cayley" "github.com/cayleygraph/cayley/schema" - "moul.io/depviz/v3/internal/dvmodel" + "moul.io/depviz/v3/pkg/dvmodel" ) func StoreDumpQuads(h *cayley.Handle) error { diff --git a/pkg/dvmodel/doc.go b/pkg/dvmodel/doc.go new file mode 100644 index 000000000..a655a4e6b --- /dev/null +++ b/pkg/dvmodel/doc.go @@ -0,0 +1 @@ +package dvmodel // import "moul.io/depviz/v3/pkg/dvmodel" diff --git a/internal/dvmodel/dvmodel.pb.go b/pkg/dvmodel/dvmodel.pb.go similarity index 89% rename from internal/dvmodel/dvmodel.pb.go rename to pkg/dvmodel/dvmodel.pb.go index 634925813..829c4ee9f 100644 --- a/internal/dvmodel/dvmodel.pb.go +++ b/pkg/dvmodel/dvmodel.pb.go @@ -217,8 +217,7 @@ func (Topic_Kind) EnumDescriptor() ([]byte, []int) { // Owner is like a container of tasks or other containers. // It's something that is rarely deleted and cannot really "closed" or "due". // It's the entity used for Organizations, Teams, Groups, Users -// -// and for Projects, Workspaces, Repos, or a Provider. +// and for Projects, Workspaces, Repos, or a Provider. type Owner struct { ID github_com_cayleygraph_quad.IRI `protobuf:"bytes,1,opt,name=id,proto3,casttype=github.com/cayleygraph/quad.IRI" json:"id,omitempty" quad:"@id"` CreatedAt *time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at,omitempty" quad:"schema:createdAt,optional"` @@ -451,101 +450,101 @@ func init() { proto.RegisterFile("dvmodel.proto", fileDescriptor_106647ce772da30 func init() { golang_proto.RegisterFile("dvmodel.proto", fileDescriptor_106647ce772da30c) } var fileDescriptor_106647ce772da30c = []byte{ - // 1503 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x41, 0x6f, 0xdb, 0x46, - 0x16, 0x16, 0x65, 0x4b, 0xb1, 0x9e, 0xe4, 0x98, 0x9e, 0x24, 0x58, 0xae, 0x77, 0x57, 0x54, 0x94, - 0xdd, 0x8d, 0xda, 0x26, 0x12, 0x9a, 0x02, 0x29, 0x10, 0xa0, 0x48, 0x2c, 0xbb, 0x49, 0x84, 0x3a, - 0xb5, 0xa1, 0xd8, 0x28, 0x90, 0xa6, 0x10, 0x46, 0xe2, 0x58, 0x9a, 0x8a, 0xe4, 0x30, 0x1c, 0xd2, - 0x46, 0xf2, 0x17, 0x7a, 0xc9, 0xa1, 0x3f, 0xa2, 0x3f, 0xa3, 0x47, 0x1f, 0x7a, 0xc8, 0xb1, 0x27, - 0xb6, 0xb1, 0xff, 0x81, 0x4e, 0x45, 0x4f, 0xc5, 0x0c, 0x49, 0x89, 0xb4, 0x94, 0x34, 0x0a, 0xdc, - 0xf4, 0x92, 0x9b, 0xf8, 0xde, 0xf7, 0xbe, 0xef, 0x0d, 0xdf, 0xcc, 0x9b, 0x47, 0xc1, 0xb2, 0x71, - 0x60, 0x31, 0x83, 0x98, 0x75, 0xc7, 0x65, 0x1e, 0x43, 0x25, 0x83, 0x38, 0x07, 0xf4, 0x59, 0x5d, - 0xda, 0xd6, 0xf4, 0x3e, 0x63, 0x7d, 0x93, 0x34, 0xa4, 0xaf, 0xeb, 0xef, 0x37, 0x3c, 0x6a, 0x11, - 0xee, 0x61, 0xcb, 0x09, 0xe1, 0x6b, 0xd7, 0xfb, 0xd4, 0x1b, 0xf8, 0xdd, 0x7a, 0x8f, 0x59, 0x8d, - 0x3e, 0xeb, 0xb3, 0x09, 0x52, 0x3c, 0xc9, 0x07, 0xf9, 0x2b, 0x84, 0x57, 0x7f, 0x2a, 0x40, 0x6e, - 0xfb, 0xd0, 0x26, 0x2e, 0xba, 0x07, 0x59, 0x6a, 0x68, 0x4a, 0x45, 0xa9, 0x15, 0x9a, 0x9f, 0x1e, - 0x07, 0x7a, 0xb6, 0xb5, 0x39, 0x0a, 0x74, 0x78, 0xe2, 0x63, 0xe3, 0x56, 0xf5, 0x0e, 0x35, 0xaa, - 0xbf, 0x07, 0xba, 0x9e, 0x20, 0xef, 0xe1, 0xa7, 0x26, 0x79, 0xda, 0x77, 0xb1, 0x33, 0x68, 0x08, - 0x50, 0xbd, 0xd5, 0x6e, 0xb5, 0xb3, 0xd4, 0x40, 0x7d, 0x80, 0x9e, 0x4b, 0xb0, 0x47, 0x8c, 0x0e, - 0xf6, 0xb4, 0x85, 0x8a, 0x52, 0x2b, 0xde, 0x58, 0xab, 0x87, 0x79, 0xd7, 0xe3, 0x6c, 0xea, 0xbb, - 0x71, 0xde, 0xcd, 0x6b, 0x47, 0x81, 0xae, 0x8c, 0x02, 0xbd, 0x12, 0x4a, 0xf1, 0xde, 0x80, 0x58, - 0xf8, 0x56, 0x44, 0xb1, 0xee, 0x5d, 0x63, 0x8e, 0x47, 0x99, 0x8d, 0xcd, 0xea, 0xf3, 0x5f, 0x74, - 0xa5, 0x5d, 0x18, 0x3b, 0x84, 0x90, 0xef, 0x18, 0xb1, 0xd0, 0xe2, 0x5b, 0x0a, 0x45, 0x14, 0xd3, - 0x42, 0x63, 0x07, 0xba, 0x0f, 0x4b, 0x26, 0xeb, 0x61, 0xb3, 0x43, 0x0d, 0x2d, 0x27, 0x5f, 0xd0, - 0xf5, 0xe3, 0x40, 0x3f, 0xb7, 0x25, 0x6c, 0xf2, 0x2d, 0x95, 0x53, 0x8c, 0x12, 0xdb, 0x32, 0x26, - 0x7c, 0xed, 0x73, 0x91, 0x09, 0x3d, 0x80, 0xc5, 0x21, 0xb5, 0x0d, 0x0d, 0x2a, 0x4a, 0xed, 0xfc, - 0x0d, 0xad, 0x9e, 0xac, 0x6d, 0x5d, 0xd6, 0xa1, 0xfe, 0x05, 0xb5, 0x8d, 0xa6, 0x3e, 0x0a, 0xf4, - 0x7f, 0xa5, 0x48, 0x45, 0x58, 0x82, 0x51, 0xd2, 0xa0, 0x0d, 0x00, 0x3e, 0x60, 0xae, 0xd7, 0xb1, - 0xb1, 0x45, 0xb4, 0xa2, 0x4c, 0xed, 0xbf, 0x53, 0x2b, 0x94, 0x90, 0x2f, 0xb1, 0x45, 0x12, 0xf1, - 0x85, 0xb1, 0x11, 0xdd, 0x81, 0xc2, 0xbe, 0x6f, 0x9a, 0x21, 0x47, 0x49, 0x72, 0x5c, 0x19, 0x05, - 0xba, 0x9e, 0xe2, 0x10, 0x88, 0x53, 0x14, 0x4b, 0xb1, 0x0d, 0x6d, 0x43, 0xde, 0x70, 0xe9, 0x01, - 0x71, 0xb5, 0x65, 0xb9, 0xae, 0x8b, 0xe9, 0x75, 0x6d, 0x4a, 0x5f, 0xf3, 0xf2, 0x28, 0xd0, 0xff, - 0x93, 0x22, 0x0d, 0x83, 0x12, 0x94, 0x11, 0x0d, 0xba, 0x0d, 0x4b, 0x03, 0x66, 0x11, 0x07, 0xf7, - 0x89, 0x76, 0xfe, 0x15, 0x19, 0xc5, 0x80, 0x64, 0x46, 0xb1, 0x0d, 0xdd, 0x87, 0xa2, 0x41, 0x78, - 0xcf, 0xa5, 0xd2, 0xa7, 0xad, 0x48, 0x8e, 0xff, 0x8f, 0x02, 0xbd, 0x9a, 0x4e, 0x60, 0x82, 0x49, - 0xd0, 0x24, 0x43, 0xd1, 0x3e, 0x14, 0xf7, 0x99, 0x3b, 0xec, 0x70, 0x0f, 0x7b, 0x3e, 0xd7, 0x54, - 0xb9, 0xc0, 0xf2, 0xac, 0xc2, 0xdd, 0x65, 0xee, 0xf0, 0xa1, 0x44, 0x35, 0xff, 0x37, 0x0a, 0xf4, - 0xcb, 0xe9, 0xf7, 0x37, 0x76, 0x26, 0x84, 0x60, 0x62, 0x45, 0x3b, 0x00, 0xf8, 0x00, 0x7b, 0xd8, - 0xed, 0xf8, 0xae, 0xa9, 0xad, 0xca, 0x84, 0x3f, 0x3e, 0x0e, 0xf4, 0xc2, 0xba, 0xb4, 0xee, 0xb5, - 0xb7, 0xa6, 0xea, 0x1a, 0xe2, 0xf7, 0x5c, 0x33, 0x59, 0xd7, 0xb1, 0x11, 0x3d, 0x86, 0xc2, 0x00, - 0xf3, 0x0e, 0x13, 0xc9, 0x69, 0x86, 0x24, 0xbc, 0x3d, 0x0a, 0x74, 0x2d, 0xe4, 0x18, 0x60, 0x2e, - 0xd3, 0x9e, 0xc4, 0xbe, 0xc9, 0xf9, 0x5e, 0x8a, 0xc3, 0xaa, 0x7b, 0xb0, 0x28, 0x76, 0x2a, 0x5a, - 0x81, 0xe2, 0x9e, 0x3d, 0xb4, 0xd9, 0xa1, 0x2d, 0x1e, 0xd5, 0x0c, 0x5a, 0x82, 0xc5, 0x3d, 0x4e, - 0x5c, 0x55, 0x41, 0x2a, 0x94, 0xb6, 0xdd, 0x3e, 0xb6, 0xe9, 0x33, 0x2c, 0x24, 0xd4, 0xac, 0xf0, - 0xed, 0x12, 0x6c, 0xa9, 0x0b, 0xe2, 0x57, 0x9b, 0x38, 0x4c, 0x5d, 0x44, 0x25, 0x58, 0xda, 0x71, - 0xd9, 0x01, 0x35, 0x88, 0xab, 0xe6, 0xaa, 0x9f, 0x01, 0x4c, 0xde, 0x23, 0xba, 0x04, 0xab, 0x11, - 0xf9, 0xc4, 0xa8, 0x66, 0x10, 0x40, 0xbe, 0xc5, 0x85, 0x45, 0x55, 0x44, 0x78, 0x8b, 0x3f, 0x64, - 0xbe, 0xdb, 0x23, 0x6a, 0xb6, 0xfa, 0xfd, 0x45, 0x58, 0xdc, 0xc5, 0x7c, 0xf8, 0xbe, 0x9b, 0xbd, - 0x8b, 0x6e, 0xb6, 0x95, 0xea, 0x66, 0xff, 0x48, 0x1f, 0x0a, 0x51, 0x86, 0xb9, 0x9a, 0xd9, 0x4d, - 0xc8, 0x79, 0xd4, 0x33, 0xe3, 0x3e, 0x56, 0x19, 0x05, 0xfa, 0xbf, 0x53, 0x51, 0xd2, 0x9b, 0x08, - 0x0b, 0xe1, 0xa7, 0xcf, 0x7a, 0xe9, 0xed, 0xcf, 0xfa, 0x99, 0xf7, 0xb1, 0xaf, 0x21, 0x6f, 0xf8, - 0xa4, 0xc3, 0x6c, 0xd9, 0xc5, 0x5e, 0x5f, 0xcf, 0x5a, 0x54, 0xcf, 0xf4, 0x9a, 0x0d, 0x9f, 0x6c, - 0xdb, 0xa7, 0x6a, 0x99, 0x93, 0x46, 0x64, 0x41, 0xa9, 0xc7, 0x2c, 0xc7, 0x24, 0xd1, 0x96, 0x59, - 0xf9, 0x53, 0x89, 0x7a, 0x24, 0x91, 0x7e, 0x31, 0x63, 0x92, 0xa9, 0x4d, 0x53, 0x4c, 0xb8, 0xd0, - 0x0e, 0xe4, 0x44, 0x0f, 0x24, 0x51, 0x0b, 0xd4, 0x66, 0x54, 0x5b, 0x1c, 0x50, 0x32, 0xa3, 0x70, - 0x32, 0x2e, 0x59, 0x38, 0x69, 0x40, 0x9b, 0x50, 0xa0, 0xbc, 0x63, 0xb2, 0xde, 0x90, 0x18, 0xb2, - 0xe3, 0x2d, 0x35, 0xaf, 0x46, 0x19, 0xa6, 0x5b, 0x3d, 0xe5, 0x5b, 0x12, 0x94, 0x6c, 0xf5, 0xb1, - 0x0d, 0xb5, 0xa0, 0x64, 0xfb, 0x56, 0xa7, 0xc7, 0x2c, 0x8b, 0xd8, 0x1e, 0xd7, 0x50, 0x45, 0xa9, - 0xe5, 0x66, 0xd4, 0xdf, 0xf6, 0xad, 0x8d, 0x08, 0x93, 0xac, 0x7f, 0xc2, 0x8c, 0xee, 0x82, 0x78, - 0xec, 0xf8, 0xce, 0x01, 0xf3, 0x08, 0xd7, 0x2e, 0x48, 0xa6, 0xe9, 0x5e, 0x6e, 0xfb, 0xd6, 0x5e, - 0x08, 0x49, 0xf6, 0xf2, 0x89, 0x15, 0x6d, 0xc1, 0xb2, 0xe0, 0x31, 0xd8, 0xa1, 0x1d, 0x32, 0x5d, - 0x94, 0x4c, 0x57, 0x47, 0x81, 0x7e, 0xe5, 0x34, 0xd3, 0x66, 0x0c, 0x4a, 0x70, 0x95, 0x92, 0x76, - 0xf4, 0x18, 0x10, 0xe1, 0x1e, 0xb5, 0x64, 0x6b, 0x30, 0x7c, 0x57, 0x36, 0x53, 0xed, 0x52, 0x78, - 0x72, 0x47, 0x81, 0xfe, 0x41, 0x8a, 0x72, 0x1a, 0x9a, 0x20, 0x5e, 0x1d, 0x7b, 0x37, 0x23, 0x27, - 0xea, 0x00, 0x88, 0x5b, 0x02, 0xfb, 0xde, 0x80, 0xc5, 0xd7, 0xc4, 0x9d, 0x51, 0xa0, 0xff, 0x73, - 0x7c, 0x4d, 0xac, 0x4b, 0xd7, 0x7c, 0xf7, 0x44, 0x61, 0x1c, 0x97, 0xbe, 0x86, 0xc8, 0x19, 0x5f, - 0x43, 0x68, 0x00, 0xcb, 0x82, 0xdd, 0xa2, 0x26, 0xe1, 0x1e, 0xb3, 0x89, 0xb6, 0x2f, 0x15, 0x36, - 0x26, 0x7b, 0x70, 0x80, 0xf9, 0x83, 0xd8, 0x3b, 0x9f, 0x4a, 0x29, 0x19, 0x8a, 0x08, 0x94, 0xe4, - 0x8b, 0xe2, 0x9c, 0xf6, 0x6d, 0x42, 0xb4, 0x7e, 0x65, 0xa1, 0x56, 0x68, 0x36, 0x27, 0xbd, 0x4d, - 0x2c, 0x39, 0x72, 0xce, 0xa7, 0x53, 0x4c, 0x44, 0xc6, 0x32, 0x2e, 0x39, 0xa0, 0xe4, 0x90, 0xb8, - 0xda, 0x60, 0x86, 0x4c, 0x3b, 0x72, 0xce, 0x2f, 0x13, 0x47, 0xc6, 0x55, 0x31, 0x71, 0x97, 0x98, - 0x1a, 0x95, 0x1a, 0xe9, 0xaa, 0x6c, 0x09, 0xcf, 0xfc, 0x55, 0x91, 0x61, 0xc8, 0x84, 0x15, 0xca, - 0x3b, 0x06, 0x71, 0x88, 0x6d, 0x50, 0xbb, 0x2f, 0x1a, 0xe0, 0xb7, 0x52, 0x63, 0x73, 0xd2, 0x3b, - 0x29, 0xdf, 0x8c, 0xfd, 0xc9, 0x0e, 0xf7, 0x26, 0x42, 0xcb, 0xa9, 0x58, 0xd4, 0x85, 0x22, 0xe5, - 0x9d, 0xae, 0x68, 0x24, 0xd4, 0xee, 0x6b, 0x43, 0xa9, 0xb4, 0x3e, 0x0a, 0xf4, 0xb5, 0x58, 0xa9, - 0x19, 0xf9, 0xe6, 0x93, 0x81, 0x49, 0x60, 0xb4, 0x22, 0x97, 0x98, 0xf2, 0x68, 0x1d, 0x52, 0x6f, - 0xa0, 0x99, 0xd3, 0x2b, 0x6a, 0x87, 0xfe, 0xaf, 0xa8, 0x37, 0x98, 0x7b, 0x45, 0x89, 0x58, 0xf4, - 0x0d, 0x00, 0xe5, 0x1d, 0x07, 0xbb, 0x5e, 0x87, 0xed, 0x6b, 0xd6, 0xe9, 0xf2, 0x50, 0xbe, 0x83, - 0x5d, 0x6f, 0x7b, 0x7f, 0xce, 0xf2, 0xc4, 0x61, 0xe8, 0x11, 0x88, 0x52, 0x49, 0x7e, 0xcd, 0x3e, - 0x1b, 0xf2, 0x73, 0x03, 0x2c, 0xe3, 0xaa, 0xdd, 0x57, 0xcd, 0x85, 0x05, 0xc8, 0xb5, 0x38, 0xf7, - 0x49, 0x38, 0x18, 0x3e, 0x20, 0x6e, 0x9f, 0xb4, 0xc9, 0x13, 0x9f, 0x70, 0x4f, 0xcd, 0xa2, 0x65, - 0x28, 0x8c, 0x4f, 0x5a, 0x38, 0x1d, 0x7e, 0xee, 0xd0, 0x9e, 0xba, 0x28, 0xa2, 0x1e, 0x7a, 0xcc, - 0x7d, 0xaa, 0xe6, 0x84, 0x71, 0x03, 0xbb, 0x86, 0x9a, 0xaf, 0x36, 0x84, 0x51, 0xdc, 0x20, 0x2a, - 0x94, 0x22, 0x11, 0xf9, 0x1c, 0x4e, 0x9f, 0xdb, 0x0e, 0xb1, 0x55, 0x45, 0x0c, 0x89, 0x1b, 0x26, - 0xe3, 0xc4, 0x50, 0xb3, 0xd5, 0xa3, 0x3c, 0xe4, 0x76, 0x99, 0x43, 0x7b, 0xef, 0xe7, 0xc2, 0xbf, - 0xfd, 0x2b, 0x57, 0xd6, 0xe1, 0x9d, 0x0c, 0x86, 0x93, 0x71, 0xae, 0x74, 0x36, 0xe3, 0xdc, 0x4d, - 0xc8, 0xf5, 0x98, 0xc9, 0xc2, 0xf1, 0x70, 0x56, 0x22, 0xd2, 0x9b, 0x4c, 0x44, 0x1a, 0x4e, 0x4f, - 0xa8, 0xe7, 0xdf, 0x7e, 0x42, 0xfd, 0x6b, 0xbf, 0xe9, 0xaa, 0xaf, 0x39, 0xbb, 0xb2, 0xb1, 0xab, - 0x4a, 0xf5, 0x3b, 0x05, 0x72, 0x4d, 0xec, 0xf5, 0x06, 0xa8, 0x06, 0x39, 0x0f, 0xf3, 0x21, 0xd7, - 0x94, 0xca, 0x42, 0xad, 0x78, 0x03, 0x4d, 0x0f, 0x84, 0xed, 0x10, 0x80, 0x3e, 0x82, 0xbc, 0xcc, - 0x98, 0x6b, 0x59, 0x09, 0xbd, 0x30, 0xe3, 0xf3, 0xb9, 0x1d, 0x41, 0x04, 0xd8, 0x13, 0x5b, 0x84, - 0x6b, 0x0b, 0xb3, 0xc0, 0x72, 0xfb, 0xb4, 0x23, 0xc8, 0x87, 0x57, 0x21, 0x1f, 0x96, 0x11, 0xad, - 0xc2, 0x72, 0x94, 0x73, 0x68, 0x08, 0x3f, 0x13, 0xef, 0x51, 0xef, 0xbe, 0xdf, 0x55, 0x95, 0x66, - 0xeb, 0xe8, 0x65, 0x39, 0xf3, 0xdb, 0xcb, 0x72, 0xe6, 0x87, 0xe3, 0x72, 0xe6, 0xe8, 0xb8, 0xac, - 0xbc, 0x38, 0x2e, 0x2b, 0xbf, 0x1e, 0x97, 0x95, 0xe7, 0x27, 0xe5, 0xcc, 0x8f, 0x27, 0x65, 0xe5, - 0xc5, 0x49, 0x39, 0xf3, 0xf3, 0x49, 0x39, 0xf3, 0x48, 0xb7, 0x98, 0x6f, 0xd6, 0x29, 0x6b, 0x84, - 0xb2, 0x0d, 0x6a, 0x7b, 0xc4, 0xb5, 0xb1, 0xd9, 0x88, 0xfe, 0x96, 0xeb, 0xe6, 0xe5, 0xa1, 0xfb, - 0xe4, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0x5c, 0x43, 0x53, 0xa8, 0x13, 0x00, 0x00, + // 1497 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x41, 0x73, 0xdb, 0x44, + 0x14, 0xb6, 0x9c, 0xd8, 0x8d, 0xd7, 0x4e, 0xa3, 0x6c, 0xdb, 0x41, 0x04, 0xb0, 0x5c, 0x17, 0xa8, + 0x81, 0xd6, 0x1e, 0xca, 0x4c, 0x99, 0xe9, 0x0c, 0xd3, 0xc6, 0x31, 0x6d, 0x3d, 0xa4, 0x24, 0xe3, + 0x26, 0xc3, 0x4c, 0x29, 0xa3, 0x59, 0x5b, 0x1b, 0x69, 0xb1, 0xa4, 0x55, 0xb5, 0x52, 0x32, 0xed, + 0x5f, 0xe0, 0xd2, 0x03, 0x3f, 0x82, 0x9f, 0xc1, 0x31, 0x07, 0x0e, 0x3d, 0x72, 0x12, 0x34, 0xf9, + 0x07, 0x3e, 0x31, 0x9c, 0x98, 0x5d, 0x49, 0xb6, 0x14, 0xbb, 0xa5, 0xee, 0x84, 0x72, 0xe9, 0xcd, + 0x7a, 0xef, 0x7b, 0xdf, 0xf7, 0x56, 0x6f, 0xf7, 0xed, 0x93, 0xc1, 0xb2, 0xbe, 0x6f, 0x53, 0x1d, + 0x5b, 0x4d, 0xd7, 0xa3, 0x3e, 0x85, 0x15, 0x1d, 0xbb, 0xfb, 0xe4, 0x49, 0x53, 0xd8, 0xd6, 0x54, + 0x83, 0x52, 0xc3, 0xc2, 0x2d, 0xe1, 0xeb, 0x07, 0x7b, 0x2d, 0x9f, 0xd8, 0x98, 0xf9, 0xc8, 0x76, + 0x23, 0xf8, 0xda, 0x55, 0x83, 0xf8, 0x66, 0xd0, 0x6f, 0x0e, 0xa8, 0xdd, 0x32, 0xa8, 0x41, 0x27, + 0x48, 0xfe, 0x24, 0x1e, 0xc4, 0xaf, 0x08, 0x5e, 0xff, 0xad, 0x04, 0x0a, 0x5b, 0x07, 0x0e, 0xf6, + 0xe0, 0x1d, 0x90, 0x27, 0xba, 0x22, 0xd5, 0xa4, 0x46, 0xa9, 0xfd, 0xe5, 0x51, 0xa8, 0xe6, 0xbb, + 0x9d, 0x51, 0xa8, 0x82, 0x47, 0x01, 0xd2, 0x6f, 0xd4, 0x6f, 0x11, 0xbd, 0xfe, 0x77, 0xa8, 0xaa, + 0x29, 0xf2, 0x01, 0x7a, 0x6c, 0xe1, 0xc7, 0x86, 0x87, 0x5c, 0xb3, 0xc5, 0x41, 0xcd, 0x6e, 0xaf, + 0xdb, 0xcb, 0x13, 0x1d, 0x1a, 0x00, 0x0c, 0x3c, 0x8c, 0x7c, 0xac, 0x6b, 0xc8, 0x57, 0x16, 0x6a, + 0x52, 0xa3, 0x7c, 0x6d, 0xad, 0x19, 0xe5, 0xdd, 0x4c, 0xb2, 0x69, 0xee, 0x24, 0x79, 0xb7, 0xaf, + 0x1c, 0x86, 0xaa, 0x34, 0x0a, 0xd5, 0x5a, 0x24, 0xc5, 0x06, 0x26, 0xb6, 0xd1, 0x8d, 0x98, 0x62, + 0xdd, 0xbf, 0x42, 0x5d, 0x9f, 0x50, 0x07, 0x59, 0xf5, 0xa7, 0x7f, 0xa8, 0x52, 0xaf, 0x34, 0x76, + 0x70, 0xa1, 0xc0, 0xd5, 0x13, 0xa1, 0xc5, 0xd7, 0x14, 0x8a, 0x29, 0xa6, 0x85, 0xc6, 0x0e, 0x78, + 0x17, 0x2c, 0x59, 0x74, 0x80, 0x2c, 0x8d, 0xe8, 0x4a, 0x41, 0xbc, 0xa0, 0xab, 0x47, 0xa1, 0x7a, + 0x66, 0x93, 0xdb, 0xc4, 0x5b, 0xaa, 0x66, 0x18, 0x05, 0xb6, 0xab, 0x4f, 0xf8, 0x7a, 0x67, 0x62, + 0x13, 0xbc, 0x07, 0x16, 0x87, 0xc4, 0xd1, 0x15, 0x50, 0x93, 0x1a, 0x67, 0xaf, 0x29, 0xcd, 0x74, + 0x6d, 0x9b, 0xa2, 0x0e, 0xcd, 0x6f, 0x88, 0xa3, 0xb7, 0xd5, 0x51, 0xa8, 0xbe, 0x97, 0x21, 0xe5, + 0x61, 0x29, 0x46, 0x41, 0x03, 0x37, 0x00, 0x60, 0x26, 0xf5, 0x7c, 0xcd, 0x41, 0x36, 0x56, 0xca, + 0x22, 0xb5, 0x0f, 0xa7, 0x56, 0x28, 0x20, 0xdf, 0x22, 0x1b, 0xa7, 0xe2, 0x4b, 0x63, 0x23, 0xbc, + 0x05, 0x4a, 0x7b, 0x81, 0x65, 0x45, 0x1c, 0x15, 0xc1, 0x71, 0x69, 0x14, 0xaa, 0x6a, 0x86, 0x83, + 0x23, 0x4e, 0x50, 0x2c, 0x25, 0x36, 0xb8, 0x05, 0x8a, 0xba, 0x47, 0xf6, 0xb1, 0xa7, 0x2c, 0x8b, + 0x75, 0x9d, 0xcf, 0xae, 0xab, 0x23, 0x7c, 0xed, 0x8b, 0xa3, 0x50, 0xfd, 0x20, 0x43, 0x1a, 0x05, + 0xa5, 0x28, 0x63, 0x1a, 0x78, 0x13, 0x2c, 0x99, 0xd4, 0xc6, 0x2e, 0x32, 0xb0, 0x72, 0xf6, 0x05, + 0x19, 0x25, 0x80, 0x74, 0x46, 0x89, 0x0d, 0xde, 0x05, 0x65, 0x1d, 0xb3, 0x81, 0x47, 0x84, 0x4f, + 0x59, 0x11, 0x1c, 0x1f, 0x8f, 0x42, 0xb5, 0x9e, 0x4d, 0x60, 0x82, 0x49, 0xd1, 0xa4, 0x43, 0xe1, + 0x1e, 0x28, 0xef, 0x51, 0x6f, 0xa8, 0x31, 0x1f, 0xf9, 0x01, 0x53, 0x64, 0xb1, 0xc0, 0xea, 0xac, + 0xc2, 0xdd, 0xa6, 0xde, 0xf0, 0xbe, 0x40, 0xb5, 0x3f, 0x1a, 0x85, 0xea, 0xc5, 0xec, 0xfb, 0x1b, + 0x3b, 0x53, 0x42, 0x60, 0x62, 0x85, 0xdb, 0x00, 0xa0, 0x7d, 0xe4, 0x23, 0x4f, 0x0b, 0x3c, 0x4b, + 0x59, 0x15, 0x09, 0x7f, 0x7e, 0x14, 0xaa, 0xa5, 0x75, 0x61, 0xdd, 0xed, 0x6d, 0x4e, 0xd5, 0x35, + 0xc2, 0xef, 0x7a, 0x56, 0xba, 0xae, 0x63, 0x23, 0x7c, 0x08, 0x4a, 0x26, 0x62, 0x1a, 0xe5, 0xc9, + 0x29, 0xba, 0x20, 0xbc, 0x39, 0x0a, 0x55, 0x25, 0xe2, 0x30, 0x11, 0x13, 0x69, 0x4f, 0x62, 0x5f, + 0xe5, 0x7c, 0x2f, 0x25, 0x61, 0xf5, 0x5d, 0xb0, 0xc8, 0x77, 0x2a, 0x5c, 0x01, 0xe5, 0x5d, 0x67, + 0xe8, 0xd0, 0x03, 0x87, 0x3f, 0xca, 0x39, 0xb8, 0x04, 0x16, 0x77, 0x19, 0xf6, 0x64, 0x09, 0xca, + 0xa0, 0xb2, 0xe5, 0x19, 0xc8, 0x21, 0x4f, 0x10, 0x97, 0x90, 0xf3, 0xdc, 0xb7, 0x83, 0x91, 0x2d, + 0x2f, 0xf0, 0x5f, 0x3d, 0xec, 0x52, 0x79, 0x11, 0x56, 0xc0, 0xd2, 0xb6, 0x47, 0xf7, 0x89, 0x8e, + 0x3d, 0xb9, 0x50, 0xff, 0x0a, 0x80, 0xc9, 0x7b, 0x84, 0x17, 0xc0, 0x6a, 0x4c, 0x3e, 0x31, 0xca, + 0x39, 0x08, 0x40, 0xb1, 0xcb, 0xb8, 0x45, 0x96, 0x78, 0x78, 0x97, 0xdd, 0xa7, 0x81, 0x37, 0xc0, + 0x72, 0xbe, 0xfe, 0xf3, 0x79, 0xb0, 0xb8, 0x83, 0xd8, 0xf0, 0x6d, 0x37, 0x7b, 0x13, 0xdd, 0x6c, + 0x33, 0xd3, 0xcd, 0xde, 0xc9, 0x1e, 0x0a, 0x5e, 0x86, 0xb9, 0x9a, 0xd9, 0x75, 0x50, 0xf0, 0x89, + 0x6f, 0x25, 0x7d, 0xac, 0x36, 0x0a, 0xd5, 0xf7, 0x33, 0x51, 0xc2, 0x9b, 0x0a, 0x8b, 0xe0, 0x27, + 0xcf, 0x7a, 0xe5, 0xf5, 0xcf, 0xfa, 0xa9, 0xf7, 0xb1, 0xef, 0x41, 0x51, 0x0f, 0xb0, 0x46, 0x1d, + 0xd1, 0xc5, 0x5e, 0x5e, 0xcf, 0x46, 0x5c, 0xcf, 0xec, 0x9a, 0xf5, 0x00, 0x6f, 0x39, 0x27, 0x6a, + 0x59, 0x10, 0x46, 0x68, 0x83, 0xca, 0x80, 0xda, 0xae, 0x85, 0xe3, 0x2d, 0xb3, 0xf2, 0xaf, 0x12, + 0xcd, 0x58, 0x22, 0xfb, 0x62, 0xc6, 0x24, 0x53, 0x9b, 0xa6, 0x9c, 0x72, 0xc1, 0x6d, 0x50, 0xe0, + 0x3d, 0x10, 0xc7, 0x2d, 0x50, 0x99, 0x51, 0x6d, 0x7e, 0x40, 0xf1, 0x8c, 0xc2, 0x89, 0xb8, 0x74, + 0xe1, 0x84, 0x01, 0x76, 0x40, 0x89, 0x30, 0xcd, 0xa2, 0x83, 0x21, 0xd6, 0x45, 0xc7, 0x5b, 0x6a, + 0x5f, 0x8e, 0x33, 0xcc, 0xb6, 0x7a, 0xc2, 0x36, 0x05, 0x28, 0xdd, 0xea, 0x13, 0x1b, 0xec, 0x82, + 0x8a, 0x13, 0xd8, 0xda, 0x80, 0xda, 0x36, 0x76, 0x7c, 0xa6, 0xc0, 0x9a, 0xd4, 0x28, 0xcc, 0xa8, + 0xbf, 0x13, 0xd8, 0x1b, 0x31, 0x26, 0x5d, 0xff, 0x94, 0x19, 0xde, 0x06, 0xfc, 0x51, 0x0b, 0xdc, + 0x7d, 0xea, 0x63, 0xa6, 0x9c, 0x13, 0x4c, 0xd3, 0xbd, 0xdc, 0x09, 0xec, 0xdd, 0x08, 0x92, 0xee, + 0xe5, 0x13, 0x2b, 0xdc, 0x04, 0xcb, 0x9c, 0x47, 0xa7, 0x07, 0x4e, 0xc4, 0x74, 0x5e, 0x30, 0x5d, + 0x1e, 0x85, 0xea, 0xa5, 0x93, 0x4c, 0x9d, 0x04, 0x94, 0xe2, 0xaa, 0xa4, 0xed, 0xf0, 0x21, 0x80, + 0x98, 0xf9, 0xc4, 0x16, 0xad, 0x41, 0x0f, 0x3c, 0xd1, 0x4c, 0x95, 0x0b, 0xd1, 0xc9, 0x1d, 0x85, + 0xea, 0x27, 0x19, 0xca, 0x69, 0x68, 0x8a, 0x78, 0x75, 0xec, 0xed, 0xc4, 0x4e, 0xa8, 0x01, 0xc0, + 0x6f, 0x09, 0x14, 0xf8, 0x26, 0x4d, 0xae, 0x89, 0x5b, 0xa3, 0x50, 0x7d, 0x77, 0x7c, 0x4d, 0xac, + 0x0b, 0xd7, 0x7c, 0xf7, 0x44, 0x69, 0x1c, 0x97, 0xbd, 0x86, 0xf0, 0x29, 0x5f, 0x43, 0xd0, 0x04, + 0xcb, 0x9c, 0xdd, 0x26, 0x16, 0x66, 0x3e, 0x75, 0xb0, 0xb2, 0x27, 0x14, 0x36, 0x26, 0x7b, 0xd0, + 0x44, 0xec, 0x5e, 0xe2, 0x9d, 0x4f, 0xa5, 0x92, 0x0e, 0x85, 0x18, 0x54, 0xc4, 0x8b, 0x62, 0x8c, + 0x18, 0x0e, 0xc6, 0x8a, 0x51, 0x5b, 0x68, 0x94, 0xda, 0xed, 0x49, 0x6f, 0xe3, 0x4b, 0x8e, 0x9d, + 0xf3, 0xe9, 0x94, 0x53, 0x91, 0x89, 0x8c, 0x87, 0xf7, 0x09, 0x3e, 0xc0, 0x9e, 0x62, 0xce, 0x90, + 0xe9, 0xc5, 0xce, 0xf9, 0x65, 0x92, 0xc8, 0xa4, 0x2a, 0x16, 0xea, 0x63, 0x4b, 0x21, 0x42, 0x23, + 0x5b, 0x95, 0x4d, 0xee, 0x99, 0xbf, 0x2a, 0x22, 0x0c, 0x5a, 0x60, 0x85, 0x30, 0x4d, 0xc7, 0x2e, + 0x76, 0x74, 0xe2, 0x18, 0xbc, 0x01, 0xfe, 0x28, 0x34, 0x3a, 0x93, 0xde, 0x49, 0x58, 0x27, 0xf1, + 0xa7, 0x3b, 0xdc, 0xab, 0x08, 0x2d, 0x67, 0x62, 0x61, 0x1f, 0x94, 0x09, 0xd3, 0xfa, 0xbc, 0x91, + 0x10, 0xc7, 0x50, 0x86, 0x42, 0x69, 0x7d, 0x14, 0xaa, 0x6b, 0x89, 0x52, 0x3b, 0xf6, 0xcd, 0x27, + 0x03, 0x26, 0x81, 0xf1, 0x8a, 0x3c, 0x6c, 0x89, 0xa3, 0x75, 0x40, 0x7c, 0x53, 0xb1, 0xa6, 0x57, + 0xd4, 0x8b, 0xfc, 0xdf, 0x11, 0xdf, 0x9c, 0x7b, 0x45, 0xa9, 0x58, 0xf8, 0x03, 0x00, 0x84, 0x69, + 0x2e, 0xf2, 0x7c, 0x8d, 0xee, 0x29, 0xf6, 0xc9, 0xf2, 0x10, 0xb6, 0x8d, 0x3c, 0x7f, 0x6b, 0x6f, + 0xce, 0xf2, 0x24, 0x61, 0xf0, 0x01, 0xe0, 0xa5, 0x12, 0xfc, 0x8a, 0x73, 0x3a, 0xe4, 0x67, 0x4c, + 0x24, 0xe2, 0xea, 0xfd, 0x17, 0xcd, 0x85, 0x25, 0x50, 0xe8, 0x32, 0x16, 0xe0, 0x68, 0x30, 0xbc, + 0x87, 0x3d, 0x03, 0xf7, 0xf0, 0xa3, 0x00, 0x33, 0x5f, 0xce, 0xc3, 0x65, 0x50, 0x1a, 0x9f, 0xb4, + 0x68, 0x3a, 0xfc, 0xda, 0x25, 0x03, 0x79, 0x91, 0x47, 0xdd, 0xf7, 0xa9, 0xf7, 0x58, 0x2e, 0x70, + 0xe3, 0x06, 0xf2, 0x74, 0xb9, 0x58, 0x6f, 0x71, 0x23, 0xbf, 0x41, 0x64, 0x50, 0x89, 0x45, 0xc4, + 0x73, 0x34, 0x7d, 0x6e, 0xb9, 0xd8, 0x91, 0x25, 0x3e, 0x24, 0x6e, 0x58, 0x94, 0x61, 0x5d, 0xce, + 0xd7, 0x0f, 0x8b, 0xa0, 0xb0, 0x43, 0x5d, 0x32, 0x78, 0x3b, 0x17, 0xfe, 0xef, 0x5f, 0xb9, 0xa2, + 0x0e, 0x6f, 0x64, 0x30, 0x9c, 0x8c, 0x73, 0x95, 0xd3, 0x19, 0xe7, 0xae, 0x83, 0xc2, 0x80, 0x5a, + 0x34, 0x1a, 0x0f, 0x67, 0x25, 0x22, 0xbc, 0xe9, 0x44, 0x84, 0xe1, 0xe4, 0x84, 0x7a, 0xf6, 0xf5, + 0x27, 0xd4, 0xff, 0xf6, 0x9b, 0xae, 0xfe, 0x92, 0xb3, 0x2b, 0x1a, 0xbb, 0x2c, 0xd5, 0x7f, 0x92, + 0x40, 0xa1, 0x8d, 0xfc, 0x81, 0x09, 0x1b, 0xa0, 0xe0, 0x23, 0x36, 0x64, 0x8a, 0x54, 0x5b, 0x68, + 0x94, 0xaf, 0xc1, 0xe9, 0x81, 0xb0, 0x17, 0x01, 0xe0, 0x67, 0xa0, 0x28, 0x32, 0x66, 0x4a, 0x5e, + 0x40, 0xcf, 0xcd, 0xf8, 0x7c, 0xee, 0xc5, 0x10, 0x0e, 0xf6, 0xf9, 0x16, 0x61, 0xca, 0xc2, 0x2c, + 0xb0, 0xd8, 0x3e, 0xbd, 0x18, 0xf2, 0xe9, 0x65, 0x50, 0x8c, 0xca, 0x08, 0x57, 0xc1, 0x72, 0x9c, + 0x73, 0x64, 0x88, 0x3e, 0x13, 0xef, 0x10, 0xff, 0x6e, 0xd0, 0x97, 0xa5, 0x76, 0xe7, 0xf0, 0x79, + 0x35, 0xf7, 0xd7, 0xf3, 0x6a, 0xee, 0x97, 0xa3, 0x6a, 0xee, 0xf0, 0xa8, 0x2a, 0x3d, 0x3b, 0xaa, + 0x4a, 0x7f, 0x1e, 0x55, 0xa5, 0xa7, 0xc7, 0xd5, 0xdc, 0xaf, 0xc7, 0x55, 0xe9, 0xd9, 0x71, 0x35, + 0xf7, 0xfb, 0x71, 0x35, 0xf7, 0x60, 0xcd, 0xa6, 0x81, 0xd5, 0x24, 0xb4, 0x15, 0xc9, 0xb6, 0xdc, + 0xa1, 0xd1, 0x8a, 0xff, 0x91, 0xeb, 0x17, 0xc5, 0x79, 0xfb, 0xe2, 0x9f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x2a, 0x36, 0xa2, 0x2d, 0xa3, 0x13, 0x00, 0x00, } func (m *Owner) Marshal() (dAtA []byte, err error) { diff --git a/internal/dvmodel/model.go b/pkg/dvmodel/model.go similarity index 100% rename from internal/dvmodel/model.go rename to pkg/dvmodel/model.go diff --git a/internal/dvmodel/render.go b/pkg/dvmodel/render.go similarity index 100% rename from internal/dvmodel/render.go rename to pkg/dvmodel/render.go diff --git a/internal/dvmodel/task.go b/pkg/dvmodel/task.go similarity index 100% rename from internal/dvmodel/task.go rename to pkg/dvmodel/task.go diff --git a/pkg/dvparser/doc.go b/pkg/dvparser/doc.go new file mode 100644 index 000000000..20eeb64f6 --- /dev/null +++ b/pkg/dvparser/doc.go @@ -0,0 +1 @@ +package dvparser // import "moul.io/depviz/v3/pkg/dvparser" diff --git a/internal/dvparser/target.go b/pkg/dvparser/target.go similarity index 100% rename from internal/dvparser/target.go rename to pkg/dvparser/target.go diff --git a/internal/dvserver/api.go b/pkg/dvserver/api.go similarity index 97% rename from internal/dvserver/api.go rename to pkg/dvserver/api.go index f6d7a69d9..12d169b88 100644 --- a/internal/dvserver/api.go +++ b/pkg/dvserver/api.go @@ -10,10 +10,10 @@ import ( "go.uber.org/zap" "google.golang.org/grpc/metadata" - "moul.io/depviz/v3/internal/dvcore" - "moul.io/depviz/v3/internal/dvmodel" - "moul.io/depviz/v3/internal/dvparser" - "moul.io/depviz/v3/internal/dvstore" + "moul.io/depviz/v3/pkg/dvcore" + "moul.io/depviz/v3/pkg/dvmodel" + "moul.io/depviz/v3/pkg/dvparser" + "moul.io/depviz/v3/pkg/dvstore" ) func gitHubOAuth(opts Opts, httpLogger *zap.Logger) http.HandlerFunc { diff --git a/internal/dvserver/auth.go b/pkg/dvserver/auth.go similarity index 100% rename from internal/dvserver/auth.go rename to pkg/dvserver/auth.go diff --git a/internal/dvserver/cache.go b/pkg/dvserver/cache.go similarity index 100% rename from internal/dvserver/cache.go rename to pkg/dvserver/cache.go diff --git a/pkg/dvserver/doc.go b/pkg/dvserver/doc.go new file mode 100644 index 000000000..621a7bc70 --- /dev/null +++ b/pkg/dvserver/doc.go @@ -0,0 +1 @@ +package dvserver // import "moul.io/depviz/v3/pkg/dvserver" diff --git a/internal/dvserver/dvserver.pb.go b/pkg/dvserver/dvserver.pb.go similarity index 93% rename from internal/dvserver/dvserver.pb.go rename to pkg/dvserver/dvserver.pb.go index 5e23a2491..1859a16ab 100644 --- a/internal/dvserver/dvserver.pb.go +++ b/pkg/dvserver/dvserver.pb.go @@ -16,7 +16,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - dvmodel "moul.io/depviz/v3/internal/dvmodel" + dvmodel "moul.io/depviz/v3/pkg/dvmodel" ) // Reference imports to suppress errors if they are not otherwise used. @@ -560,45 +560,45 @@ func init() { func init() { proto.RegisterFile("dvserver.proto", fileDescriptor_af3aef303a4c4cd2) } var fileDescriptor_af3aef303a4c4cd2 = []byte{ - // 603 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x94, 0xcb, 0x6a, 0xdb, 0x4e, - 0x14, 0xc6, 0x23, 0x27, 0xb2, 0xe3, 0x31, 0x76, 0xc2, 0x84, 0x3f, 0xe8, 0xaf, 0xa4, 0xb2, 0xd1, - 0xca, 0x59, 0x54, 0x03, 0xce, 0xae, 0x74, 0xe5, 0x26, 0x29, 0xa6, 0x85, 0x04, 0x25, 0x50, 0xda, - 0x8d, 0x18, 0x5b, 0x13, 0x79, 0xb0, 0xac, 0x11, 0x9a, 0x91, 0x7a, 0x59, 0xf6, 0x09, 0x0a, 0x7d, - 0x90, 0xbe, 0x46, 0x97, 0x81, 0x6e, 0xba, 0x0a, 0xc5, 0xe9, 0xa2, 0xdb, 0xbe, 0x41, 0x99, 0x8b, - 0x9d, 0x4b, 0xd3, 0xdd, 0x9c, 0xef, 0xfb, 0xce, 0x6f, 0x66, 0x8e, 0xc7, 0x02, 0x9d, 0xb8, 0xe2, - 0xa4, 0xa8, 0x48, 0x11, 0xe4, 0x05, 0x13, 0x0c, 0xb6, 0x63, 0x92, 0x57, 0xf4, 0x43, 0xa0, 0x45, - 0x77, 0x2f, 0x61, 0x2c, 0x49, 0x09, 0xc2, 0x39, 0x45, 0x38, 0xcb, 0x98, 0xc0, 0x82, 0xb2, 0x8c, - 0xeb, 0xb0, 0xfb, 0x38, 0xa1, 0x62, 0x5a, 0x8e, 0x83, 0x09, 0x9b, 0xa3, 0x84, 0x25, 0x0c, 0x29, - 0x79, 0x5c, 0x5e, 0xa8, 0x4a, 0x15, 0x6a, 0x65, 0xe2, 0xed, 0xb8, 0x9a, 0xb3, 0x98, 0xa4, 0xba, - 0xf4, 0xbf, 0xd4, 0x80, 0xfd, 0xbc, 0xc0, 0xf9, 0xd4, 0xfd, 0x6d, 0x01, 0x7b, 0x94, 0xe5, 0xa5, - 0x80, 0x0e, 0x68, 0x08, 0x5c, 0x24, 0x44, 0x70, 0xc7, 0xea, 0xad, 0xf7, 0x9b, 0xe1, 0xb2, 0x84, - 0x5d, 0xd0, 0x7a, 0x4b, 0xc5, 0x34, 0x9a, 0xa4, 0x8c, 0x93, 0xd8, 0xa9, 0xf5, 0xac, 0xfe, 0x66, - 0x08, 0xa4, 0xf4, 0x4c, 0x29, 0x70, 0x1f, 0x6c, 0xcb, 0x8a, 0x95, 0x22, 0xa2, 0x9c, 0xa5, 0x58, - 0x90, 0xd8, 0x59, 0x57, 0xa9, 0x2d, 0xa3, 0x8f, 0x8c, 0x0c, 0x91, 0x66, 0xc9, 0x68, 0x5e, 0x70, - 0x67, 0x43, 0xa6, 0x86, 0x9d, 0xc5, 0x55, 0x17, 0xbc, 0xd2, 0xf2, 0x69, 0xc8, 0x35, 0x5b, 0xae, - 0x0b, 0x0e, 0x07, 0xe0, 0xbf, 0x65, 0x03, 0x79, 0x27, 0x48, 0x91, 0xe1, 0x34, 0x8a, 0x49, 0xce, - 0x1d, 0x5b, 0x6d, 0xb0, 0x63, 0xcc, 0x23, 0xe3, 0x1d, 0x92, 0x9c, 0xc3, 0x47, 0x40, 0x11, 0xa2, - 0x0b, 0x22, 0x26, 0x53, 0xa7, 0xae, 0x82, 0x4d, 0xa9, 0x1c, 0x4b, 0xc1, 0x1d, 0x80, 0xfa, 0x49, - 0x29, 0xe4, 0x9d, 0xfb, 0xc0, 0x16, 0x98, 0xcf, 0xf4, 0x8d, 0x5b, 0x03, 0x18, 0x98, 0x9f, 0x40, - 0xcf, 0xea, 0x1c, 0xf3, 0x59, 0xa8, 0x03, 0xfe, 0x08, 0x34, 0xcf, 0x04, 0x2b, 0xc8, 0x61, 0x39, - 0xcf, 0xdd, 0x86, 0x99, 0x99, 0x7b, 0xb0, 0x22, 0xed, 0x03, 0x7b, 0x8c, 0xe5, 0x6e, 0x56, 0xcf, - 0xea, 0xb7, 0x06, 0x3b, 0x77, 0x49, 0x43, 0x69, 0x85, 0x3a, 0xe1, 0x1f, 0x80, 0x8d, 0x53, 0x9a, - 0x25, 0x37, 0x14, 0x7f, 0x45, 0x71, 0x40, 0x63, 0x4e, 0x38, 0xc7, 0x09, 0x51, 0x9c, 0x66, 0xb8, - 0x2c, 0xfd, 0xd7, 0xa0, 0x7e, 0x26, 0xb0, 0x28, 0xf9, 0x4d, 0xdb, 0xf1, 0xaa, 0xed, 0x29, 0xd8, - 0x26, 0x15, 0x29, 0xde, 0x8b, 0x29, 0xcd, 0x92, 0x88, 0xf2, 0x88, 0xcd, 0x54, 0xff, 0xe6, 0x10, - 0x2e, 0xae, 0xba, 0x9d, 0xa3, 0x95, 0x37, 0xe2, 0x27, 0x2f, 0xc2, 0x0e, 0xb9, 0x5d, 0xcf, 0x06, - 0xbf, 0x6a, 0xa0, 0x7d, 0xa8, 0x4e, 0x7b, 0x46, 0x8a, 0x8a, 0x4e, 0x08, 0x3c, 0x35, 0xaf, 0x03, - 0xba, 0xc1, 0x9d, 0x37, 0x19, 0x28, 0x35, 0xd0, 0xdb, 0xef, 0x3e, 0xe8, 0xe9, 0x13, 0xf9, 0x9d, - 0x8f, 0xdf, 0x7e, 0x7e, 0xae, 0x6d, 0xc2, 0x3a, 0x4a, 0x14, 0x08, 0xdf, 0x1a, 0x1f, 0xf4, 0xee, - 0x75, 0xae, 0x1c, 0x43, 0xee, 0xfe, 0xd3, 0x37, 0xf4, 0x1d, 0x45, 0x6f, 0xc3, 0x16, 0xe2, 0xd2, - 0x42, 0xb1, 0xa4, 0xbe, 0xd4, 0x63, 0x85, 0xff, 0xdf, 0xeb, 0x96, 0xa2, 0x01, 0xbb, 0x0f, 0x59, - 0x86, 0xd9, 0x56, 0xcc, 0x06, 0xb4, 0x51, 0x2e, 0x29, 0xe7, 0xcb, 0x79, 0xc3, 0xdd, 0xbf, 0x4e, - 0x23, 0x65, 0x43, 0xdc, 0x7b, 0xd8, 0x34, 0xcc, 0x2d, 0xc5, 0x6c, 0xc2, 0x06, 0xe2, 0x4a, 0x1f, - 0x3e, 0xf9, 0xba, 0xf0, 0xac, 0xcb, 0x85, 0x67, 0xfd, 0x58, 0x78, 0xd6, 0xa7, 0x6b, 0x6f, 0xed, - 0xf2, 0xda, 0x5b, 0xfb, 0x7e, 0xed, 0xad, 0xbd, 0xe9, 0xcd, 0x59, 0x99, 0x06, 0x94, 0x21, 0xcd, - 0x43, 0x34, 0xd3, 0xef, 0x19, 0x2d, 0x3f, 0x12, 0xe3, 0xba, 0xfa, 0xeb, 0x1e, 0xfc, 0x09, 0x00, - 0x00, 0xff, 0xff, 0x22, 0x51, 0x32, 0xf9, 0x37, 0x04, 0x00, 0x00, + // 602 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x94, 0xcb, 0x6e, 0xda, 0x4e, + 0x14, 0xc6, 0x63, 0x12, 0x43, 0x18, 0x04, 0x89, 0x26, 0xfa, 0x4b, 0xfe, 0x3b, 0xa9, 0x89, 0xbc, + 0x22, 0x8b, 0x7a, 0x24, 0xa2, 0xee, 0xba, 0xa2, 0x24, 0x15, 0x6a, 0xa5, 0x20, 0x13, 0xa9, 0x6a, + 0x37, 0xd6, 0x80, 0x27, 0xc6, 0xc2, 0x78, 0x2c, 0xcf, 0xd8, 0xbd, 0x2c, 0xfb, 0x04, 0x95, 0xfa, + 0x20, 0x7d, 0x8d, 0x2e, 0x23, 0x75, 0xd3, 0x55, 0x54, 0x41, 0x17, 0xdd, 0xf6, 0x0d, 0xaa, 0xb9, + 0x40, 0x2e, 0xa5, 0xbb, 0x39, 0xdf, 0xf7, 0x9d, 0xdf, 0xcc, 0x1c, 0x06, 0x83, 0x56, 0x58, 0x32, + 0x92, 0x97, 0x24, 0xf7, 0xb2, 0x9c, 0x72, 0x0a, 0x9b, 0x21, 0xc9, 0xca, 0xf8, 0x83, 0xa7, 0x44, + 0xfb, 0x28, 0xa2, 0x34, 0x4a, 0x08, 0xc2, 0x59, 0x8c, 0x70, 0x9a, 0x52, 0x8e, 0x79, 0x4c, 0x53, + 0xa6, 0xc2, 0xf6, 0xe3, 0x28, 0xe6, 0xd3, 0x62, 0xec, 0x4d, 0xe8, 0x1c, 0x45, 0x34, 0xa2, 0x48, + 0xca, 0xe3, 0xe2, 0x4a, 0x56, 0xb2, 0x90, 0x2b, 0x1d, 0x6f, 0x86, 0xe5, 0x9c, 0x86, 0x24, 0x51, + 0xa5, 0xfb, 0xa5, 0x02, 0xcc, 0xe7, 0x39, 0xce, 0xa6, 0xf6, 0x6f, 0x03, 0x98, 0x83, 0x34, 0x2b, + 0x38, 0xb4, 0x40, 0x8d, 0xe3, 0x3c, 0x22, 0x9c, 0x59, 0xc6, 0xf1, 0x76, 0xa7, 0xee, 0xaf, 0x4a, + 0xd8, 0x06, 0x8d, 0xb7, 0x31, 0x9f, 0x06, 0x93, 0x84, 0x32, 0x12, 0x5a, 0x95, 0x63, 0xa3, 0xb3, + 0xeb, 0x03, 0x21, 0x3d, 0x93, 0x0a, 0x3c, 0x01, 0xfb, 0xa2, 0xa2, 0x05, 0x0f, 0x62, 0x46, 0x13, + 0xcc, 0x49, 0x68, 0x6d, 0xcb, 0xd4, 0x9e, 0xd6, 0x07, 0x5a, 0x86, 0x48, 0xb1, 0x44, 0x34, 0xcb, + 0x99, 0xb5, 0x23, 0x52, 0xbd, 0xd6, 0xe2, 0xa6, 0x0d, 0x5e, 0x29, 0x79, 0xe8, 0x33, 0xc5, 0x16, + 0xeb, 0x9c, 0xc1, 0x2e, 0xf8, 0x6f, 0xd5, 0x40, 0xde, 0x71, 0x92, 0xa7, 0x38, 0x09, 0x42, 0x92, + 0x31, 0xcb, 0x94, 0x1b, 0x1c, 0x68, 0xf3, 0x4c, 0x7b, 0x7d, 0x92, 0x31, 0xf8, 0x08, 0x48, 0x42, + 0x70, 0x45, 0xf8, 0x64, 0x6a, 0x55, 0x65, 0xb0, 0x2e, 0x94, 0x73, 0x21, 0xd8, 0x5d, 0x50, 0xbd, + 0x28, 0xb8, 0xb8, 0x73, 0x07, 0x98, 0x1c, 0xb3, 0x99, 0xba, 0x71, 0xa3, 0x0b, 0x3d, 0xfd, 0x13, + 0xa8, 0x59, 0x5d, 0x62, 0x36, 0xf3, 0x55, 0xc0, 0x1d, 0x80, 0xfa, 0x88, 0xd3, 0x9c, 0xf4, 0x8b, + 0x79, 0x66, 0xd7, 0xf4, 0xcc, 0xec, 0xd3, 0x35, 0xe9, 0x04, 0x98, 0x63, 0x2c, 0x76, 0x33, 0x8e, + 0x8d, 0x4e, 0xa3, 0x7b, 0x70, 0x9f, 0xd4, 0x13, 0x96, 0xaf, 0x12, 0xee, 0x29, 0xd8, 0x19, 0xc6, + 0x69, 0x74, 0x4b, 0x71, 0xd7, 0x14, 0x0b, 0xd4, 0xe6, 0x84, 0x31, 0x1c, 0x11, 0xc9, 0xa9, 0xfb, + 0xab, 0xd2, 0x7d, 0x0d, 0xaa, 0x23, 0x8e, 0x79, 0xc1, 0x6e, 0xdb, 0xce, 0xd7, 0x6d, 0x4f, 0xc1, + 0x3e, 0x29, 0x49, 0xfe, 0x9e, 0x4f, 0xe3, 0x34, 0x0a, 0x62, 0x16, 0xd0, 0x99, 0xec, 0xdf, 0xed, + 0xc1, 0xc5, 0x4d, 0xbb, 0x75, 0xb6, 0xf6, 0x06, 0xec, 0xe2, 0x85, 0xdf, 0x22, 0x77, 0xeb, 0x59, + 0xf7, 0x57, 0x05, 0x34, 0xfb, 0xf2, 0xb4, 0x23, 0x92, 0x97, 0xf1, 0x84, 0xc0, 0xa1, 0x7e, 0x1d, + 0xd0, 0xf6, 0xee, 0xbd, 0x49, 0x4f, 0xaa, 0x9e, 0xda, 0xfe, 0x70, 0xa3, 0xa7, 0x4e, 0xe4, 0xb6, + 0x3e, 0x7e, 0xfb, 0xf9, 0xb9, 0xb2, 0x0b, 0xab, 0x28, 0x92, 0x20, 0x7c, 0x67, 0x7c, 0xd0, 0x79, + 0xd0, 0xb9, 0x76, 0x34, 0xb9, 0xfd, 0x4f, 0x5f, 0xd3, 0x0f, 0x24, 0xbd, 0x09, 0x1b, 0x88, 0x09, + 0x0b, 0x85, 0x82, 0xfa, 0x52, 0x8d, 0x15, 0xfe, 0xff, 0xa0, 0x5b, 0x88, 0x1a, 0x6c, 0x6f, 0xb2, + 0x34, 0xb3, 0x29, 0x99, 0x35, 0x68, 0xa2, 0x4c, 0x50, 0x2e, 0x57, 0xf3, 0x86, 0x87, 0x7f, 0x9d, + 0x46, 0xc8, 0x9a, 0x78, 0xb4, 0xd9, 0xd4, 0xcc, 0x3d, 0xc9, 0xac, 0xc3, 0x1a, 0x62, 0x52, 0xef, + 0x3d, 0xf9, 0xba, 0x70, 0x8c, 0xeb, 0x85, 0x63, 0xfc, 0x58, 0x38, 0xc6, 0xa7, 0xa5, 0xb3, 0x75, + 0xbd, 0x74, 0xb6, 0xbe, 0x2f, 0x9d, 0xad, 0x37, 0x87, 0x73, 0x5a, 0x24, 0x5e, 0x4c, 0x91, 0xe2, + 0xa1, 0x6c, 0x16, 0xa1, 0xd5, 0xf7, 0x61, 0x5c, 0x95, 0xff, 0xda, 0xd3, 0x3f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x74, 0x59, 0x35, 0x4f, 0x32, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/internal/dvserver/dvserver.pb.gw.go b/pkg/dvserver/dvserver.pb.gw.go similarity index 100% rename from internal/dvserver/dvserver.pb.gw.go rename to pkg/dvserver/dvserver.pb.gw.go diff --git a/internal/dvserver/pages.go b/pkg/dvserver/pages.go similarity index 100% rename from internal/dvserver/pages.go rename to pkg/dvserver/pages.go diff --git a/internal/dvserver/server.go b/pkg/dvserver/server.go similarity index 99% rename from internal/dvserver/server.go rename to pkg/dvserver/server.go index 3e214f967..91609943c 100644 --- a/internal/dvserver/server.go +++ b/pkg/dvserver/server.go @@ -26,8 +26,8 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "moul.io/depviz/v3/internal/dvcore" "moul.io/depviz/v3/pkg/chiutil" + "moul.io/depviz/v3/pkg/dvcore" "moul.io/multipmuri" ) diff --git a/pkg/dvstore/doc.go b/pkg/dvstore/doc.go new file mode 100644 index 000000000..c61c7ab8a --- /dev/null +++ b/pkg/dvstore/doc.go @@ -0,0 +1 @@ +package dvstore // import "moul.io/depviz/v3/pkg/dvstore" diff --git a/internal/dvstore/query.go b/pkg/dvstore/query.go similarity index 98% rename from internal/dvstore/query.go rename to pkg/dvstore/query.go index a0bbdcb5e..3f43ed844 100644 --- a/internal/dvstore/query.go +++ b/pkg/dvstore/query.go @@ -11,7 +11,7 @@ import ( "github.com/cayleygraph/cayley/schema" "github.com/cayleygraph/quad" "go.uber.org/zap" - "moul.io/depviz/v3/internal/dvmodel" + "moul.io/depviz/v3/pkg/dvmodel" "moul.io/multipmuri" ) diff --git a/internal/dvstore/query_test.go b/pkg/dvstore/query_test.go similarity index 97% rename from internal/dvstore/query_test.go rename to pkg/dvstore/query_test.go index f47e2ef97..087f20e3e 100644 --- a/internal/dvstore/query_test.go +++ b/pkg/dvstore/query_test.go @@ -8,8 +8,8 @@ import ( _ "github.com/cayleygraph/quad/json" "github.com/stretchr/testify/assert" - "moul.io/depviz/v3/internal/dvparser" - "moul.io/depviz/v3/internal/testutil" + "moul.io/depviz/v3/pkg/dvparser" + "moul.io/depviz/v3/pkg/testutil" "moul.io/godev" "moul.io/multipmuri" ) diff --git a/internal/dvstore/schema.go b/pkg/dvstore/schema.go similarity index 90% rename from internal/dvstore/schema.go rename to pkg/dvstore/schema.go index d4922fdbd..a7010d92e 100644 --- a/internal/dvstore/schema.go +++ b/pkg/dvstore/schema.go @@ -2,7 +2,7 @@ package dvstore import ( "github.com/cayleygraph/cayley/schema" - "moul.io/depviz/v3/internal/dvmodel" + "moul.io/depviz/v3/pkg/dvmodel" ) func Schema() *schema.Config { diff --git a/internal/dvstore/testdata/.gitkeep b/pkg/dvstore/testdata/.gitkeep similarity index 100% rename from internal/dvstore/testdata/.gitkeep rename to pkg/dvstore/testdata/.gitkeep diff --git a/internal/dvstore/testdata/golden.all-depviz-test.pq b/pkg/dvstore/testdata/golden.all-depviz-test.pq similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test.pq rename to pkg/dvstore/testdata/golden.all-depviz-test.pq diff --git a/internal/dvstore/testdata/golden.all-depviz-test_moul-and-moulbot-depviz-test.json b/pkg/dvstore/testdata/golden.all-depviz-test_moul-and-moulbot-depviz-test.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_moul-and-moulbot-depviz-test.json rename to pkg/dvstore/testdata/golden.all-depviz-test_moul-and-moulbot-depviz-test.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_moul-depviz-test.json b/pkg/dvstore/testdata/golden.all-depviz-test_moul-depviz-test.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_moul-depviz-test.json rename to pkg/dvstore/testdata/golden.all-depviz-test_moul-depviz-test.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_moulbot-depviz-test.json b/pkg/dvstore/testdata/golden.all-depviz-test_moulbot-depviz-test.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_moulbot-depviz-test.json rename to pkg/dvstore/testdata/golden.all-depviz-test_moulbot-depviz-test.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld-all-flags.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld-all-flags.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld-all-flags.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld-all-flags.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld-light.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld-light.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld-light.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld-light.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld-with-closed.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld-with-closed.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld-with-closed.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld-with-closed.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld-without-external-deps.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld-without-external-deps.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld-without-external-deps.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld-without-external-deps.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld-without-isolated.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld-without-isolated.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld-without-isolated.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld-without-isolated.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld-without-prs.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld-without-prs.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld-without-prs.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld-without-prs.json diff --git a/internal/dvstore/testdata/golden.all-depviz-test_theworld.json b/pkg/dvstore/testdata/golden.all-depviz-test_theworld.json similarity index 100% rename from internal/dvstore/testdata/golden.all-depviz-test_theworld.json rename to pkg/dvstore/testdata/golden.all-depviz-test_theworld.json diff --git a/internal/dvstore/testdata/golden.moul-depviz-test.pq b/pkg/dvstore/testdata/golden.moul-depviz-test.pq similarity index 100% rename from internal/dvstore/testdata/golden.moul-depviz-test.pq rename to pkg/dvstore/testdata/golden.moul-depviz-test.pq diff --git a/internal/dvstore/testdata/golden.moulbot-depviz-test.pq b/pkg/dvstore/testdata/golden.moulbot-depviz-test.pq similarity index 100% rename from internal/dvstore/testdata/golden.moulbot-depviz-test.pq rename to pkg/dvstore/testdata/golden.moulbot-depviz-test.pq diff --git a/internal/dvstore/testing.go b/pkg/dvstore/testing.go similarity index 99% rename from internal/dvstore/testing.go rename to pkg/dvstore/testing.go index ea427549c..2ce2e2836 100644 --- a/internal/dvstore/testing.go +++ b/pkg/dvstore/testing.go @@ -8,9 +8,11 @@ import ( "github.com/cayleygraph/cayley" "github.com/cayleygraph/cayley/graph" + // required by cayley _ "github.com/cayleygraph/cayley/graph/kv/bolt" "github.com/cayleygraph/quad" + // required by cayley _ "github.com/cayleygraph/quad/gml" // required by cayley diff --git a/internal/dvstore/testing_test.go b/pkg/dvstore/testing_test.go similarity index 100% rename from internal/dvstore/testing_test.go rename to pkg/dvstore/testing_test.go diff --git a/pkg/githubprovider/doc.go b/pkg/githubprovider/doc.go new file mode 100644 index 000000000..1d9b1e4c1 --- /dev/null +++ b/pkg/githubprovider/doc.go @@ -0,0 +1 @@ +package githubprovider // import "moul.io/depviz/v3/pkg/githubprovider" diff --git a/internal/githubprovider/github.go b/pkg/githubprovider/github.go similarity index 98% rename from internal/githubprovider/github.go rename to pkg/githubprovider/github.go index 0765d34b6..fcdcb8645 100644 --- a/internal/githubprovider/github.go +++ b/pkg/githubprovider/github.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-github/v30/github" "go.uber.org/zap" "golang.org/x/oauth2" - "moul.io/depviz/v3/internal/dvmodel" + "moul.io/depviz/v3/pkg/dvmodel" "moul.io/multipmuri" ) diff --git a/internal/githubprovider/model.go b/pkg/githubprovider/model.go similarity index 99% rename from internal/githubprovider/model.go rename to pkg/githubprovider/model.go index da72f19e8..b92e5e944 100644 --- a/internal/githubprovider/model.go +++ b/pkg/githubprovider/model.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-github/v30/github" "github.com/xhit/go-str2duration/v2" "go.uber.org/zap" - "moul.io/depviz/v3/internal/dvmodel" - "moul.io/depviz/v3/internal/dvparser" + "moul.io/depviz/v3/pkg/dvmodel" + "moul.io/depviz/v3/pkg/dvparser" "moul.io/multipmuri" "moul.io/multipmuri/pmbodyparser" ) diff --git a/internal/gomodhack/hack.go b/pkg/gomodhack/hack.go similarity index 100% rename from internal/gomodhack/hack.go rename to pkg/gomodhack/hack.go diff --git a/internal/gomodhack/hack_untools.go b/pkg/gomodhack/hack_untools.go similarity index 100% rename from internal/gomodhack/hack_untools.go rename to pkg/gomodhack/hack_untools.go diff --git a/pkg/testutil/doc.go b/pkg/testutil/doc.go new file mode 100644 index 000000000..892425b55 --- /dev/null +++ b/pkg/testutil/doc.go @@ -0,0 +1 @@ +package testutil // import "moul.io/depviz/v3/pkg/testutil" diff --git a/internal/testutil/golden.go b/pkg/testutil/golden.go similarity index 100% rename from internal/testutil/golden.go rename to pkg/testutil/golden.go diff --git a/internal/testutil/logging.go b/pkg/testutil/logging.go similarity index 100% rename from internal/testutil/logging.go rename to pkg/testutil/logging.go diff --git a/internal/testutil/skip.go b/pkg/testutil/skip.go similarity index 100% rename from internal/testutil/skip.go rename to pkg/testutil/skip.go