refactor

Author: anirudhwarrier

cmd/workflow/pause/pause.go

@@ -3,7 +3,6 @@ package pause
 import (
 	"encoding/hex"
 	"fmt"
-
 	"math/big"
 	"sync"
 	"time"

internal/settings/settings_load.go

@@ -60,15 +60,11 @@ var Flags = flagNames{
 	SkipConfirmation:     Flag{"yes", "y"},
 }
 
-//func AddTxnTypeFlags(cmd *cobra.Command) {
-//	AddTxnTypeFlags(cmd)
-//	cmd.Flags().Bool(Flags.Ledger.Name, false, "Sign the workflow with a Ledger device [EXPERIMENTAL]")
-//	cmd.Flags().String(Flags.LedgerDerivationPath.Name, "m/44'/60'/0'/0/0", "Derivation path for the Ledger device")
-//}
-
 func AddTxnTypeFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool(Flags.RawTxFlag.Name, false, "If set, the command will either return the raw transaction instead of sending it to the network or execute the second step of secrets operations using a previously generated raw transaction")
 	cmd.Flags().Bool(Flags.Changeset.Name, false, "If set, the command will output a changeset YAML for use with CLD instead of sending the transaction to the network")
+	//	cmd.Flags().Bool(Flags.Ledger.Name, false, "Sign the workflow with a Ledger device [EXPERIMENTAL]")
+	//	cmd.Flags().String(Flags.LedgerDerivationPath.Name, "m/44'/60'/0'/0/0", "Derivation path for the Ledger device")
 }
 
 func AddSkipConfirmation(cmd *cobra.Command) {

internal/settings/workflow_settings.go

@@ -2,12 +2,13 @@ package settings
 
 import (
 	"fmt"
+	"net/url"
+	"strings"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"net/url"
-	"strings"
 )
 
 type WorkflowSettings struct {
@@ -77,15 +78,18 @@ func loadWorkflowSettings(logger *zerolog.Logger, v *viper.Viper, cmd *cobra.Com
 	workflowSettings.WorkflowArtifactSettings.SecretsPath = getSetting(SecretsPathSettingName)
 	workflowSettings.LoggingSettings.SethConfigPath = getSetting(SethConfigPathSettingName)
 
-	workflowSettings.CLDSettings.CLDPath = getSetting("cld-settings.cld-path")
-	workflowSettings.CLDSettings.WorkflowRegistryQualifier = getSetting("cld-settings.workflow-registry-qualifier")
-	workflowSettings.CLDSettings.Environment = getSetting("cld-settings.environment")
-	workflowSettings.CLDSettings.Domain = getSetting("cld-settings.domain")
-	workflowSettings.CLDSettings.MCMSSettings.MCMSAction = getSetting("cld-settings.mcms-settings.mcms-action")
-	workflowSettings.CLDSettings.MCMSSettings.TimelockQualifier = getSetting("cld-settings.mcms-settings.timelock-qualifier")
-	workflowSettings.CLDSettings.MCMSSettings.MinDelay = getSetting("cld-settings.mcms-settings.min-delay")
-	workflowSettings.CLDSettings.MCMSSettings.ValidDuration = getSetting("cld-settings.mcms-settings.valid-duration")
-	workflowSettings.CLDSettings.MCMSSettings.OverrideRoot = getSetting("cld-settings.mcms-settings.override-root")
+	isChangeset, _ := cmd.Flags().GetBool(Flags.Changeset.Name)
+	if isChangeset {
+		workflowSettings.CLDSettings.CLDPath = getSetting("cld-settings.cld-path")
+		workflowSettings.CLDSettings.WorkflowRegistryQualifier = getSetting("cld-settings.workflow-registry-qualifier")
+		workflowSettings.CLDSettings.Environment = getSetting("cld-settings.environment")
+		workflowSettings.CLDSettings.Domain = getSetting("cld-settings.domain")
+		workflowSettings.CLDSettings.MCMSSettings.MCMSAction = getSetting("cld-settings.mcms-settings.mcms-action")
+		workflowSettings.CLDSettings.MCMSSettings.TimelockQualifier = getSetting("cld-settings.mcms-settings.timelock-qualifier")
+		workflowSettings.CLDSettings.MCMSSettings.MinDelay = getSetting("cld-settings.mcms-settings.min-delay")
+		workflowSettings.CLDSettings.MCMSSettings.ValidDuration = getSetting("cld-settings.mcms-settings.valid-duration")
+		workflowSettings.CLDSettings.MCMSSettings.OverrideRoot = getSetting("cld-settings.mcms-settings.override-root")
+	}
 
 	fullRPCsKey := fmt.Sprintf("%s.%s", target, RpcsSettingName)
 	if v.IsSet(fullRPCsKey) {

internal/types/changeset.go

@@ -2,15 +2,19 @@ package types
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"sigs.k8s.io/yaml"
+
 	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
 	crecontracts "github.com/smartcontractkit/chainlink/deployment/cre/contracts"
 	"github.com/smartcontractkit/chainlink/deployment/cre/workflow_registry/v2/changeset"
-	"github.com/smartcontractkit/cre-cli/internal/settings"
 	mcmstypes "github.com/smartcontractkit/mcms/types"
-	"os"
-	"path/filepath"
-	"sigs.k8s.io/yaml"
-	"time"
+
+	"github.com/smartcontractkit/cre-cli/internal/settings"
 )
 
 type ChangesetFile struct {
@@ -87,10 +91,11 @@ func MCMSConfig(settings *settings.Settings, chainSelector uint64) (*crecontract
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse valid duration: %w", err)
 	}
+	mcmsAction := mcmstypes.TimelockAction(strings.ToLower(settings.Workflow.CLDSettings.MCMSSettings.MCMSAction))
 
 	return &crecontracts.MCMSConfig{
 		MinDelay:     minDelay,
-		MCMSAction:   mcmstypes.TimelockActionSchedule,
+		MCMSAction:   mcmsAction,
 		OverrideRoot: settings.Workflow.CLDSettings.MCMSSettings.OverrideRoot == "true",
 		TimelockQualifierPerChain: map[uint64]string{
 			chainSelector: settings.Workflow.CLDSettings.MCMSSettings.TimelockQualifier,