From 7b30571aff8e9b5f3de768bd50d0520dd56ec5f7 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 14 Sep 2021 16:05:03 +0200 Subject: [PATCH] switch from micro/cli/v2 to urfave/cli/v2, like https://github.com/asim/go-micro/pull/2224 --- accounts/pkg/command/add_account.go | 2 +- accounts/pkg/command/inspect_account.go | 2 +- accounts/pkg/command/list_accounts.go | 2 +- accounts/pkg/command/rebuild_index.go | 2 +- accounts/pkg/command/remove_account.go | 2 +- accounts/pkg/command/root.go | 2 +- accounts/pkg/command/server.go | 2 +- accounts/pkg/command/update_account.go | 2 +- accounts/pkg/command/version.go | 2 +- accounts/pkg/flagset/flagset.go | 2 +- accounts/pkg/server/grpc/option.go | 2 +- accounts/pkg/server/http/option.go | 2 +- glauth/pkg/command/health.go | 2 +- glauth/pkg/command/root.go | 2 +- glauth/pkg/command/server.go | 2 +- glauth/pkg/flagset/flagset.go | 2 +- go.mod | 4 ++-- go.sum | 7 ++++--- graph-explorer/pkg/command/health.go | 2 +- graph-explorer/pkg/command/root.go | 2 +- graph-explorer/pkg/command/server.go | 2 +- graph-explorer/pkg/flagset/flagset.go | 2 +- graph-explorer/pkg/server/http/option.go | 4 ++-- graph/pkg/command/health.go | 2 +- graph/pkg/command/root.go | 2 +- graph/pkg/command/server.go | 2 +- graph/pkg/flagset/flagset.go | 2 +- graph/pkg/server/http/option.go | 2 +- idp/pkg/command/health.go | 2 +- idp/pkg/command/root.go | 2 +- idp/pkg/command/server.go | 2 +- idp/pkg/command/version.go | 2 +- idp/pkg/flagset/flagset.go | 2 +- idp/pkg/server/http/option.go | 2 +- ocis-pkg/indexer/test/test.go | 2 +- ocis-pkg/service/grpc/option.go | 2 +- ocis-pkg/service/http/option.go | 2 +- ocis/pkg/command/accounts.go | 3 ++- ocis/pkg/command/common.go | 2 +- ocis/pkg/command/glauth.go | 2 +- ocis/pkg/command/health.go | 2 +- ocis/pkg/command/idp.go | 2 +- ocis/pkg/command/kill.go | 2 +- ocis/pkg/command/list.go | 2 +- ocis/pkg/command/ocs.go | 3 ++- ocis/pkg/command/proxy.go | 3 ++- ocis/pkg/command/root.go | 2 +- ocis/pkg/command/run.go | 2 +- ocis/pkg/command/server.go | 3 ++- ocis/pkg/command/settings.go | 3 ++- ocis/pkg/command/storageappprovider.go | 3 ++- ocis/pkg/command/storageauthbasic.go | 3 ++- ocis/pkg/command/storageauthbearer.go | 3 ++- ocis/pkg/command/storagefrontend.go | 3 ++- ocis/pkg/command/storagegateway.go | 3 ++- ocis/pkg/command/storagegroupprovider.go | 3 ++- ocis/pkg/command/storagehome.go | 3 ++- ocis/pkg/command/storagemetadata.go | 2 +- ocis/pkg/command/storagepubliclink.go | 3 ++- ocis/pkg/command/storagesharing.go | 3 ++- ocis/pkg/command/storageuserprovider.go | 3 ++- ocis/pkg/command/storageusers.go | 3 ++- ocis/pkg/command/store.go | 3 ++- ocis/pkg/command/thumbnails.go | 3 ++- ocis/pkg/command/version.go | 2 +- ocis/pkg/command/web.go | 2 +- ocis/pkg/command/webdav.go | 3 ++- ocis/pkg/flagset/flagset.go | 2 +- ocis/pkg/register/command.go | 2 +- ocis/pkg/runtime/options.go | 2 +- ocs/pkg/command/health.go | 2 +- ocs/pkg/command/root.go | 2 +- ocs/pkg/command/server.go | 2 +- ocs/pkg/command/version.go | 2 +- ocs/pkg/flagset/flagset.go | 2 +- ocs/pkg/server/http/option.go | 4 ++-- proxy/pkg/command/health.go | 2 +- proxy/pkg/command/root.go | 2 +- proxy/pkg/command/server.go | 2 +- proxy/pkg/command/version.go | 2 +- proxy/pkg/flagset/flagset.go | 2 +- proxy/pkg/server/http/option.go | 2 +- settings/pkg/command/health.go | 2 +- settings/pkg/command/root.go | 2 +- settings/pkg/command/server.go | 2 +- settings/pkg/command/version.go | 2 +- settings/pkg/flagset/flagset.go | 2 +- settings/pkg/server/grpc/option.go | 2 +- settings/pkg/server/http/option.go | 2 +- storage/pkg/command/appprovider.go | 2 +- storage/pkg/command/authbasic.go | 2 +- storage/pkg/command/authbearer.go | 2 +- storage/pkg/command/frontend.go | 2 +- storage/pkg/command/gateway.go | 2 +- storage/pkg/command/groups.go | 2 +- storage/pkg/command/health.go | 2 +- storage/pkg/command/root.go | 2 +- storage/pkg/command/sharing.go | 2 +- storage/pkg/command/storagehome.go | 2 +- storage/pkg/command/storagemetadata.go | 2 +- storage/pkg/command/storagepubliclink.go | 2 +- storage/pkg/command/storageusers.go | 2 +- storage/pkg/command/users.go | 2 +- storage/pkg/flagset/appprovider.go | 2 +- storage/pkg/flagset/authbasic.go | 2 +- storage/pkg/flagset/authbearer.go | 2 +- storage/pkg/flagset/debug.go | 2 +- storage/pkg/flagset/drivereos.go | 2 +- storage/pkg/flagset/driverlocal.go | 2 +- storage/pkg/flagset/driverocis.go | 2 +- storage/pkg/flagset/driverowncloud.go | 2 +- storage/pkg/flagset/driverowncloudsql.go | 2 +- storage/pkg/flagset/drivers3ng.go | 2 +- storage/pkg/flagset/frontend.go | 2 +- storage/pkg/flagset/gateway.go | 2 +- storage/pkg/flagset/groups.go | 2 +- storage/pkg/flagset/health.go | 2 +- storage/pkg/flagset/ldap.go | 2 +- storage/pkg/flagset/rest.go | 2 +- storage/pkg/flagset/root.go | 2 +- storage/pkg/flagset/secret.go | 2 +- storage/pkg/flagset/sharing.go | 2 +- storage/pkg/flagset/sharingsql.go | 2 +- storage/pkg/flagset/storagehome.go | 2 +- storage/pkg/flagset/storagemetadata.go | 2 +- storage/pkg/flagset/storagepubliclink.go | 2 +- storage/pkg/flagset/storageusers.go | 2 +- storage/pkg/flagset/tracing.go | 2 +- storage/pkg/flagset/users.go | 2 +- store/pkg/command/health.go | 2 +- store/pkg/command/root.go | 2 +- store/pkg/command/server.go | 2 +- store/pkg/command/version.go | 2 +- store/pkg/flagset/flagset.go | 2 +- store/pkg/server/grpc/option.go | 2 +- thumbnails/pkg/command/health.go | 2 +- thumbnails/pkg/command/root.go | 2 +- thumbnails/pkg/command/server.go | 2 +- thumbnails/pkg/command/version.go | 2 +- thumbnails/pkg/flagset/flagset.go | 2 +- thumbnails/pkg/server/grpc/option.go | 2 +- web/pkg/command/health.go | 2 +- web/pkg/command/root.go | 2 +- web/pkg/command/server.go | 2 +- web/pkg/flagset/flagset.go | 2 +- web/pkg/server/http/option.go | 2 +- webdav/pkg/command/health.go | 2 +- webdav/pkg/command/root.go | 2 +- webdav/pkg/command/server.go | 2 +- webdav/pkg/command/version.go | 2 +- webdav/pkg/flagset/flagset.go | 2 +- webdav/pkg/server/http/option.go | 2 +- 152 files changed, 177 insertions(+), 157 deletions(-) diff --git a/accounts/pkg/command/add_account.go b/accounts/pkg/command/add_account.go index 139a499915..968b05acaf 100644 --- a/accounts/pkg/command/add_account.go +++ b/accounts/pkg/command/add_account.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/asim/go-micro/plugins/client/grpc/v3" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/urfave/cli/v2" ) // AddAccount command creates a new account diff --git a/accounts/pkg/command/inspect_account.go b/accounts/pkg/command/inspect_account.go index 3f02da36e9..14f1d37aab 100644 --- a/accounts/pkg/command/inspect_account.go +++ b/accounts/pkg/command/inspect_account.go @@ -6,11 +6,11 @@ import ( "strconv" "github.com/asim/go-micro/plugins/client/grpc/v3" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/urfave/cli/v2" ) // InspectAccount command shows detailed information about a specific account. diff --git a/accounts/pkg/command/list_accounts.go b/accounts/pkg/command/list_accounts.go index e20236b067..517c4062ec 100644 --- a/accounts/pkg/command/list_accounts.go +++ b/accounts/pkg/command/list_accounts.go @@ -6,11 +6,11 @@ import ( "strconv" "github.com/asim/go-micro/plugins/client/grpc/v3" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/urfave/cli/v2" ) // ListAccounts command lists all accounts diff --git a/accounts/pkg/command/rebuild_index.go b/accounts/pkg/command/rebuild_index.go index 57b1ac6247..cffb163882 100644 --- a/accounts/pkg/command/rebuild_index.go +++ b/accounts/pkg/command/rebuild_index.go @@ -6,9 +6,9 @@ import ( "github.com/asim/go-micro/plugins/client/grpc/v3" merrors "github.com/asim/go-micro/v3/errors" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" index "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/urfave/cli/v2" ) // RebuildIndex rebuilds the entire configured index. diff --git a/accounts/pkg/command/remove_account.go b/accounts/pkg/command/remove_account.go index 703e32daa4..cca7bf44b7 100644 --- a/accounts/pkg/command/remove_account.go +++ b/accounts/pkg/command/remove_account.go @@ -5,10 +5,10 @@ import ( "os" "github.com/asim/go-micro/plugins/client/grpc/v3" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/urfave/cli/v2" ) // RemoveAccount command deletes an existing account. diff --git a/accounts/pkg/command/root.go b/accounts/pkg/command/root.go index 17d17364c8..54c3055013 100644 --- a/accounts/pkg/command/root.go +++ b/accounts/pkg/command/root.go @@ -5,7 +5,6 @@ import ( "os" "strings" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" "github.com/owncloud/ocis/accounts/pkg/version" @@ -14,6 +13,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) var ( diff --git a/accounts/pkg/command/server.go b/accounts/pkg/command/server.go index 3ff1dcd8d6..a64c23080e 100644 --- a/accounts/pkg/command/server.go +++ b/accounts/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" @@ -15,6 +14,7 @@ import ( "github.com/owncloud/ocis/accounts/pkg/server/http" svc "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis/accounts/pkg/tracing" + "github.com/urfave/cli/v2" ) // Server is the entry point for the server command. diff --git a/accounts/pkg/command/update_account.go b/accounts/pkg/command/update_account.go index 9237e966cb..6d15546ced 100644 --- a/accounts/pkg/command/update_account.go +++ b/accounts/pkg/command/update_account.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/asim/go-micro/plugins/client/grpc/v3" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/urfave/cli/v2" "google.golang.org/genproto/protobuf/field_mask" ) diff --git a/accounts/pkg/command/version.go b/accounts/pkg/command/version.go index 1ceb634082..c89358db52 100644 --- a/accounts/pkg/command/version.go +++ b/accounts/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/accounts/pkg/flagset/flagset.go b/accounts/pkg/flagset/flagset.go index 4a7954f662..dd4db4e61f 100644 --- a/accounts/pkg/flagset/flagset.go +++ b/accounts/pkg/flagset/flagset.go @@ -1,10 +1,10 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocis-pkg/flags" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/accounts/pkg/server/grpc/option.go b/accounts/pkg/server/grpc/option.go index 86d158f6f4..a00017e8fb 100644 --- a/accounts/pkg/server/grpc/option.go +++ b/accounts/pkg/server/grpc/option.go @@ -3,11 +3,11 @@ package grpc import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/metrics" svc "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/accounts/pkg/server/http/option.go b/accounts/pkg/server/http/option.go index 664a2cdfe8..2614c5c94f 100644 --- a/accounts/pkg/server/http/option.go +++ b/accounts/pkg/server/http/option.go @@ -3,11 +3,11 @@ package http import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/metrics" svc "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/glauth/pkg/command/health.go b/glauth/pkg/command/health.go index 1821e87c0d..3deb2db70d 100644 --- a/glauth/pkg/command/health.go +++ b/glauth/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/glauth/pkg/config" "github.com/owncloud/ocis/glauth/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/glauth/pkg/command/root.go b/glauth/pkg/command/root.go index 55404851da..bcfe962479 100644 --- a/glauth/pkg/command/root.go +++ b/glauth/pkg/command/root.go @@ -5,7 +5,6 @@ import ( "os" "strings" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/glauth/pkg/config" "github.com/owncloud/ocis/glauth/pkg/flagset" "github.com/owncloud/ocis/glauth/pkg/version" @@ -14,6 +13,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-glauth command. diff --git a/glauth/pkg/command/server.go b/glauth/pkg/command/server.go index 526e3152da..e15f9a1be0 100644 --- a/glauth/pkg/command/server.go +++ b/glauth/pkg/command/server.go @@ -5,7 +5,6 @@ import ( "strings" glauthcfg "github.com/glauth/glauth/pkg/config" - "github.com/micro/cli/v2" "github.com/oklog/run" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/glauth/pkg/config" @@ -17,6 +16,7 @@ import ( pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/glauth/pkg/flagset/flagset.go b/glauth/pkg/flagset/flagset.go index defece35ce..b29cc59b46 100644 --- a/glauth/pkg/flagset/flagset.go +++ b/glauth/pkg/flagset/flagset.go @@ -3,10 +3,10 @@ package flagset import ( "path" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/glauth/pkg/config" "github.com/owncloud/ocis/ocis-pkg/flags" pkgos "github.com/owncloud/ocis/ocis-pkg/os" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/go.mod b/go.mod index 0fc057f47e..7ec387f62e 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20210812172626-c7195aae9817 github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210812172626-c7195aae9817 github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210812172626-c7195aae9817 - github.com/asim/go-micro/v3 v3.6.0 + github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d github.com/blevesearch/bleve/v2 v2.1.0 github.com/coreos/go-oidc/v3 v3.0.0 github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de @@ -38,7 +38,6 @@ require ( github.com/justinas/alice v1.2.0 github.com/libregraph/lico v0.34.1-0.20210803054646-b584e0372224 github.com/mennanov/fieldmask-utils v0.4.0 - github.com/micro/cli/v2 v2.1.2 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484 github.com/nmcclain/ldap v0.0.0-20210720162743-7f8d1e44eeba @@ -55,6 +54,7 @@ require ( github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.7.0 github.com/thejerf/suture/v4 v4.0.1 + github.com/urfave/cli/v2 v2.3.0 github.com/yaegashi/msgraph.go v0.1.4 go.opencensus.io v0.23.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 diff --git a/go.sum b/go.sum index c1152fb2e1..321f1db02d 100644 --- a/go.sum +++ b/go.sum @@ -158,8 +158,8 @@ github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-202108121726 github.com/asim/go-micro/v3 v3.5.1/go.mod h1:OJ5DnUQmoEVQTNbKRstR7/krtYJI+QaBe/XeN5MZkqE= github.com/asim/go-micro/v3 v3.5.2-0.20210629124054-4929a7c16ecc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8= github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8= -github.com/asim/go-micro/v3 v3.6.0 h1:I6UVJBpBtWNKCjWf0dRpZznRCW9TR4DXjV4wieyGhK0= -github.com/asim/go-micro/v3 v3.6.0/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8= +github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d h1:EAmpwVkQtiT3yD286sYUs6VqZglabLq/DqfowID83F4= +github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d/go.mod h1:Vr4N4czAznfz3gPqKUznocbo5l0knZRIpzh5+0Hml7I= github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= @@ -768,7 +768,6 @@ github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 h1:Z/i1e+gTZrmcGeZy github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103/go.mod h1:o9YPB5aGP8ob35Vy6+vyq3P3bWe7NQWzf+JLiXCiMaE= github.com/mennanov/fieldmask-utils v0.4.0 h1:MvXJgV4em1j0u2Aw2Wwd/ES8alZE9vN5FSB1SYiJ6vM= github.com/mennanov/fieldmask-utils v0.4.0/go.mod h1:lah2lHczE2ff+7SqnNKpB+YzaO7M3h5iNO4LgPTJheM= -github.com/micro/cli/v2 v2.1.2 h1:43J1lChg/rZCC1rvdqZNFSQDrGT7qfMrtp6/ztpIkEM= github.com/micro/cli/v2 v2.1.2/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -1103,7 +1102,9 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= diff --git a/graph-explorer/pkg/command/health.go b/graph-explorer/pkg/command/health.go index d42302091f..2fc86dcc07 100644 --- a/graph-explorer/pkg/command/health.go +++ b/graph-explorer/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph-explorer/pkg/config" "github.com/owncloud/ocis/graph-explorer/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/graph-explorer/pkg/command/root.go b/graph-explorer/pkg/command/root.go index d114055071..bb34554371 100644 --- a/graph-explorer/pkg/command/root.go +++ b/graph-explorer/pkg/command/root.go @@ -5,7 +5,6 @@ import ( "os" "strings" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph-explorer/pkg/config" "github.com/owncloud/ocis/graph-explorer/pkg/flagset" "github.com/owncloud/ocis/graph-explorer/pkg/version" @@ -14,6 +13,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the graph-explorer command. diff --git a/graph-explorer/pkg/command/server.go b/graph-explorer/pkg/command/server.go index 9893e554a6..fa15eaf360 100644 --- a/graph-explorer/pkg/command/server.go +++ b/graph-explorer/pkg/command/server.go @@ -4,7 +4,6 @@ import ( "context" "strings" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/graph-explorer/pkg/config" "github.com/owncloud/ocis/graph-explorer/pkg/flagset" @@ -13,6 +12,7 @@ import ( "github.com/owncloud/ocis/graph-explorer/pkg/server/http" "github.com/owncloud/ocis/graph-explorer/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/graph-explorer/pkg/flagset/flagset.go b/graph-explorer/pkg/flagset/flagset.go index 2dca27c348..30dbe0e59b 100644 --- a/graph-explorer/pkg/flagset/flagset.go +++ b/graph-explorer/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph-explorer/pkg/config" "github.com/owncloud/ocis/ocis-pkg/flags" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/graph-explorer/pkg/server/http/option.go b/graph-explorer/pkg/server/http/option.go index 7addf70edf..92b4e268c4 100644 --- a/graph-explorer/pkg/server/http/option.go +++ b/graph-explorer/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" - "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/graph-explorer/pkg/config" "github.com/owncloud/ocis/graph-explorer/pkg/metrics" + "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/graph/pkg/command/health.go b/graph/pkg/command/health.go index 7da27c3ce0..8fd0bef9c0 100644 --- a/graph/pkg/command/health.go +++ b/graph/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis/graph/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/graph/pkg/command/root.go b/graph/pkg/command/root.go index ec758502c3..be4e64fdb7 100644 --- a/graph/pkg/command/root.go +++ b/graph/pkg/command/root.go @@ -8,13 +8,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/thejerf/suture/v4" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis/graph/pkg/flagset" "github.com/owncloud/ocis/graph/pkg/version" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/spf13/viper" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-graph command. diff --git a/graph/pkg/command/server.go b/graph/pkg/command/server.go index e1700f564e..fb649db7b9 100644 --- a/graph/pkg/command/server.go +++ b/graph/pkg/command/server.go @@ -4,7 +4,6 @@ import ( "context" "strings" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis/graph/pkg/flagset" @@ -13,6 +12,7 @@ import ( "github.com/owncloud/ocis/graph/pkg/server/http" "github.com/owncloud/ocis/graph/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go index a259ac8162..76f9d36447 100644 --- a/graph/pkg/flagset/flagset.go +++ b/graph/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis/ocis-pkg/flags" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/graph/pkg/server/http/option.go b/graph/pkg/server/http/option.go index 96c8749517..e1404d3744 100644 --- a/graph/pkg/server/http/option.go +++ b/graph/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis/graph/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/idp/pkg/command/health.go b/idp/pkg/command/health.go index ab38e13102..7e03cabc72 100644 --- a/idp/pkg/command/health.go +++ b/idp/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/idp/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/idp/pkg/command/root.go b/idp/pkg/command/root.go index 140d036111..990ae4e91a 100644 --- a/idp/pkg/command/root.go +++ b/idp/pkg/command/root.go @@ -5,7 +5,6 @@ import ( "os" "strings" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/idp/pkg/flagset" "github.com/owncloud/ocis/idp/pkg/version" @@ -14,6 +13,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-idp command. diff --git a/idp/pkg/command/server.go b/idp/pkg/command/server.go index ebc79749ea..425fc8ad13 100644 --- a/idp/pkg/command/server.go +++ b/idp/pkg/command/server.go @@ -4,7 +4,6 @@ import ( "context" "strings" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/idp/pkg/flagset" @@ -13,6 +12,7 @@ import ( "github.com/owncloud/ocis/idp/pkg/server/http" "github.com/owncloud/ocis/idp/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/idp/pkg/command/version.go b/idp/pkg/command/version.go index 10a32c5c59..5f43da1321 100644 --- a/idp/pkg/command/version.go +++ b/idp/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/idp/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/idp/pkg/flagset/flagset.go b/idp/pkg/flagset/flagset.go index 7ee2542b8e..2a8d9189f2 100644 --- a/idp/pkg/flagset/flagset.go +++ b/idp/pkg/flagset/flagset.go @@ -3,10 +3,10 @@ package flagset import ( "path" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/ocis-pkg/flags" pkgos "github.com/owncloud/ocis/ocis-pkg/os" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/idp/pkg/server/http/option.go b/idp/pkg/server/http/option.go index 3fed9712df..9f12bd9b3d 100644 --- a/idp/pkg/server/http/option.go +++ b/idp/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/idp/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/ocis-pkg/indexer/test/test.go b/ocis-pkg/indexer/test/test.go index 36b846fe88..7b69f7eaad 100644 --- a/ocis-pkg/indexer/test/test.go +++ b/ocis-pkg/indexer/test/test.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/storage/pkg/command" mcfg "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) func init() { diff --git a/ocis-pkg/service/grpc/option.go b/ocis-pkg/service/grpc/option.go index 88528416e7..b2fa3823b1 100644 --- a/ocis-pkg/service/grpc/option.go +++ b/ocis-pkg/service/grpc/option.go @@ -3,8 +3,8 @@ package grpc import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/ocis-pkg/service/http/option.go b/ocis-pkg/service/http/option.go index a88062389c..108dcc9e76 100644 --- a/ocis-pkg/service/http/option.go +++ b/ocis-pkg/service/http/option.go @@ -5,8 +5,8 @@ import ( "crypto/tls" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/ocis/pkg/command/accounts.go b/ocis/pkg/command/accounts.go index 96da23edd3..94a3820221 100644 --- a/ocis/pkg/command/accounts.go +++ b/ocis/pkg/command/accounts.go @@ -1,15 +1,16 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/accounts/pkg/command" svcconfig "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis/accounts/pkg/flagset" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" + "github.com/urfave/cli/v2" ) // AccountsCommand is the entrypoint for the accounts command. diff --git a/ocis/pkg/command/common.go b/ocis/pkg/command/common.go index 3f599cdb10..60af3e22ab 100644 --- a/ocis/pkg/command/common.go +++ b/ocis/pkg/command/common.go @@ -1,6 +1,6 @@ package command -import "github.com/micro/cli/v2" +import "github.com/urfave/cli/v2" func handleOriginalAction(c *cli.Context, cmd *cli.Command) error { diff --git a/ocis/pkg/command/glauth.go b/ocis/pkg/command/glauth.go index e220c89103..5b90aa76a4 100644 --- a/ocis/pkg/command/glauth.go +++ b/ocis/pkg/command/glauth.go @@ -1,13 +1,13 @@ package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/glauth/pkg/command" svcconfig "github.com/owncloud/ocis/glauth/pkg/config" "github.com/owncloud/ocis/glauth/pkg/flagset" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" + "github.com/urfave/cli/v2" ) // GLAuthCommand is the entrypoint for the glauth command. diff --git a/ocis/pkg/command/health.go b/ocis/pkg/command/health.go index ef718ac104..c65e295829 100644 --- a/ocis/pkg/command/health.go +++ b/ocis/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/flagset" "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go index 926025371d..f7981eb58e 100644 --- a/ocis/pkg/command/idp.go +++ b/ocis/pkg/command/idp.go @@ -1,13 +1,13 @@ package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/idp/pkg/command" svcconfig "github.com/owncloud/ocis/idp/pkg/config" "github.com/owncloud/ocis/idp/pkg/flagset" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" + "github.com/urfave/cli/v2" ) // IDPCommand is the entrypoint for the idp command. diff --git a/ocis/pkg/command/kill.go b/ocis/pkg/command/kill.go index e96e4a057c..70530f98af 100644 --- a/ocis/pkg/command/kill.go +++ b/ocis/pkg/command/kill.go @@ -7,9 +7,9 @@ import ( "net/rpc" "os" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/urfave/cli/v2" ) // KillCommand is the entrypoint for the kill command. diff --git a/ocis/pkg/command/list.go b/ocis/pkg/command/list.go index 137f1331c3..7d277e8bfd 100644 --- a/ocis/pkg/command/list.go +++ b/ocis/pkg/command/list.go @@ -6,9 +6,9 @@ import ( "net" "net/rpc" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/urfave/cli/v2" ) // ListCommand is the entrypoint for the list command. diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go index 80e02a9f4e..d4c30e2ddd 100644 --- a/ocis/pkg/command/ocs.go +++ b/ocis/pkg/command/ocs.go @@ -1,15 +1,16 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" "github.com/owncloud/ocis/ocs/pkg/command" svcconfig "github.com/owncloud/ocis/ocs/pkg/config" "github.com/owncloud/ocis/ocs/pkg/flagset" + "github.com/urfave/cli/v2" ) // OCSCommand is the entrypoint for the ocs command. diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go index f313383390..0586283e91 100644 --- a/ocis/pkg/command/proxy.go +++ b/ocis/pkg/command/proxy.go @@ -1,15 +1,16 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" "github.com/owncloud/ocis/proxy/pkg/command" svcconfig "github.com/owncloud/ocis/proxy/pkg/config" "github.com/owncloud/ocis/proxy/pkg/flagset" + "github.com/urfave/cli/v2" ) // ProxyCommand is the entry point for the proxy command. diff --git a/ocis/pkg/command/root.go b/ocis/pkg/command/root.go index 4a931d79d5..25cf42b9eb 100644 --- a/ocis/pkg/command/root.go +++ b/ocis/pkg/command/root.go @@ -6,8 +6,8 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/flagset" diff --git a/ocis/pkg/command/run.go b/ocis/pkg/command/run.go index 273bb1d3e5..398bb39e10 100644 --- a/ocis/pkg/command/run.go +++ b/ocis/pkg/command/run.go @@ -7,7 +7,7 @@ import ( "net/rpc" "os" - cli "github.com/micro/cli/v2" + cli "github.com/urfave/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" diff --git a/ocis/pkg/command/server.go b/ocis/pkg/command/server.go index 28b50c993b..acd66bc268 100644 --- a/ocis/pkg/command/server.go +++ b/ocis/pkg/command/server.go @@ -1,3 +1,4 @@ +//go:build !simple // +build !simple package command @@ -5,11 +6,11 @@ package command import ( "strings" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/flagset" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/runtime" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go index 1da359c11d..f084453fbe 100644 --- a/ocis/pkg/command/settings.go +++ b/ocis/pkg/command/settings.go @@ -1,15 +1,16 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" "github.com/owncloud/ocis/settings/pkg/command" svcconfig "github.com/owncloud/ocis/settings/pkg/config" "github.com/owncloud/ocis/settings/pkg/flagset" + "github.com/urfave/cli/v2" ) // SettingsCommand is the entry point for the settings command. diff --git a/ocis/pkg/command/storageappprovider.go b/ocis/pkg/command/storageappprovider.go index 883069ab74..cb60828d06 100644 --- a/ocis/pkg/command/storageappprovider.go +++ b/ocis/pkg/command/storageappprovider.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageAppProviderCommand is the entrypoint for the reva-app-provider command. diff --git a/ocis/pkg/command/storageauthbasic.go b/ocis/pkg/command/storageauthbasic.go index e7311c2be1..fe7a87eb1f 100644 --- a/ocis/pkg/command/storageauthbasic.go +++ b/ocis/pkg/command/storageauthbasic.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageAuthBasicCommand is the entrypoint for the reva-auth-basic command. diff --git a/ocis/pkg/command/storageauthbearer.go b/ocis/pkg/command/storageauthbearer.go index 15f55833c6..004d0b7936 100644 --- a/ocis/pkg/command/storageauthbearer.go +++ b/ocis/pkg/command/storageauthbearer.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageAuthBearerCommand is the entrypoint for the reva-auth-bearer command. diff --git a/ocis/pkg/command/storagefrontend.go b/ocis/pkg/command/storagefrontend.go index 8c1fc8dab8..220eabc744 100644 --- a/ocis/pkg/command/storagefrontend.go +++ b/ocis/pkg/command/storagefrontend.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageFrontendCommand is the entrypoint for the reva-frontend command. diff --git a/ocis/pkg/command/storagegateway.go b/ocis/pkg/command/storagegateway.go index de793d6f80..d0e4e61fa0 100644 --- a/ocis/pkg/command/storagegateway.go +++ b/ocis/pkg/command/storagegateway.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageGatewayCommand is the entrypoint for the reva-gateway command. diff --git a/ocis/pkg/command/storagegroupprovider.go b/ocis/pkg/command/storagegroupprovider.go index 2eb93fd36d..3f77796e38 100644 --- a/ocis/pkg/command/storagegroupprovider.go +++ b/ocis/pkg/command/storagegroupprovider.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageGroupProviderCommand is the entrypoint for the storage-groupprovider command. diff --git a/ocis/pkg/command/storagehome.go b/ocis/pkg/command/storagehome.go index 43da8a4fa2..9e025b2856 100644 --- a/ocis/pkg/command/storagehome.go +++ b/ocis/pkg/command/storagehome.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageHomeCommand is the entrypoint for the storage-home command. diff --git a/ocis/pkg/command/storagemetadata.go b/ocis/pkg/command/storagemetadata.go index ed47ebace3..90c56da007 100644 --- a/ocis/pkg/command/storagemetadata.go +++ b/ocis/pkg/command/storagemetadata.go @@ -1,12 +1,12 @@ package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageMetadataCommand is the entrypoint for the storage-metadata command. diff --git a/ocis/pkg/command/storagepubliclink.go b/ocis/pkg/command/storagepubliclink.go index f6bba71d57..0d94d5afb6 100644 --- a/ocis/pkg/command/storagepubliclink.go +++ b/ocis/pkg/command/storagepubliclink.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StoragePublicLinkCommand is the entrypoint for the reva-storage-oc command. diff --git a/ocis/pkg/command/storagesharing.go b/ocis/pkg/command/storagesharing.go index 28a04ff861..d712f9e9a3 100644 --- a/ocis/pkg/command/storagesharing.go +++ b/ocis/pkg/command/storagesharing.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageSharingCommand is the entrypoint for the reva-sharing command. diff --git a/ocis/pkg/command/storageuserprovider.go b/ocis/pkg/command/storageuserprovider.go index dcf8c90f1a..ea701a1c3b 100644 --- a/ocis/pkg/command/storageuserprovider.go +++ b/ocis/pkg/command/storageuserprovider.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageUserProviderCommand is the entrypoint for the storage-userprovider command. diff --git a/ocis/pkg/command/storageusers.go b/ocis/pkg/command/storageusers.go index f26952a099..80f32e796b 100644 --- a/ocis/pkg/command/storageusers.go +++ b/ocis/pkg/command/storageusers.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/storage/pkg/command" svcconfig "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // StorageUsersCommand is the entrypoint for the storage-users command. diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go index 6a0403eb24..48e7f3c37e 100644 --- a/ocis/pkg/command/store.go +++ b/ocis/pkg/command/store.go @@ -1,15 +1,16 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" "github.com/owncloud/ocis/store/pkg/command" svcconfig "github.com/owncloud/ocis/store/pkg/config" "github.com/owncloud/ocis/store/pkg/flagset" + "github.com/urfave/cli/v2" ) // StoreCommand is the entrypoint for the ocs command. diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go index f071e5cd8c..c3298af754 100644 --- a/ocis/pkg/command/thumbnails.go +++ b/ocis/pkg/command/thumbnails.go @@ -1,14 +1,15 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" "github.com/owncloud/ocis/thumbnails/pkg/command" "github.com/owncloud/ocis/thumbnails/pkg/flagset" + "github.com/urfave/cli/v2" svcconfig "github.com/owncloud/ocis/thumbnails/pkg/config" ) diff --git a/ocis/pkg/command/version.go b/ocis/pkg/command/version.go index ae5cd2844c..25eeeba60a 100644 --- a/ocis/pkg/command/version.go +++ b/ocis/pkg/command/version.go @@ -5,11 +5,11 @@ import ( "os" mreg "github.com/asim/go-micro/v3/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/registry" "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/urfave/cli/v2" ) // VersionCommand is the entrypoint for the version command. diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go index 199a50d3aa..431443cada 100644 --- a/ocis/pkg/command/web.go +++ b/ocis/pkg/command/web.go @@ -1,12 +1,12 @@ package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/web/pkg/command" svcconfig "github.com/owncloud/ocis/web/pkg/config" "github.com/owncloud/ocis/web/pkg/flagset" + "github.com/urfave/cli/v2" ) // WebCommand is the entrypoint for the web command. diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go index 94a6fadb88..4a9663749b 100644 --- a/ocis/pkg/command/webdav.go +++ b/ocis/pkg/command/webdav.go @@ -1,15 +1,16 @@ +//go:build !simple // +build !simple package command import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/owncloud/ocis/ocis/pkg/version" "github.com/owncloud/ocis/webdav/pkg/command" svcconfig "github.com/owncloud/ocis/webdav/pkg/config" "github.com/owncloud/ocis/webdav/pkg/flagset" + "github.com/urfave/cli/v2" ) // WebDAVCommand is the entrypoint for the webdav command. diff --git a/ocis/pkg/flagset/flagset.go b/ocis/pkg/flagset/flagset.go index e9dd545349..9b296758a1 100644 --- a/ocis/pkg/flagset/flagset.go +++ b/ocis/pkg/flagset/flagset.go @@ -1,8 +1,8 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/ocis/pkg/register/command.go b/ocis/pkg/register/command.go index b0ad28c21c..87af6b80a3 100644 --- a/ocis/pkg/register/command.go +++ b/ocis/pkg/register/command.go @@ -1,8 +1,8 @@ package register import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/urfave/cli/v2" ) var ( diff --git a/ocis/pkg/runtime/options.go b/ocis/pkg/runtime/options.go index 2fc4addd50..4c943d2995 100644 --- a/ocis/pkg/runtime/options.go +++ b/ocis/pkg/runtime/options.go @@ -1,8 +1,8 @@ package runtime import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Options is a runtime option diff --git a/ocs/pkg/command/health.go b/ocs/pkg/command/health.go index 79d866fca3..c84b6d2449 100644 --- a/ocs/pkg/command/health.go +++ b/ocs/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocs/pkg/config" "github.com/owncloud/ocis/ocs/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/ocs/pkg/command/root.go b/ocs/pkg/command/root.go index ceb2db3b03..4dcb7a95b2 100644 --- a/ocs/pkg/command/root.go +++ b/ocs/pkg/command/root.go @@ -7,13 +7,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocs/pkg/config" "github.com/owncloud/ocis/ocs/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-ocs command. diff --git a/ocs/pkg/command/server.go b/ocs/pkg/command/server.go index 18b2d151bf..344acf49ec 100644 --- a/ocs/pkg/command/server.go +++ b/ocs/pkg/command/server.go @@ -8,13 +8,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/ocs/pkg/config" "github.com/owncloud/ocis/ocs/pkg/flagset" "github.com/owncloud/ocis/ocs/pkg/metrics" "github.com/owncloud/ocis/ocs/pkg/server/debug" "github.com/owncloud/ocis/ocs/pkg/server/http" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/ocs/pkg/command/version.go b/ocs/pkg/command/version.go index 23ef966292..10c1c17df7 100644 --- a/ocs/pkg/command/version.go +++ b/ocs/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/ocs/pkg/config" "github.com/owncloud/ocis/ocs/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/ocs/pkg/flagset/flagset.go b/ocs/pkg/flagset/flagset.go index de29ac450e..a7d4c594f5 100644 --- a/ocs/pkg/flagset/flagset.go +++ b/ocs/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/ocs/pkg/config" + "github.com/urfave/cli/v2" ) // HealthWithConfig applies cfg to the root flagset diff --git a/ocs/pkg/server/http/option.go b/ocs/pkg/server/http/option.go index fadc9e00d0..3486588e30 100644 --- a/ocs/pkg/server/http/option.go +++ b/ocs/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" + "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocs/pkg/config" "github.com/owncloud/ocis/ocs/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/proxy/pkg/command/health.go b/proxy/pkg/command/health.go index 2c91138643..4dbe95aa7d 100644 --- a/proxy/pkg/command/health.go +++ b/proxy/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/proxy/pkg/config" "github.com/owncloud/ocis/proxy/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/proxy/pkg/command/root.go b/proxy/pkg/command/root.go index 7f7f5fdd5f..19b433cfc9 100644 --- a/proxy/pkg/command/root.go +++ b/proxy/pkg/command/root.go @@ -7,7 +7,6 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/proxy/pkg/config" @@ -15,6 +14,7 @@ import ( "github.com/owncloud/ocis/proxy/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-proxy command. diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go index 678acb2fd9..f8230caab8 100644 --- a/proxy/pkg/command/server.go +++ b/proxy/pkg/command/server.go @@ -12,7 +12,6 @@ import ( "github.com/cs3org/reva/pkg/token/manager/jwt" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" - "github.com/micro/cli/v2" "github.com/oklog/run" acc "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocis-pkg/conversions" @@ -32,6 +31,7 @@ import ( "github.com/owncloud/ocis/proxy/pkg/user/backend" settings "github.com/owncloud/ocis/settings/pkg/proto/v0" storepb "github.com/owncloud/ocis/store/pkg/proto/v0" + "github.com/urfave/cli/v2" "golang.org/x/oauth2" ) diff --git a/proxy/pkg/command/version.go b/proxy/pkg/command/version.go index e76dcc6a96..273db559cc 100644 --- a/proxy/pkg/command/version.go +++ b/proxy/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/proxy/pkg/config" "github.com/owncloud/ocis/proxy/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go index 32120dd331..b83a5a9d7f 100644 --- a/proxy/pkg/flagset/flagset.go +++ b/proxy/pkg/flagset/flagset.go @@ -3,10 +3,10 @@ package flagset import ( "path" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" pkgos "github.com/owncloud/ocis/ocis-pkg/os" "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/proxy/pkg/server/http/option.go b/proxy/pkg/server/http/option.go index 61fb8b40ba..bad0956ff6 100644 --- a/proxy/pkg/server/http/option.go +++ b/proxy/pkg/server/http/option.go @@ -5,10 +5,10 @@ import ( "net/http" "github.com/justinas/alice" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/proxy/pkg/config" "github.com/owncloud/ocis/proxy/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/settings/pkg/command/health.go b/settings/pkg/command/health.go index e4073e2458..72e9ea7f7d 100644 --- a/settings/pkg/command/health.go +++ b/settings/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/settings/pkg/config" "github.com/owncloud/ocis/settings/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/settings/pkg/command/root.go b/settings/pkg/command/root.go index e369d832e7..242a841a19 100644 --- a/settings/pkg/command/root.go +++ b/settings/pkg/command/root.go @@ -7,7 +7,6 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/settings/pkg/config" @@ -15,6 +14,7 @@ import ( "github.com/owncloud/ocis/settings/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-settings command. diff --git a/settings/pkg/command/server.go b/settings/pkg/command/server.go index 2336de23dc..3609762b3e 100644 --- a/settings/pkg/command/server.go +++ b/settings/pkg/command/server.go @@ -4,7 +4,6 @@ import ( "context" "strings" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/owncloud/ocis/settings/pkg/config" @@ -14,6 +13,7 @@ import ( "github.com/owncloud/ocis/settings/pkg/server/grpc" "github.com/owncloud/ocis/settings/pkg/server/http" "github.com/owncloud/ocis/settings/pkg/tracing" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/settings/pkg/command/version.go b/settings/pkg/command/version.go index 81df847f1c..fda866b626 100644 --- a/settings/pkg/command/version.go +++ b/settings/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/settings/pkg/config" "github.com/owncloud/ocis/settings/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/settings/pkg/flagset/flagset.go b/settings/pkg/flagset/flagset.go index 5c6ca32f60..185c5c0a51 100644 --- a/settings/pkg/flagset/flagset.go +++ b/settings/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/settings/pkg/config" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/settings/pkg/server/grpc/option.go b/settings/pkg/server/grpc/option.go index 119e64f300..5bea3ef47e 100644 --- a/settings/pkg/server/grpc/option.go +++ b/settings/pkg/server/grpc/option.go @@ -3,10 +3,10 @@ package grpc import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/settings/pkg/config" "github.com/owncloud/ocis/settings/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/settings/pkg/server/http/option.go b/settings/pkg/server/http/option.go index 980e1a1fe4..6f6d2bc3bd 100644 --- a/settings/pkg/server/http/option.go +++ b/settings/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/settings/pkg/config" "github.com/owncloud/ocis/settings/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go index b45e4a39f4..95b032b541 100644 --- a/storage/pkg/command/appprovider.go +++ b/storage/pkg/command/appprovider.go @@ -8,7 +8,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -17,6 +16,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // AppProvider is the entrypoint for the app provider command. diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go index 7b1bd96b97..ec37e9971a 100644 --- a/storage/pkg/command/authbasic.go +++ b/storage/pkg/command/authbasic.go @@ -9,7 +9,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // AuthBasic is the entrypoint for the auth-basic command. diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go index 31db3e83bb..4c5b49f734 100644 --- a/storage/pkg/command/authbearer.go +++ b/storage/pkg/command/authbearer.go @@ -8,7 +8,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -17,6 +16,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // AuthBearer is the entrypoint for the auth-bearer command. diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go index 680aee6d7e..ec60c372fc 100644 --- a/storage/pkg/command/frontend.go +++ b/storage/pkg/command/frontend.go @@ -11,7 +11,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/conversions" @@ -21,6 +20,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Frontend is the entrypoint for the frontend command. diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go index 37b7dcdaad..a7afaa0318 100644 --- a/storage/pkg/command/gateway.go +++ b/storage/pkg/command/gateway.go @@ -15,7 +15,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" @@ -24,6 +23,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/service/external" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Gateway is the entrypoint for the gateway command. diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go index 0c11d3d18a..8cbe3d3391 100644 --- a/storage/pkg/command/groups.go +++ b/storage/pkg/command/groups.go @@ -9,7 +9,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Groups is the entrypoint for the sharing command. diff --git a/storage/pkg/command/health.go b/storage/pkg/command/health.go index d05bff4863..9398b3ba03 100644 --- a/storage/pkg/command/health.go +++ b/storage/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/storage/pkg/command/root.go b/storage/pkg/command/root.go index 1c99f2aad0..23fc4835be 100644 --- a/storage/pkg/command/root.go +++ b/storage/pkg/command/root.go @@ -4,12 +4,12 @@ import ( "os" "strings" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" "github.com/owncloud/ocis/storage/pkg/version" "github.com/spf13/viper" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the storage command. diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go index c3e3001a50..3dad197d58 100644 --- a/storage/pkg/command/sharing.go +++ b/storage/pkg/command/sharing.go @@ -13,13 +13,13 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/flagset" "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Sharing is the entrypoint for the sharing command. diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go index ccc80bd326..6ae5d36258 100644 --- a/storage/pkg/command/storagehome.go +++ b/storage/pkg/command/storagehome.go @@ -10,7 +10,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/storage/pkg/config" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // StorageHome is the entrypoint for the storage-home command. diff --git a/storage/pkg/command/storagemetadata.go b/storage/pkg/command/storagemetadata.go index e6d0e331bf..d11a5f84c5 100644 --- a/storage/pkg/command/storagemetadata.go +++ b/storage/pkg/command/storagemetadata.go @@ -10,7 +10,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/storage/pkg/config" @@ -19,6 +18,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/service/external" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // StorageMetadata the entrypoint for the storage-storage-metadata command. diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go index 87ca7e3ffd..6c47b5eeb6 100644 --- a/storage/pkg/command/storagepubliclink.go +++ b/storage/pkg/command/storagepubliclink.go @@ -8,7 +8,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -17,6 +16,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // StoragePublicLink is the entrypoint for the reva-storage-public-link command. diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go index 168bc0c7f5..2585c071fb 100644 --- a/storage/pkg/command/storageusers.go +++ b/storage/pkg/command/storageusers.go @@ -8,7 +8,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -17,6 +16,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // StorageUsers is the entrypoint for the storage-users command. diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go index 24ef2b5736..795dc7f063 100644 --- a/storage/pkg/command/users.go +++ b/storage/pkg/command/users.go @@ -9,7 +9,6 @@ import ( "github.com/cs3org/reva/cmd/revad/runtime" "github.com/gofrs/uuid" - "github.com/micro/cli/v2" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Users is the entrypoint for the sharing command. diff --git a/storage/pkg/flagset/appprovider.go b/storage/pkg/flagset/appprovider.go index 1a8b6e694e..48d358b580 100644 --- a/storage/pkg/flagset/appprovider.go +++ b/storage/pkg/flagset/appprovider.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // AppProviderWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/authbasic.go b/storage/pkg/flagset/authbasic.go index 4f5ae182b8..5a5d815eeb 100644 --- a/storage/pkg/flagset/authbasic.go +++ b/storage/pkg/flagset/authbasic.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // AuthBasicWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/authbearer.go b/storage/pkg/flagset/authbearer.go index fc5a66e6bc..4c1fa1bca1 100644 --- a/storage/pkg/flagset/authbearer.go +++ b/storage/pkg/flagset/authbearer.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // AuthBearerWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/debug.go b/storage/pkg/flagset/debug.go index ce55ee3bab..4273f08865 100644 --- a/storage/pkg/flagset/debug.go +++ b/storage/pkg/flagset/debug.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DebugWithConfig applies common debug config cfg to the flagset diff --git a/storage/pkg/flagset/drivereos.go b/storage/pkg/flagset/drivereos.go index 416a433ee0..541d15eb8c 100644 --- a/storage/pkg/flagset/drivereos.go +++ b/storage/pkg/flagset/drivereos.go @@ -5,8 +5,8 @@ import ( "github.com/owncloud/ocis/ocis-pkg/flags" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DriverEOSWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/driverlocal.go b/storage/pkg/flagset/driverlocal.go index 256d117e9c..6355fcc719 100644 --- a/storage/pkg/flagset/driverlocal.go +++ b/storage/pkg/flagset/driverlocal.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DriverLocalWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/driverocis.go b/storage/pkg/flagset/driverocis.go index 75f80caaae..08e067cbfb 100644 --- a/storage/pkg/flagset/driverocis.go +++ b/storage/pkg/flagset/driverocis.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DriverOCISWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/driverowncloud.go b/storage/pkg/flagset/driverowncloud.go index 65dfd183ec..20c0071f1d 100644 --- a/storage/pkg/flagset/driverowncloud.go +++ b/storage/pkg/flagset/driverowncloud.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DriverOwnCloudWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/driverowncloudsql.go b/storage/pkg/flagset/driverowncloudsql.go index ca974a46cf..ed42d2df7d 100644 --- a/storage/pkg/flagset/driverowncloudsql.go +++ b/storage/pkg/flagset/driverowncloudsql.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DriverOwnCloudSQLWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/drivers3ng.go b/storage/pkg/flagset/drivers3ng.go index b755ac28ea..fb1b6e924a 100644 --- a/storage/pkg/flagset/drivers3ng.go +++ b/storage/pkg/flagset/drivers3ng.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // DriverS3NGWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go index 93212bc9bf..faa944b123 100644 --- a/storage/pkg/flagset/frontend.go +++ b/storage/pkg/flagset/frontend.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // FrontendWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go index ba0585996b..9b5ef80cf5 100644 --- a/storage/pkg/flagset/gateway.go +++ b/storage/pkg/flagset/gateway.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // GatewayWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/groups.go b/storage/pkg/flagset/groups.go index cde2810206..2ab099ed04 100644 --- a/storage/pkg/flagset/groups.go +++ b/storage/pkg/flagset/groups.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // GroupsWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/health.go b/storage/pkg/flagset/health.go index b3ed0a4079..60d673c07b 100644 --- a/storage/pkg/flagset/health.go +++ b/storage/pkg/flagset/health.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // HealthWithConfig applies cfg to the health flagset diff --git a/storage/pkg/flagset/ldap.go b/storage/pkg/flagset/ldap.go index cea3c2bddb..851235668f 100644 --- a/storage/pkg/flagset/ldap.go +++ b/storage/pkg/flagset/ldap.go @@ -3,10 +3,10 @@ package flagset import ( "path" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" pkgos "github.com/owncloud/ocis/ocis-pkg/os" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // LDAPWithConfig applies LDAP cfg to the flagset diff --git a/storage/pkg/flagset/rest.go b/storage/pkg/flagset/rest.go index 34980637e2..1755b0e0f2 100644 --- a/storage/pkg/flagset/rest.go +++ b/storage/pkg/flagset/rest.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // RestWithConfig applies REST user/group provider cfg to the flagset diff --git a/storage/pkg/flagset/root.go b/storage/pkg/flagset/root.go index c2aaa30239..dce2fc5818 100644 --- a/storage/pkg/flagset/root.go +++ b/storage/pkg/flagset/root.go @@ -1,8 +1,8 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/secret.go b/storage/pkg/flagset/secret.go index cfb60555fc..2519caa61a 100644 --- a/storage/pkg/flagset/secret.go +++ b/storage/pkg/flagset/secret.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // SecretWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/sharing.go b/storage/pkg/flagset/sharing.go index b9a1d989e0..866910054b 100644 --- a/storage/pkg/flagset/sharing.go +++ b/storage/pkg/flagset/sharing.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // SharingWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/sharingsql.go b/storage/pkg/flagset/sharingsql.go index 5851c0bdfa..b152380fa7 100644 --- a/storage/pkg/flagset/sharingsql.go +++ b/storage/pkg/flagset/sharingsql.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // SharingSQLWithConfig applies the Sharing SQL driver cfg to the flagset diff --git a/storage/pkg/flagset/storagehome.go b/storage/pkg/flagset/storagehome.go index 9a23198fca..311af564cb 100644 --- a/storage/pkg/flagset/storagehome.go +++ b/storage/pkg/flagset/storagehome.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // StorageHomeWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/storagemetadata.go b/storage/pkg/flagset/storagemetadata.go index 581f7f1f32..17e5dfbd58 100644 --- a/storage/pkg/flagset/storagemetadata.go +++ b/storage/pkg/flagset/storagemetadata.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // StorageMetadata applies cfg to the root flagset diff --git a/storage/pkg/flagset/storagepubliclink.go b/storage/pkg/flagset/storagepubliclink.go index eefc636a3a..613fa15ec6 100644 --- a/storage/pkg/flagset/storagepubliclink.go +++ b/storage/pkg/flagset/storagepubliclink.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // StoragePublicLink applies cfg to the root flagset diff --git a/storage/pkg/flagset/storageusers.go b/storage/pkg/flagset/storageusers.go index 1b935cba3b..d66bea3ae5 100644 --- a/storage/pkg/flagset/storageusers.go +++ b/storage/pkg/flagset/storageusers.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // StorageUsersWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/tracing.go b/storage/pkg/flagset/tracing.go index e0bc2e0e75..67c7eb0bae 100644 --- a/storage/pkg/flagset/tracing.go +++ b/storage/pkg/flagset/tracing.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // TracingWithConfig applies cfg to the root flagset diff --git a/storage/pkg/flagset/users.go b/storage/pkg/flagset/users.go index f74796dbda..fb8e10cebb 100644 --- a/storage/pkg/flagset/users.go +++ b/storage/pkg/flagset/users.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/storage/pkg/config" + "github.com/urfave/cli/v2" ) // UsersWithConfig applies cfg to the root flagset diff --git a/store/pkg/command/health.go b/store/pkg/command/health.go index 9dd90b4360..5768b00ecb 100644 --- a/store/pkg/command/health.go +++ b/store/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/store/pkg/config" "github.com/owncloud/ocis/store/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/store/pkg/command/root.go b/store/pkg/command/root.go index 17fc954c08..ea47a2ac68 100644 --- a/store/pkg/command/root.go +++ b/store/pkg/command/root.go @@ -7,7 +7,6 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/store/pkg/config" @@ -15,6 +14,7 @@ import ( "github.com/owncloud/ocis/store/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-store command. diff --git a/store/pkg/command/server.go b/store/pkg/command/server.go index a6ab0704c5..1fec4e195e 100644 --- a/store/pkg/command/server.go +++ b/store/pkg/command/server.go @@ -7,13 +7,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/store/pkg/config" "github.com/owncloud/ocis/store/pkg/flagset" "github.com/owncloud/ocis/store/pkg/metrics" "github.com/owncloud/ocis/store/pkg/server/debug" "github.com/owncloud/ocis/store/pkg/server/grpc" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/store/pkg/command/version.go b/store/pkg/command/version.go index 8e89bc107e..22b9997bba 100644 --- a/store/pkg/command/version.go +++ b/store/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/store/pkg/config" "github.com/owncloud/ocis/store/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/store/pkg/flagset/flagset.go b/store/pkg/flagset/flagset.go index 5175339964..330121fd3f 100644 --- a/store/pkg/flagset/flagset.go +++ b/store/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/store/pkg/config" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/store/pkg/server/grpc/option.go b/store/pkg/server/grpc/option.go index 8b3b4bc9c0..389c2918b3 100644 --- a/store/pkg/server/grpc/option.go +++ b/store/pkg/server/grpc/option.go @@ -3,10 +3,10 @@ package grpc import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/store/pkg/config" "github.com/owncloud/ocis/store/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/thumbnails/pkg/command/health.go b/thumbnails/pkg/command/health.go index c1d6796bd4..babd7d20aa 100644 --- a/thumbnails/pkg/command/health.go +++ b/thumbnails/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/owncloud/ocis/thumbnails/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/thumbnails/pkg/command/root.go b/thumbnails/pkg/command/root.go index b1e04ec788..a53a28e5a7 100644 --- a/thumbnails/pkg/command/root.go +++ b/thumbnails/pkg/command/root.go @@ -7,13 +7,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/owncloud/ocis/thumbnails/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-thumbnails command. diff --git a/thumbnails/pkg/command/server.go b/thumbnails/pkg/command/server.go index eeeb61d09e..43547f681f 100644 --- a/thumbnails/pkg/command/server.go +++ b/thumbnails/pkg/command/server.go @@ -4,7 +4,6 @@ import ( "context" "fmt" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/owncloud/ocis/thumbnails/pkg/config" @@ -13,6 +12,7 @@ import ( "github.com/owncloud/ocis/thumbnails/pkg/server/debug" "github.com/owncloud/ocis/thumbnails/pkg/server/grpc" "github.com/owncloud/ocis/thumbnails/pkg/tracing" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/thumbnails/pkg/command/version.go b/thumbnails/pkg/command/version.go index 16a7bbf86f..9a861db972 100644 --- a/thumbnails/pkg/command/version.go +++ b/thumbnails/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/owncloud/ocis/thumbnails/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go index 564a5b0efd..de61db3d9c 100644 --- a/thumbnails/pkg/flagset/flagset.go +++ b/thumbnails/pkg/flagset/flagset.go @@ -3,8 +3,8 @@ package flagset import ( "github.com/owncloud/ocis/ocis-pkg/flags" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/urfave/cli/v2" ) // HealthWithConfig applies cfg to the root flagset diff --git a/thumbnails/pkg/server/grpc/option.go b/thumbnails/pkg/server/grpc/option.go index d7fd774e34..aa14ccbde5 100644 --- a/thumbnails/pkg/server/grpc/option.go +++ b/thumbnails/pkg/server/grpc/option.go @@ -3,10 +3,10 @@ package grpc import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/owncloud/ocis/thumbnails/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/web/pkg/command/health.go b/web/pkg/command/health.go index a7cc87d331..4719442e30 100644 --- a/web/pkg/command/health.go +++ b/web/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/web/pkg/config" "github.com/owncloud/ocis/web/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/web/pkg/command/root.go b/web/pkg/command/root.go index 74348e62d7..d1d3cd83a7 100644 --- a/web/pkg/command/root.go +++ b/web/pkg/command/root.go @@ -7,13 +7,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/web/pkg/config" "github.com/owncloud/ocis/web/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the web command. diff --git a/web/pkg/command/server.go b/web/pkg/command/server.go index 578a145773..f2fc4ee457 100644 --- a/web/pkg/command/server.go +++ b/web/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "io/ioutil" "strings" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/owncloud/ocis/web/pkg/config" @@ -15,6 +14,7 @@ import ( "github.com/owncloud/ocis/web/pkg/server/debug" "github.com/owncloud/ocis/web/pkg/server/http" "github.com/owncloud/ocis/web/pkg/tracing" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/web/pkg/flagset/flagset.go b/web/pkg/flagset/flagset.go index b708bb5b55..90e6a1dc3b 100644 --- a/web/pkg/flagset/flagset.go +++ b/web/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/web/pkg/config" + "github.com/urfave/cli/v2" ) // RootWithConfig applies cfg to the root flagset diff --git a/web/pkg/server/http/option.go b/web/pkg/server/http/option.go index 30a824ff93..5d77b6cea6 100644 --- a/web/pkg/server/http/option.go +++ b/web/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/web/pkg/config" "github.com/owncloud/ocis/web/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function. diff --git a/webdav/pkg/command/health.go b/webdav/pkg/command/health.go index 617719c207..42aa7964c3 100644 --- a/webdav/pkg/command/health.go +++ b/webdav/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/webdav/pkg/config" "github.com/owncloud/ocis/webdav/pkg/flagset" + "github.com/urfave/cli/v2" ) // Health is the entrypoint for the health command. diff --git a/webdav/pkg/command/root.go b/webdav/pkg/command/root.go index bbceaba92b..e5ca8ea519 100644 --- a/webdav/pkg/command/root.go +++ b/webdav/pkg/command/root.go @@ -7,13 +7,13 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/micro/cli/v2" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/webdav/pkg/config" "github.com/owncloud/ocis/webdav/pkg/version" "github.com/spf13/viper" "github.com/thejerf/suture/v4" + "github.com/urfave/cli/v2" ) // Execute is the entry point for the ocis-webdav command. diff --git a/webdav/pkg/command/server.go b/webdav/pkg/command/server.go index 968e63428e..3541ad4a53 100644 --- a/webdav/pkg/command/server.go +++ b/webdav/pkg/command/server.go @@ -4,7 +4,6 @@ import ( "context" "strings" - "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/owncloud/ocis/webdav/pkg/config" @@ -13,6 +12,7 @@ import ( "github.com/owncloud/ocis/webdav/pkg/server/debug" "github.com/owncloud/ocis/webdav/pkg/server/http" "github.com/owncloud/ocis/webdav/pkg/tracing" + "github.com/urfave/cli/v2" ) // Server is the entrypoint for the server command. diff --git a/webdav/pkg/command/version.go b/webdav/pkg/command/version.go index d60735d60e..03ef51278d 100644 --- a/webdav/pkg/command/version.go +++ b/webdav/pkg/command/version.go @@ -6,10 +6,10 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/micro/cli/v2" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/webdav/pkg/config" "github.com/owncloud/ocis/webdav/pkg/flagset" + "github.com/urfave/cli/v2" ) // PrintVersion prints the service versions of all running instances. diff --git a/webdav/pkg/flagset/flagset.go b/webdav/pkg/flagset/flagset.go index 1e133537eb..706e78669a 100644 --- a/webdav/pkg/flagset/flagset.go +++ b/webdav/pkg/flagset/flagset.go @@ -1,9 +1,9 @@ package flagset import ( - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/flags" "github.com/owncloud/ocis/webdav/pkg/config" + "github.com/urfave/cli/v2" ) // HealthWithConfig applies cfg to the root flagset diff --git a/webdav/pkg/server/http/option.go b/webdav/pkg/server/http/option.go index 50c4306c29..f18d3faf02 100644 --- a/webdav/pkg/server/http/option.go +++ b/webdav/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/micro/cli/v2" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/webdav/pkg/config" "github.com/owncloud/ocis/webdav/pkg/metrics" + "github.com/urfave/cli/v2" ) // Option defines a single option function.