cmd/rofl: Move term and termCount params to roflCommon

Author: matevz

cmd/rofl/common/flags.go

@@ -16,6 +16,9 @@ var (
 	// NoUpdateFlag is the flag for disabling the rofl.yaml manifest file update.
 	NoUpdateFlag *flag.FlagSet
 
+	// TermFlags provide the term and count setting.
+	TermFlags *flag.FlagSet
+
 	// DeploymentName is the name of the ROFL app deployment.
 	DeploymentName string
 
@@ -24,6 +27,12 @@ var (
 
 	// NoUpdate disables updating the rofl.yaml manifest file.
 	NoUpdate bool
+
+	// Term specifies the rental base unit.
+	Term string
+
+	// TermCount specific the rental base unit multiplier.
+	TermCount uint64
 )
 
 func init() {
@@ -35,4 +44,8 @@ func init() {
 
 	NoUpdateFlag = flag.NewFlagSet("", flag.ContinueOnError)
 	NoUpdateFlag.BoolVar(&NoUpdate, "no-update-manifest", false, "do not update the manifest")
+
+	TermFlags = flag.NewFlagSet("", flag.ContinueOnError)
+	TermFlags.StringVar(&Term, "term", "", "term to pay for in advance [hour, month, year]")
+	TermFlags.Uint64Var(&TermCount, "term-count", 1, "number of terms to pay for in advance")
 }

cmd/rofl/deploy.go

@@ -38,8 +38,6 @@ var (
 	deployProvider       string
 	deployOffer          string
 	deployMachine        string
-	deployTerm           string
-	deployTermCount      uint64
 	deployForce          bool
 	deployShowOffers     bool
 	deployReplaceMachine bool
@@ -175,12 +173,12 @@ var (
 				showProviderOffer(ctx, offer)
 
 				term := detectTerm(offer)
-				if deployTermCount < 1 {
+				if roflCommon.TermCount < 1 {
 					return nil, nil, fmt.Errorf("number of terms must be at least 1")
 				}
 
 				// Calculate total price.
-				qTermCount := quantity.NewFromUint64(deployTermCount)
+				qTermCount := quantity.NewFromUint64(roflCommon.TermCount)
 				totalPrice, ok := offer.Payment.Native.Terms[term]
 				if !ok {
 					cobra.CheckErr("internal error: previously selected term not found in offer terms")
@@ -197,7 +195,7 @@ var (
 					Offer:      offer.ID,
 					Deployment: &machineDeployment,
 					Term:       term,
-					TermCount:  deployTermCount,
+					TermCount:  roflCommon.TermCount,
 				})
 
 				var sigTx, meta any
@@ -334,11 +332,11 @@ func detectTerm(offer *roflmarket.Offer) (term roflmarket.Term) {
 		cobra.CheckErr(fmt.Errorf("no payment terms available for offer '%s'", offer.ID))
 	}
 
-	if deployTerm != "" {
+	if roflCommon.Term != "" {
 		// Custom deploy term.
-		term = roflCommon.ParseMachineTerm(deployTerm)
+		term = roflCommon.ParseMachineTerm(roflCommon.Term)
 		if _, ok := offer.Payment.Native.Terms[term]; !ok {
-			cobra.CheckErr(fmt.Errorf("term '%s' is not available for offer '%s'", deployTerm, offer.ID))
+			cobra.CheckErr(fmt.Errorf("term '%s' is not available for offer '%s'", roflCommon.Term, offer.ID))
 		}
 		return
 	}
@@ -454,8 +452,6 @@ func init() {
 	providerFlags.StringVar(&deployProvider, "provider", "", "set the provider address")
 	providerFlags.StringVar(&deployOffer, "offer", "", "set the provider's offer identifier")
 	providerFlags.StringVar(&deployMachine, "machine", buildRofl.DefaultMachineName, "machine to deploy into")
-	providerFlags.StringVar(&deployTerm, "term", "", "term to pay for in advance")
-	providerFlags.Uint64Var(&deployTermCount, "term-count", 1, "number of terms to pay for in advance")
 	providerFlags.BoolVar(&deployForce, "force", false, "force deployment")
 	providerFlags.BoolVar(&deployShowOffers, "show-offers", false, "show all provider offers and quit")
 	providerFlags.BoolVar(&deployReplaceMachine, "replace-machine", false, "rent a new machine if the provided one expired")
@@ -464,4 +460,5 @@ func init() {
 	deployCmd.Flags().AddFlagSet(providerFlags)
 	deployCmd.Flags().AddFlagSet(roflCommon.DeploymentFlags)
 	deployCmd.Flags().AddFlagSet(roflCommon.WipeFlags)
+	deployCmd.Flags().AddFlagSet(roflCommon.TermFlags)
 }

cmd/rofl/machine/mgmt.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
 
 	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/client"
@@ -22,9 +21,6 @@ import (
 )
 
 var (
-	topUpTerm      string
-	topUpTermCount uint64
-
 	showCmd = &cobra.Command{
 		Use:   "show [<machine-name>]",
 		Short: "Show information about a machine",
@@ -262,13 +258,16 @@ var (
 			// Resolve provider address.
 			providerAddr, _, err := common.ResolveLocalAccountOrAddress(npa.Network, machine.Provider)
 			if err != nil {
-				cobra.CheckErr(fmt.Sprintf("Invalid provider address: %s", err))
+				cobra.CheckErr(fmt.Sprintf("invalid provider address: %s", err))
 			}
 
 			// Parse machine payment term.
-			term := roflCommon.ParseMachineTerm(topUpTerm)
-			if topUpTermCount < 1 {
-				cobra.CheckErr("Number of terms must be at least 1.")
+			if roflCommon.Term == "" {
+				cobra.CheckErr("no term period specified. Use --term to specify it")
+			}
+			term := roflCommon.ParseMachineTerm(roflCommon.Term)
+			if roflCommon.TermCount < 1 {
+				cobra.CheckErr("number of terms must be at least 1.")
 			}
 
 			// When not in offline mode, connect to the given network endpoint.
@@ -281,14 +280,14 @@ var (
 
 			fmt.Printf("Using provider:     %s (%s)\n", machine.Provider, providerAddr)
 			fmt.Printf("Top-up machine:     %s [%s]\n", machineName, machine.ID)
-			fmt.Printf("Top-up term:        %d x %s\n", topUpTermCount, topUpTerm)
+			fmt.Printf("Top-up term:        %d x %s\n", roflCommon.TermCount, roflCommon.Term)
 
 			// Prepare transaction.
 			tx := roflmarket.NewInstanceTopUpTx(nil, &roflmarket.InstanceTopUp{
 				Provider:  *providerAddr,
 				ID:        machineID,
 				Term:      term,
-				TermCount: topUpTermCount,
+				TermCount: roflCommon.TermCount,
 			})
 
 			acc := common.LoadAccount(cliConfig.Global(), npa.AccountName)
@@ -402,10 +401,6 @@ func showCommandArgs[V any](npa *common.NPASelection, raw []byte, args V) {
 }
 
 func init() {
-	topUpFlags := flag.NewFlagSet("", flag.ContinueOnError)
-	topUpFlags.StringVar(&topUpTerm, "term", roflCommon.TermMonth, "term to pay for in advance")
-	topUpFlags.Uint64Var(&topUpTermCount, "term-count", 1, "number of terms to pay for in advance")
-
 	showCmd.Flags().AddFlagSet(common.SelectorFlags)
 	showCmd.Flags().AddFlagSet(roflCommon.DeploymentFlags)
 
@@ -426,5 +421,5 @@ func init() {
 	topUpCmd.Flags().AddFlagSet(common.SelectorFlags)
 	topUpCmd.Flags().AddFlagSet(common.RuntimeTxFlags)
 	topUpCmd.Flags().AddFlagSet(roflCommon.DeploymentFlags)
-	topUpCmd.Flags().AddFlagSet(topUpFlags)
+	topUpCmd.Flags().AddFlagSet(roflCommon.TermFlags)
 }