From b7a99c757a5a5ac6064ffa513f1a87774621b2e4 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Wed, 21 Dec 2022 10:59:35 +0300 Subject: [PATCH] [#2097] cli: Clarify help for `--expire-at` parameter for commands `object lock/put` and `bearer create` Signed-off-by: Anton Nikiforov --- CHANGELOG.md | 1 + cmd/frostfs-cli/modules/bearer/create.go | 2 +- cmd/frostfs-cli/modules/object/lock.go | 4 ++-- cmd/frostfs-cli/modules/object/put.go | 2 +- cmd/frostfs-cli/modules/storagegroup/get.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e33492a8e..a8737dd44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ Changelog for NeoFS Node - Pilorama no longer tries to apply already applied operations (#2161) - Use `sync.Pool` in Object.PUT service (#2139) - Shard uses metabase for `HEAD` requests by default, not write-cache (#2167) +- Clarify help for `--expire-at` parameter for commands `object lock/put` and `bearer create` (#2097) ### Fixed - Open FSTree in sync mode by default (#1992) diff --git a/cmd/frostfs-cli/modules/bearer/create.go b/cmd/frostfs-cli/modules/bearer/create.go index 163821085..5626f0eb6 100644 --- a/cmd/frostfs-cli/modules/bearer/create.go +++ b/cmd/frostfs-cli/modules/bearer/create.go @@ -41,7 +41,7 @@ func init() { createCmd.Flags().StringP(eaclFlag, "e", "", "Path to the extended ACL table") createCmd.Flags().StringP(issuedAtFlag, "i", "", "Epoch to issue token at") createCmd.Flags().StringP(notValidBeforeFlag, "n", "", "Not valid before epoch") - createCmd.Flags().StringP(commonflags.ExpireAt, "x", "", "Expiration epoch") + createCmd.Flags().StringP(commonflags.ExpireAt, "x", "", "The last active epoch for the token") createCmd.Flags().StringP(ownerFlag, "o", "", "Token owner") createCmd.Flags().String(outFlag, "", "File to write token to") createCmd.Flags().Bool(jsonFlag, false, "Output token in JSON") diff --git a/cmd/frostfs-cli/modules/object/lock.go b/cmd/frostfs-cli/modules/object/lock.go index 6a549a04f..574ffbd9c 100644 --- a/cmd/frostfs-cli/modules/object/lock.go +++ b/cmd/frostfs-cli/modules/object/lock.go @@ -66,7 +66,7 @@ var objectLockCmd = &cobra.Command{ exp = currEpoch + lifetime } - common.PrintVerbose("Lock object will expire at %d epoch", exp) + common.PrintVerbose("Lock object will expire after %d epoch", exp) var expirationAttr objectSDK.Attribute expirationAttr.SetKey(objectV2.SysAttributeExpEpoch) @@ -104,7 +104,7 @@ func initCommandObjectLock() { ff.StringSlice(commonflags.OIDFlag, nil, commonflags.OIDFlagUsage) _ = objectLockCmd.MarkFlagRequired(commonflags.OIDFlag) - ff.Uint64P(commonflags.ExpireAt, "e", 0, "Lock expiration epoch") + ff.Uint64P(commonflags.ExpireAt, "e", 0, "The last active epoch for the lock") ff.Uint64(commonflags.Lifetime, 0, "Lock lifetime") objectLockCmd.MarkFlagsMutuallyExclusive(commonflags.ExpireAt, commonflags.Lifetime) diff --git a/cmd/frostfs-cli/modules/object/put.go b/cmd/frostfs-cli/modules/object/put.go index a08103ded..c769d647f 100644 --- a/cmd/frostfs-cli/modules/object/put.go +++ b/cmd/frostfs-cli/modules/object/put.go @@ -51,7 +51,7 @@ func initObjectPutCmd() { flags.String("attributes", "", "User attributes in form of Key1=Value1,Key2=Value2") flags.Bool("disable-filename", false, "Do not set well-known filename attribute") flags.Bool("disable-timestamp", false, "Do not set well-known timestamp attribute") - flags.Uint64VarP(&putExpiredOn, commonflags.ExpireAt, "e", 0, "Last epoch in the life of the object") + flags.Uint64VarP(&putExpiredOn, commonflags.ExpireAt, "e", 0, "The last active epoch in the life of the object") flags.Bool(noProgressFlag, false, "Do not show progress bar") flags.String(notificationFlag, "", "Object notification in the form of *epoch*:*topic*; '-' topic means using default") diff --git a/cmd/frostfs-cli/modules/storagegroup/get.go b/cmd/frostfs-cli/modules/storagegroup/get.go index f0156fabd..8693b3162 100644 --- a/cmd/frostfs-cli/modules/storagegroup/get.go +++ b/cmd/frostfs-cli/modules/storagegroup/get.go @@ -67,7 +67,7 @@ func getSG(cmd *cobra.Command, _ []string) { err = storagegroupSDK.ReadFromObject(&sg, *rawObj) common.ExitOnErr(cmd, "could not read storage group from the obj: %w", err) - cmd.Printf("Expiration epoch: %d\n", sg.ExpirationEpoch()) + cmd.Printf("The last active epoch: %d\n", sg.ExpirationEpoch()) cmd.Printf("Group size: %d\n", sg.ValidationDataSize()) common.PrintChecksum(cmd, "Group hash", sg.ValidationDataHash)