Remove authorizer and directory subcommands

aserto-dev · Apr 11, 2024 · ef127ef · ef127ef
1 parent d35f91c
commit ef127ef
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 899 deletions.
diff --git a/go.mod b/go.mod
@@ -134,6 +134,7 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/moby v26.0.0+incompatible // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/nats-io/jwt/v2 v2.5.5 // indirect

diff --git a/go.sum b/go.sum
@@ -810,6 +810,8 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
+github.com/moby/moby v26.0.0+incompatible h1:2n9/cIWkxiEI1VsWgTGgXhxIWUbv42PyxEP9L+RReC0=
+github.com/moby/moby v26.0.0+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
 github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=

diff --git a/pkg/app/edgedir.go b/pkg/app/edgedir.go
@@ -19,7 +19,6 @@ import (
 	dsOpenAPI "github.com/aserto-dev/openapi-directory/publish/directory"
 	builder "github.com/aserto-dev/service-host"
 	"github.com/aserto-dev/topaz/pkg/rapidoc"
-	"github.com/samber/lo"
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/samber/lo"

diff --git a/pkg/cli/clients/config.go b/pkg/cli/clients/config.go
@@ -0,0 +1,9 @@
+package clients
+
+type Config struct {
+	Host     string `flag:"host" short:"H" env:"HOST" help:"directory service address"`
+	APIKey   string `flag:"api-key" short:"k" env:"API_KEY" help:"directory API key"`
+	Token    string `flag:"token" short:"t" env:"TOKEN" help:"JWT used for connection"`
+	Insecure bool   `flag:"insecure" short:"i" env:"INSECURE" help:"skip TLS verification"`
+	TenantID string `flag:"tenant-id" help:"" env:"TENANT_ID" `
+}
diff --git a/pkg/cli/clients/directory_client.go b/pkg/cli/clients/directory_client.go
@@ -13,14 +13,6 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
-type Config struct {
-	Host     string `flag:"host" short:"H" env:"HOST" help:"directory service address"`
-	APIKey   string `flag:"api-key" short:"k" env:"API_KEY" help:"directory API key"`
-	Token    string `flag:"token" short:"t" env:"TOKEN" help:"JWT used for connection"`
-	Insecure bool   `flag:"insecure" short:"i" env:"INSECURE" help:"skip TLS verification"`
-	TenantID string `flag:"tenant-id" help:"" env:"TENANT_ID" `
-}
-
 func NewDirectoryClient(c *cc.CommonCtx, cfg *Config) (*dsc.Client, error) {
 
 	if cfg.Host == "" {

diff --git a/pkg/cli/cmd/authorizer/authorizer.go b/pkg/cli/cmd/authorizer/authorizer.go
diff --git a/pkg/cli/cmd/authorizer/decisiontree.go b/pkg/cli/cmd/authorizer/decisiontree.go
diff --git a/pkg/cli/cmd/authorizer/eval.go b/pkg/cli/cmd/authorizer/eval.go
diff --git a/pkg/cli/cmd/authorizer/get-policy.go b/pkg/cli/cmd/authorizer/get-policy.go
diff --git a/pkg/cli/cmd/authorizer/list-policies.go b/pkg/cli/cmd/authorizer/list-policies.go
diff --git a/pkg/cli/cmd/authorizer/params.go b/pkg/cli/cmd/authorizer/params.go
diff --git a/pkg/cli/cmd/authorizer/query.go b/pkg/cli/cmd/authorizer/query.go
diff --git a/pkg/cli/cmd/directory/backup.go → pkg/cli/cmd/backup.go b/pkg/cli/cmd/directory/backup.go → pkg/cli/cmd/backup.go
@@ -1,4 +1,4 @@
-package directory
+package cmd
 
 import (
 	"os"