feat: autocli for adminmodule #ntrn-348

go.mod

@@ -21,6 +21,8 @@ require (
 )
 
 require (
+	cosmossdk.io/api v0.7.2
+	cosmossdk.io/client/v2 v2.0.0-beta.1
 	cosmossdk.io/core v0.11.0
 	cosmossdk.io/errors v1.0.1
 	cosmossdk.io/log v1.3.0
@@ -45,7 +47,6 @@ require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/storage v1.35.1 // indirect
-	cosmossdk.io/api v0.7.2 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
 	cosmossdk.io/x/tx v0.13.0 // indirect

x/adminmodule/autocli.go

@@ -0,0 +1,56 @@
+package adminmodule
+
+import (
+	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
+	"cosmossdk.io/client/v2/autocli"
+)
+
+var _ autocli.HasAutoCLIConfig = AppModule{}
+
+func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
+	return &autocliv1.ModuleOptions{
+		Query: &autocliv1.ServiceCommandDescriptor{
+			Service: "cosmos.adminmodule.adminmodule.Query",
+			RpcCommandOptions: []*autocliv1.RpcCommandOptions{
+				{
+					RpcMethod: "Admins",
+					Use:       "admins",
+					Short:     "Query list of admins",
+				},
+				{
+					RpcMethod: "ArchivedProposals",
+					Use:       "archivedproposals",
+					Short:     "Query archived proposals",
+				},
+				{
+					RpcMethod: "ArchivedProposalsLegacy",
+					Use:       "archivedproposalslegacy",
+					Short:     "Query legacy archived proposals",
+				},
+			},
+			EnhanceCustomCommand: true,
+		},
+		Tx: &autocliv1.ServiceCommandDescriptor{
+			Service: "cosmos.adminmodule.adminmodule.Msg",
+			RpcCommandOptions: []*autocliv1.RpcCommandOptions{
+				{
+					RpcMethod:      "DeleteAdmin",
+					Use:            "delete-admin [admin]",
+					Short:          "Delete admin",
+					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "admin"}},
+				},
+				{
+					RpcMethod:      "AddAdmin",
+					Use:            "add-admin [admin]",
+					Short:          "Add new admin",
+					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "admin"}},
+				},
+				{
+					RpcMethod: "SubmitProposalLegacy",
+					Skip:      true,
+				},
+			},
+			EnhanceCustomCommand: true,
+		},
+	}
+}

x/adminmodule/client/cli/tx.go

@@ -20,10 +20,6 @@ func GetTxCmd(propCmds []*cobra.Command) *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdDeleteAdmin())
-
-	cmd.AddCommand(CmdAddAdmin())
-
 	cmdSubmitProp := CmdSubmitProposal()
 	for _, propCmd := range propCmds {
 		flags.AddTxFlagsToCmd(propCmd)

x/adminmodule/client/cli/tx_ibc_upgrade_proposal.go

@@ -16,7 +16,7 @@ import (
 	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
-// NewCmdSubmitUpgradeProposal implements a command handler for submitting an upgrade IBC client proposal transaction.
+// NewCmdSubmitIbcClientUpgradeProposal implements a command handler for submitting an upgrade IBC client proposal transaction.
 func NewCmdSubmitIbcClientUpgradeProposal() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "ibc-upgrade [name] [height] [path/to/upgraded_client_state.json] (--title [title] | --description [description]) [flags]",

x/adminmodule/module.go

@@ -5,15 +5,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/cosmos/admin-module/v2/x/adminmodule/client/cli"
+	"github.com/spf13/cobra"
 
 	// this line is used by starport scaffolding # 1
 	"cosmossdk.io/core/appmodule"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
-	"github.com/spf13/cobra"
-
 	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 
-	"github.com/cosmos/admin-module/v2/x/adminmodule/client/cli"
 	"github.com/cosmos/admin-module/v2/x/adminmodule/keeper"
 	"github.com/cosmos/admin-module/v2/x/adminmodule/types"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -95,11 +94,6 @@ func (a AppModuleBasic) GetTxCmd() *cobra.Command {
 	return cli.GetTxCmd(proposalCLIHandlers)
 }
 
-// GetQueryCmd returns the capability module's root query command.
-func (AppModuleBasic) GetQueryCmd() *cobra.Command {
-	return cli.GetQueryCmd(types.StoreKey)
-}
-
 // ----------------------------------------------------------------------------
 // AppModule
 // ----------------------------------------------------------------------------