From fca401856f6b593c4a4332254d114c7f0348b15d Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:18:27 +0800 Subject: [PATCH 01/10] iam export:designate zip file name --- cmd/admin-cluster-iam-export.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index 5120926933..b079532fad 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -51,12 +51,12 @@ FLAGS: {{end}} EXAMPLES: 1. Download all IAM metadata for cluster into zip file. - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} myminio /tmp/myminio-iam.zip `, } func checkIAMExportSyntax(ctx *cli.Context) { - if len(ctx.Args()) != 1 { + if len(ctx.Args()) != 1 && len(ctx.Args()) != 2 { showCommandHelpAndExit(ctx, 1) // last argument is exit code } } @@ -97,6 +97,9 @@ func mainClusterIAMExport(ctx *cli.Context) error { tmpFile.Close() downloadPath := fmt.Sprintf("%s-iam-info.%s", aliasedURL, ext) + if args.Get(1) != "" { + downloadPath = args.Get(1) + } fi, e := os.Stat(downloadPath) if e == nil && !fi.IsDir() { e = moveFile(downloadPath, downloadPath+"."+time.Now().Format(dateTimeFormatFilename)) From 9d6d81be5b646f99e363af2f64cd4605c451c1f3 Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:21:46 +0800 Subject: [PATCH 02/10] Update admin-cluster-iam-export.go --- cmd/admin-cluster-iam-export.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index b079532fad..032b44d2e6 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -32,13 +32,23 @@ import ( "github.com/minio/pkg/v3/console" ) +// iam export specific flags. +var ( + iamExportFlags = []cli.Flag{ + cli.StringFlag{ + Name: "overwrite,o", + Usage: "overwrite iam export file path", + }, + } +) + var adminClusterIAMExportCmd = cli.Command{ Name: "export", Usage: "exports IAM info to zipped file", Action: mainClusterIAMExport, OnUsageError: onUsageError, Before: setGlobalsFromContext, - Flags: globalFlags, + Flags: append(iamExportFlags, globalFlags...), HideHelpCommand: true, CustomHelpTemplate: `NAME: {{.HelpName}} - {{.Usage}} @@ -51,7 +61,9 @@ FLAGS: {{end}} EXAMPLES: 1. Download all IAM metadata for cluster into zip file. - {{.Prompt}} {{.HelpName}} myminio /tmp/myminio-iam.zip + {{.Prompt}} {{.HelpName}} myminio + 2. Download all IAM metadata for cluster into designated zip file. + {{.Prompt}} {{.HelpName}} myminio --overwrite /tmp/myminio-iam.zip `, } @@ -97,8 +109,8 @@ func mainClusterIAMExport(ctx *cli.Context) error { tmpFile.Close() downloadPath := fmt.Sprintf("%s-iam-info.%s", aliasedURL, ext) - if args.Get(1) != "" { - downloadPath = args.Get(1) + if ctx.String("overwrite") != "" { + downloadPath = ctx.String("overwrite") } fi, e := os.Stat(downloadPath) if e == nil && !fi.IsDir() { From bc13d015061403ecac0f412dc9cc98f364211b0f Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:03:15 +0800 Subject: [PATCH 03/10] Update admin-cluster-iam-export.go --- cmd/admin-cluster-iam-export.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index 032b44d2e6..147660d963 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -36,8 +36,8 @@ import ( var ( iamExportFlags = []cli.Flag{ cli.StringFlag{ - Name: "overwrite,o", - Usage: "overwrite iam export file path", + Name: "output,o", + Usage: "output iam export to a custom file path", }, } ) @@ -62,7 +62,7 @@ FLAGS: EXAMPLES: 1. Download all IAM metadata for cluster into zip file. {{.Prompt}} {{.HelpName}} myminio - 2. Download all IAM metadata for cluster into designated zip file. + 2. Download all IAM metadata to a custom file. {{.Prompt}} {{.HelpName}} myminio --overwrite /tmp/myminio-iam.zip `, } From 5c564b2e00c83f54e678ff5609cb625a37accdbf Mon Sep 17 00:00:00 2001 From: dorman <37854724+dormanze@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:03:34 +0800 Subject: [PATCH 04/10] Update cmd/admin-cluster-iam-export.go Co-authored-by: Harshavardhana --- cmd/admin-cluster-iam-export.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index 032b44d2e6..16959a6d9d 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -37,7 +37,7 @@ var ( iamExportFlags = []cli.Flag{ cli.StringFlag{ Name: "overwrite,o", - Usage: "overwrite iam export file path", + Usage: "output iam export to a custom file path", }, } ) From ff0bb5c4e4b887858f890eb5be2b8ac411fa470e Mon Sep 17 00:00:00 2001 From: dorman <37854724+dormanze@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:03:51 +0800 Subject: [PATCH 05/10] Update cmd/admin-cluster-iam-export.go Co-authored-by: Harshavardhana --- cmd/admin-cluster-iam-export.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index 16959a6d9d..a75b38d2cb 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -36,7 +36,7 @@ import ( var ( iamExportFlags = []cli.Flag{ cli.StringFlag{ - Name: "overwrite,o", + Name: "output,o", Usage: "output iam export to a custom file path", }, } From bb26827c42c4e58ed9ffbb95a6dfea39cbe810fc Mon Sep 17 00:00:00 2001 From: dorman <37854724+dormanze@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:03:57 +0800 Subject: [PATCH 06/10] Update cmd/admin-cluster-iam-export.go Co-authored-by: Harshavardhana --- cmd/admin-cluster-iam-export.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index a75b38d2cb..147660d963 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -62,7 +62,7 @@ FLAGS: EXAMPLES: 1. Download all IAM metadata for cluster into zip file. {{.Prompt}} {{.HelpName}} myminio - 2. Download all IAM metadata for cluster into designated zip file. + 2. Download all IAM metadata to a custom file. {{.Prompt}} {{.HelpName}} myminio --overwrite /tmp/myminio-iam.zip `, } From 4f60618abf6e740777849b0b7d6a52addc2fadf4 Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:36:31 +0800 Subject: [PATCH 07/10] Update admin-cluster-iam-export.go --- cmd/admin-cluster-iam-export.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index 147660d963..7c737f77d2 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -63,7 +63,7 @@ EXAMPLES: 1. Download all IAM metadata for cluster into zip file. {{.Prompt}} {{.HelpName}} myminio 2. Download all IAM metadata to a custom file. - {{.Prompt}} {{.HelpName}} myminio --overwrite /tmp/myminio-iam.zip + {{.Prompt}} {{.HelpName}} myminio --output /tmp/myminio-iam.zip `, } From c29a40829809b9c69fccc34c24a7882e88710261 Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:39:00 +0800 Subject: [PATCH 08/10] Update admin-cluster-iam-export.go --- cmd/admin-cluster-iam-export.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index 7c737f77d2..a273f50ddf 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -109,8 +109,8 @@ func mainClusterIAMExport(ctx *cli.Context) error { tmpFile.Close() downloadPath := fmt.Sprintf("%s-iam-info.%s", aliasedURL, ext) - if ctx.String("overwrite") != "" { - downloadPath = ctx.String("overwrite") + if ctx.String("output") != "" { + downloadPath = ctx.String("output") } fi, e := os.Stat(downloadPath) if e == nil && !fi.IsDir() { From 150d62bc578d8e203259eb501d26c72c1533c0df Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Mon, 5 Aug 2024 19:52:40 +0800 Subject: [PATCH 09/10] Update admin-cluster-iam-export.go --- cmd/admin-cluster-iam-export.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index a273f50ddf..f5022ee121 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -68,7 +68,7 @@ EXAMPLES: } func checkIAMExportSyntax(ctx *cli.Context) { - if len(ctx.Args()) != 1 && len(ctx.Args()) != 2 { + if len(ctx.Args()) != 1 { showCommandHelpAndExit(ctx, 1) // last argument is exit code } } From 7c8675f695ec8b10da0e0a2e5e6c74b9d73d22a7 Mon Sep 17 00:00:00 2001 From: zekaifeng <37854724+dormanze@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:53:52 +0800 Subject: [PATCH 10/10] Update admin-cluster-iam-export.go --- cmd/admin-cluster-iam-export.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index f5022ee121..068bdde522 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -62,6 +62,7 @@ FLAGS: EXAMPLES: 1. Download all IAM metadata for cluster into zip file. {{.Prompt}} {{.HelpName}} myminio + 2. Download all IAM metadata to a custom file. {{.Prompt}} {{.HelpName}} myminio --output /tmp/myminio-iam.zip `,