fix: cli `grants-by-grantee`, `grants-by-granter` cmds (backport #11983) #12025

mergify · 2022-05-24T10:56:06Z

This is an automatic backport of pull request #11983 done by Mergify.
Cherry-pick of f470d40 has failed:

On branch mergify/bp/release/v0.45.x/pr-11983
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit f470d402a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x/authz/client/cli/query.go
	modified:   x/feegrant/client/cli/query.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

## Description ref: #11362 --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit f470d40) # Conflicts: # CHANGELOG.md

x/authz/client/cli/query.go

x/feegrant/client/cli/query.go

amaury1093 · 2022-05-24T11:19:57Z

@atheeshp I'll let you fix the conflicts, since you were the OP

atheeshp · 2022-05-25T09:31:05Z

@atheeshp I'll let you fix the conflicts, since you were the OP

sure!

CHANGELOG.md

amaury1093 · 2022-05-25T10:37:50Z

x/authz/client/cli/query.go

@@ -96,13 +96,13 @@ $ %s query %s grants cosmos1skjw.. cosmos1skjwj.. %s

 func GetQueryGranterGrants() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "granter-grants [granter-addr]",
+		Use:   "grants-by-granter [granter-addr]",


let's add an alias here too, for backwards-compatibility

amaury1093 · 2022-05-25T10:43:05Z

x/authz/client/cli/query.go

@@ -144,13 +144,13 @@ $ %s q %s granter-grants cosmos1skj..

 func GetQueryGranteeGrants() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "grantee-grants [grantee-addr]",
+		Use:   "grants-by-grantee [grantee-addr]",


amaury1093 · 2022-05-25T10:43:09Z

x/feegrant/client/cli/query.go

+		Use:     "grants [granter]",
+		Aliases: []string{"grants-by-granter"},


Suggested change

Use: "grants [granter]",

Aliases: []string{"grants-by-granter"},

Use: "grants-by-granter [granter]",

This command was added recently, and is not released yet. There's no need for backwards-compatibility, and no need for aliases.

x/authz/client/cli/query.go

…os#11983) (cosmos#12025) * fix: cli `grants-by-grantee`, `grants-by-granter` cmds (cosmos#11983) ## Description ref: cosmos#11362 --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit f470d40) # Conflicts: # CHANGELOG.md * add alias * conflicts * fix * remove unneeded files * Update x/authz/client/cli/query.go Co-authored-by: atheeshp <[email protected]> Co-authored-by: atheesh <[email protected]> Co-authored-by: marbar3778 <[email protected]> Co-authored-by: Amaury <[email protected]>

mergify bot requested review from aaronc and alexanderbez as code owners May 24, 2022 10:56

mergify bot added the conflicts label May 24, 2022

mergify bot mentioned this pull request May 24, 2022

fix: cli grants-by-grantee, grants-by-granter cmds #11983

Merged

19 tasks

github-actions bot added C:CLI C:x/authz C:x/feegrant labels May 24, 2022

amaury1093 reviewed May 24, 2022

View reviewed changes

x/authz/client/cli/query.go Outdated Show resolved Hide resolved

amaury1093 reviewed May 24, 2022

View reviewed changes

x/feegrant/client/cli/query.go Outdated Show resolved Hide resolved

add alias

82b3527

atheeshp requested review from amaury1093 and julienrbrt May 25, 2022 09:39

conflicts

677a218

amaury1093 reviewed May 25, 2022

View reviewed changes

amaury1093 self-assigned this May 25, 2022

fix

1118f56

github-actions bot added the C:x/genutil genutil module issues label May 27, 2022

remove unneeded files

d85911c

github-actions bot removed the C:x/genutil genutil module issues label May 27, 2022

tac0turtle added C:x/genutil genutil module issues and removed conflicts labels May 27, 2022

tac0turtle approved these changes May 27, 2022

View reviewed changes

amaury1093 approved these changes May 27, 2022

View reviewed changes

x/authz/client/cli/query.go Outdated Show resolved Hide resolved

Update x/authz/client/cli/query.go

4dc8e03

github-actions bot removed the C:x/genutil genutil module issues label May 27, 2022

amaury1093 merged commit 057a6ca into release/v0.45.x May 27, 2022

amaury1093 deleted the mergify/bp/release/v0.45.x/pr-11983 branch May 27, 2022 09:31

amaury1093 mentioned this pull request Sep 12, 2022

feat(bank)!: Only allow valid denoms in state #13247

Closed

19 tasks

faddat mentioned this pull request Dec 11, 2023

chore: update to v0.45.16 cudoventures/cosmos-sdk#16

Draft

19 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: cli `grants-by-grantee`, `grants-by-granter` cmds (backport #11983) #12025

fix: cli `grants-by-grantee`, `grants-by-granter` cmds (backport #11983) #12025

mergify bot commented May 24, 2022

amaury1093 commented May 24, 2022

atheeshp commented May 25, 2022

amaury1093 May 25, 2022 •

edited

Loading

amaury1093 May 25, 2022

amaury1093 May 25, 2022

		Use: "grants [granter]",
		Aliases: []string{"grants-by-granter"},

	Use: "grants [granter]",
	Aliases: []string{"grants-by-granter"},
	Use: "grants-by-granter [granter]",

fix: cli grants-by-grantee, grants-by-granter cmds (backport #11983) #12025

fix: cli grants-by-grantee, grants-by-granter cmds (backport #11983) #12025

Conversation

mergify bot commented May 24, 2022

amaury1093 commented May 24, 2022

atheeshp commented May 25, 2022

amaury1093 May 25, 2022 • edited Loading

Choose a reason for hiding this comment

amaury1093 May 25, 2022

Choose a reason for hiding this comment

amaury1093 May 25, 2022

Choose a reason for hiding this comment

fix: cli `grants-by-grantee`, `grants-by-granter` cmds (backport #11983) #12025

fix: cli `grants-by-grantee`, `grants-by-granter` cmds (backport #11983) #12025

amaury1093 May 25, 2022 •

edited

Loading