From 4b8cd76ad0e4920201e2b39773b58e0099755b84 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Mon, 4 Sep 2023 22:00:02 +0800 Subject: [PATCH] fix: add iam super feat Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- tools/imctl/internal/imctl/cmd/color/color.go | 2 +- tools/imctl/internal/imctl/cmd/info/info.go | 2 +- tools/imctl/internal/imctl/cmd/jwt/jwt.go | 2 +- tools/imctl/internal/imctl/cmd/jwt/jwt_show.go | 2 +- tools/imctl/internal/imctl/cmd/jwt/jwt_sign.go | 2 +- tools/imctl/internal/imctl/cmd/jwt/jwt_verify.go | 2 +- tools/imctl/internal/imctl/cmd/new/new.go | 10 +++++----- tools/imctl/internal/imctl/cmd/policy/policy.go | 2 +- tools/imctl/internal/imctl/cmd/policy/policy_create.go | 2 +- tools/imctl/internal/imctl/cmd/policy/policy_delete.go | 2 +- tools/imctl/internal/imctl/cmd/policy/policy_get.go | 2 +- tools/imctl/internal/imctl/cmd/policy/policy_list.go | 2 +- tools/imctl/internal/imctl/cmd/policy/policy_update.go | 2 +- tools/imctl/internal/imctl/cmd/secret/secret.go | 2 +- tools/imctl/internal/imctl/cmd/secret/secret_create.go | 2 +- tools/imctl/internal/imctl/cmd/secret/secret_delete.go | 2 +- tools/imctl/internal/imctl/cmd/secret/secret_get.go | 2 +- tools/imctl/internal/imctl/cmd/secret/secret_list.go | 2 +- tools/imctl/internal/imctl/cmd/secret/secret_update.go | 2 +- tools/imctl/internal/imctl/cmd/set/set.go | 2 +- tools/imctl/internal/imctl/cmd/set/set_db.go | 2 +- tools/imctl/internal/imctl/cmd/user/user.go | 2 +- tools/imctl/internal/imctl/cmd/user/user_create.go | 2 +- tools/imctl/internal/imctl/cmd/user/user_delete.go | 2 +- tools/imctl/internal/imctl/cmd/user/user_get.go | 2 +- tools/imctl/internal/imctl/cmd/user/user_list.go | 2 +- tools/imctl/internal/imctl/cmd/user/user_update.go | 2 +- tools/imctl/internal/imctl/cmd/util/factory.go | 2 +- .../internal/imctl/cmd/util/factory_client_access.go | 2 +- tools/imctl/internal/imctl/cmd/util/helpers.go | 2 +- .../imctl/internal/imctl/cmd/util/iam_match_version.go | 2 +- tools/imctl/internal/imctl/cmd/validate/validate.go | 2 +- tools/imctl/internal/imctl/cmd/version/version.go | 2 +- 33 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tools/imctl/internal/imctl/cmd/color/color.go b/tools/imctl/internal/imctl/cmd/color/color.go index 047638f3c..a1e0a7bec 100644 --- a/tools/imctl/internal/imctl/cmd/color/color.go +++ b/tools/imctl/internal/imctl/cmd/color/color.go @@ -26,7 +26,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // ColorOptions is an options struct to support color subcommands. diff --git a/tools/imctl/internal/imctl/cmd/info/info.go b/tools/imctl/internal/imctl/cmd/info/info.go index fd635cb8f..5baa7e3eb 100644 --- a/tools/imctl/internal/imctl/cmd/info/info.go +++ b/tools/imctl/internal/imctl/cmd/info/info.go @@ -26,7 +26,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // Info defines the host information struct. diff --git a/tools/imctl/internal/imctl/cmd/jwt/jwt.go b/tools/imctl/internal/imctl/cmd/jwt/jwt.go index ce48633b6..2304be92f 100644 --- a/tools/imctl/internal/imctl/cmd/jwt/jwt.go +++ b/tools/imctl/internal/imctl/cmd/jwt/jwt.go @@ -20,7 +20,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) var jwtLong = templates.LongDesc(` diff --git a/tools/imctl/internal/imctl/cmd/jwt/jwt_show.go b/tools/imctl/internal/imctl/cmd/jwt/jwt_show.go index 14797d43f..d03e911fd 100644 --- a/tools/imctl/internal/imctl/cmd/jwt/jwt_show.go +++ b/tools/imctl/internal/imctl/cmd/jwt/jwt_show.go @@ -24,7 +24,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/jwt/jwt_sign.go b/tools/imctl/internal/imctl/cmd/jwt/jwt_sign.go index 477ea0652..7db330d6f 100644 --- a/tools/imctl/internal/imctl/cmd/jwt/jwt_sign.go +++ b/tools/imctl/internal/imctl/cmd/jwt/jwt_sign.go @@ -24,8 +24,8 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" "github.com/marmotedu/iam/internal/pkg/middleware/auth" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/jwt/jwt_verify.go b/tools/imctl/internal/imctl/cmd/jwt/jwt_verify.go index c06b91066..d685bb4a0 100644 --- a/tools/imctl/internal/imctl/cmd/jwt/jwt_verify.go +++ b/tools/imctl/internal/imctl/cmd/jwt/jwt_verify.go @@ -23,7 +23,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/new/new.go b/tools/imctl/internal/imctl/cmd/new/new.go index 5f03863a0..24d6dfca9 100644 --- a/tools/imctl/internal/imctl/cmd/new/new.go +++ b/tools/imctl/internal/imctl/cmd/new/new.go @@ -30,7 +30,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( @@ -70,7 +70,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( @@ -207,7 +207,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const maxStringLength = 17 @@ -255,7 +255,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( @@ -388,7 +388,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // SubCmd2Options is an options struct to support subcmd2 subcommands. diff --git a/tools/imctl/internal/imctl/cmd/policy/policy.go b/tools/imctl/internal/imctl/cmd/policy/policy.go index 4c6d0cbd6..6135e246c 100644 --- a/tools/imctl/internal/imctl/cmd/policy/policy.go +++ b/tools/imctl/internal/imctl/cmd/policy/policy.go @@ -20,7 +20,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) var policyLong = templates.LongDesc(` diff --git a/tools/imctl/internal/imctl/cmd/policy/policy_create.go b/tools/imctl/internal/imctl/cmd/policy/policy_create.go index 8f5e99c9b..221782c0a 100644 --- a/tools/imctl/internal/imctl/cmd/policy/policy_create.go +++ b/tools/imctl/internal/imctl/cmd/policy/policy_create.go @@ -27,7 +27,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/policy/policy_delete.go b/tools/imctl/internal/imctl/cmd/policy/policy_delete.go index 5bddd1a87..4cf50726e 100644 --- a/tools/imctl/internal/imctl/cmd/policy/policy_delete.go +++ b/tools/imctl/internal/imctl/cmd/policy/policy_delete.go @@ -24,7 +24,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/policy/policy_get.go b/tools/imctl/internal/imctl/cmd/policy/policy_get.go index c2309388c..52b049107 100644 --- a/tools/imctl/internal/imctl/cmd/policy/policy_get.go +++ b/tools/imctl/internal/imctl/cmd/policy/policy_get.go @@ -27,7 +27,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/policy/policy_list.go b/tools/imctl/internal/imctl/cmd/policy/policy_list.go index eca0c75ea..dc5b26187 100644 --- a/tools/imctl/internal/imctl/cmd/policy/policy_list.go +++ b/tools/imctl/internal/imctl/cmd/policy/policy_list.go @@ -27,7 +27,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/policy/policy_update.go b/tools/imctl/internal/imctl/cmd/policy/policy_update.go index f23e0964f..2e0bafd33 100644 --- a/tools/imctl/internal/imctl/cmd/policy/policy_update.go +++ b/tools/imctl/internal/imctl/cmd/policy/policy_update.go @@ -27,7 +27,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/secret/secret.go b/tools/imctl/internal/imctl/cmd/secret/secret.go index b210fc7a7..215d6d186 100644 --- a/tools/imctl/internal/imctl/cmd/secret/secret.go +++ b/tools/imctl/internal/imctl/cmd/secret/secret.go @@ -21,7 +21,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) var secretLong = templates.LongDesc(` diff --git a/tools/imctl/internal/imctl/cmd/secret/secret_create.go b/tools/imctl/internal/imctl/cmd/secret/secret_create.go index 4a27cf654..2e93413d3 100644 --- a/tools/imctl/internal/imctl/cmd/secret/secret_create.go +++ b/tools/imctl/internal/imctl/cmd/secret/secret_create.go @@ -26,7 +26,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/secret/secret_delete.go b/tools/imctl/internal/imctl/cmd/secret/secret_delete.go index b9eaf95dd..f5a546525 100644 --- a/tools/imctl/internal/imctl/cmd/secret/secret_delete.go +++ b/tools/imctl/internal/imctl/cmd/secret/secret_delete.go @@ -24,7 +24,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/secret/secret_get.go b/tools/imctl/internal/imctl/cmd/secret/secret_get.go index d9811cb09..4d81ebc34 100644 --- a/tools/imctl/internal/imctl/cmd/secret/secret_get.go +++ b/tools/imctl/internal/imctl/cmd/secret/secret_get.go @@ -26,7 +26,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/secret/secret_list.go b/tools/imctl/internal/imctl/cmd/secret/secret_list.go index 121a73d6f..43b9895d7 100644 --- a/tools/imctl/internal/imctl/cmd/secret/secret_list.go +++ b/tools/imctl/internal/imctl/cmd/secret/secret_list.go @@ -25,7 +25,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/secret/secret_update.go b/tools/imctl/internal/imctl/cmd/secret/secret_update.go index 9b0f98352..cf3b7ff25 100644 --- a/tools/imctl/internal/imctl/cmd/secret/secret_update.go +++ b/tools/imctl/internal/imctl/cmd/secret/secret_update.go @@ -25,7 +25,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/set/set.go b/tools/imctl/internal/imctl/cmd/set/set.go index 3c318da7c..24267347e 100644 --- a/tools/imctl/internal/imctl/cmd/set/set.go +++ b/tools/imctl/internal/imctl/cmd/set/set.go @@ -20,7 +20,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) var setLong = templates.LongDesc(` diff --git a/tools/imctl/internal/imctl/cmd/set/set_db.go b/tools/imctl/internal/imctl/cmd/set/set_db.go index e885a9d98..34f4526c3 100644 --- a/tools/imctl/internal/imctl/cmd/set/set_db.go +++ b/tools/imctl/internal/imctl/cmd/set/set_db.go @@ -27,7 +27,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // DBOptions is an options struct to support 'db' sub command. diff --git a/tools/imctl/internal/imctl/cmd/user/user.go b/tools/imctl/internal/imctl/cmd/user/user.go index 7db64508b..b8d05da19 100644 --- a/tools/imctl/internal/imctl/cmd/user/user.go +++ b/tools/imctl/internal/imctl/cmd/user/user.go @@ -21,7 +21,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) var userLong = templates.LongDesc(` diff --git a/tools/imctl/internal/imctl/cmd/user/user_create.go b/tools/imctl/internal/imctl/cmd/user/user_create.go index 57766f341..0a52454ab 100644 --- a/tools/imctl/internal/imctl/cmd/user/user_create.go +++ b/tools/imctl/internal/imctl/cmd/user/user_create.go @@ -25,7 +25,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/user/user_delete.go b/tools/imctl/internal/imctl/cmd/user/user_delete.go index da070ccc8..eecfabc78 100644 --- a/tools/imctl/internal/imctl/cmd/user/user_delete.go +++ b/tools/imctl/internal/imctl/cmd/user/user_delete.go @@ -24,7 +24,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/user/user_get.go b/tools/imctl/internal/imctl/cmd/user/user_get.go index c0b621ebd..d3e76fc77 100644 --- a/tools/imctl/internal/imctl/cmd/user/user_get.go +++ b/tools/imctl/internal/imctl/cmd/user/user_get.go @@ -25,7 +25,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/user/user_list.go b/tools/imctl/internal/imctl/cmd/user/user_list.go index 9726f35a8..c219baed8 100644 --- a/tools/imctl/internal/imctl/cmd/user/user_list.go +++ b/tools/imctl/internal/imctl/cmd/user/user_list.go @@ -24,7 +24,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/user/user_update.go b/tools/imctl/internal/imctl/cmd/user/user_update.go index e6e569331..7bf5508d7 100644 --- a/tools/imctl/internal/imctl/cmd/user/user_update.go +++ b/tools/imctl/internal/imctl/cmd/user/user_update.go @@ -24,7 +24,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/util/factory.go b/tools/imctl/internal/imctl/cmd/util/factory.go index 65634b014..65652709e 100644 --- a/tools/imctl/internal/imctl/cmd/util/factory.go +++ b/tools/imctl/internal/imctl/cmd/util/factory.go @@ -18,7 +18,7 @@ import ( "github.com/marmotedu/marmotedu-sdk-go/marmotedu/service/iam" restclient "github.com/marmotedu/marmotedu-sdk-go/rest" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // Factory provides abstractions that allow the IAM command to be extended across multiple types diff --git a/tools/imctl/internal/imctl/cmd/util/factory_client_access.go b/tools/imctl/internal/imctl/cmd/util/factory_client_access.go index 9285245f4..1064bd129 100644 --- a/tools/imctl/internal/imctl/cmd/util/factory_client_access.go +++ b/tools/imctl/internal/imctl/cmd/util/factory_client_access.go @@ -21,7 +21,7 @@ import ( restclient "github.com/marmotedu/marmotedu-sdk-go/rest" "github.com/marmotedu/marmotedu-sdk-go/tools/clientcmd" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) type factoryImpl struct { diff --git a/tools/imctl/internal/imctl/cmd/util/helpers.go b/tools/imctl/internal/imctl/cmd/util/helpers.go index 064a1e191..e42791916 100644 --- a/tools/imctl/internal/imctl/cmd/util/helpers.go +++ b/tools/imctl/internal/imctl/cmd/util/helpers.go @@ -32,7 +32,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/marmotedu/iam/pkg/log" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/log" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/util/iam_match_version.go b/tools/imctl/internal/imctl/cmd/util/iam_match_version.go index 8bfd4e0ef..e03bb4fca 100644 --- a/tools/imctl/internal/imctl/cmd/util/iam_match_version.go +++ b/tools/imctl/internal/imctl/cmd/util/iam_match_version.go @@ -26,7 +26,7 @@ import ( "github.com/openim-sigs/component-base/pkg/version" "github.com/spf13/pflag" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) const ( diff --git a/tools/imctl/internal/imctl/cmd/validate/validate.go b/tools/imctl/internal/imctl/cmd/validate/validate.go index 5b2e86388..76642992f 100644 --- a/tools/imctl/internal/imctl/cmd/validate/validate.go +++ b/tools/imctl/internal/imctl/cmd/validate/validate.go @@ -27,7 +27,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // ValidateOptions is an options struct to support 'validate' sub command. diff --git a/tools/imctl/internal/imctl/cmd/version/version.go b/tools/imctl/internal/imctl/cmd/version/version.go index c71025aa7..9dd447196 100644 --- a/tools/imctl/internal/imctl/cmd/version/version.go +++ b/tools/imctl/internal/imctl/cmd/version/version.go @@ -28,7 +28,7 @@ import ( cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/marmotedu/iam/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" ) // Version is a struct for version information.