Add deployment registry selector

cmd/root.go

@@ -262,6 +262,10 @@ func newRootCommand() *cobra.Command {
 					return fmt.Errorf("%w", err)
 				}
 
+				if err := runtimeContext.AttachResolvedRegistry(); err != nil {
+					return err
+				}
+
 				// Restart spinner for remaining initialization
 				if showSpinner {
 					spinner = ui.NewSpinner()

cmd/workflow/activate/activate.go

@@ -45,6 +45,12 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			handler := newHandler(runtimeContext)
 
+			if runtimeContext.ResolvedRegistry != nil {
+				if err := runtimeContext.ResolvedRegistry.RequireOnChainRegistry("activate"); err != nil {
+					return err
+				}
+			}
+
 			inputs, err := handler.ResolveInputs(runtimeContext.Viper)
 			if err != nil {
 				return err
@@ -108,9 +114,9 @@ func (h *handler) ResolveInputs(v *viper.Viper) (Inputs, error) {
 	return Inputs{
 		WorkflowName:                      h.settings.Workflow.UserWorkflowSettings.WorkflowName,
 		WorkflowOwner:                     h.settings.Workflow.UserWorkflowSettings.WorkflowOwnerAddress,
-		DonFamily:                         h.environmentSet.DonFamily,
-		WorkflowRegistryContractAddress:   h.environmentSet.WorkflowRegistryAddress,
-		WorkflowRegistryContractChainName: h.environmentSet.WorkflowRegistryChainName,
+		DonFamily:                         h.runtimeContext.ResolvedRegistry.DonFamily,
+		WorkflowRegistryContractAddress:   h.runtimeContext.ResolvedRegistry.Address,
+		WorkflowRegistryContractChainName: h.runtimeContext.ResolvedRegistry.ChainName,
 	}, nil
 }
 
@@ -182,10 +188,10 @@ func (h *handler) Execute() error {
 	switch txOut.Type {
 	case client.Regular:
 		ui.Success(fmt.Sprintf("Transaction confirmed: %s", txOut.Hash))
-		ui.URL(fmt.Sprintf("%s/tx/%s", h.environmentSet.WorkflowRegistryChainExplorerURL, txOut.Hash))
+		ui.URL(fmt.Sprintf("%s/tx/%s", h.runtimeContext.ResolvedRegistry.ExplorerURL, txOut.Hash))
 		ui.Line()
 		ui.Success("Workflow activated successfully")
-		ui.Dim(fmt.Sprintf("   Contract address: %s", h.environmentSet.WorkflowRegistryAddress))
+		ui.Dim(fmt.Sprintf("   Contract address: %s", h.runtimeContext.ResolvedRegistry.Address))
 		ui.Dim(fmt.Sprintf("   Transaction hash: %s", txOut.Hash))
 		ui.Dim(fmt.Sprintf("   Workflow Name:    %s", workflowName))
 		ui.Dim(fmt.Sprintf("   Workflow ID:      %s", hex.EncodeToString(latest.WorkflowId[:])))
@@ -207,9 +213,9 @@ func (h *handler) Execute() error {
 		ui.Line()
 
 	case client.Changeset:
-		chainSelector, err := settings.GetChainSelectorByChainName(h.environmentSet.WorkflowRegistryChainName)
+		chainSelector, err := settings.GetChainSelectorByChainName(h.runtimeContext.ResolvedRegistry.ChainName)
 		if err != nil {
-			return fmt.Errorf("failed to get chain selector for chain %q: %w", h.environmentSet.WorkflowRegistryChainName, err)
+			return fmt.Errorf("failed to get chain selector for chain %q: %w", h.runtimeContext.ResolvedRegistry.ChainName, err)
 		}
 		mcmsConfig, err := settings.GetMCMSConfig(h.settings, chainSelector)
 		if err != nil {

cmd/workflow/delete/delete.go

@@ -44,6 +44,12 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			handler := newHandler(runtimeContext, cmd.InOrStdin())
 
+			if runtimeContext.ResolvedRegistry != nil {
+				if err := runtimeContext.ResolvedRegistry.RequireOnChainRegistry("delete"); err != nil {
+					return err
+				}
+			}
+
 			inputs, err := handler.ResolveInputs(runtimeContext.Viper)
 			if err != nil {
 				return err
@@ -114,8 +120,8 @@ func (h *handler) ResolveInputs(v *viper.Viper) (Inputs, error) {
 		WorkflowName:                      h.settings.Workflow.UserWorkflowSettings.WorkflowName,
 		WorkflowOwner:                     h.settings.Workflow.UserWorkflowSettings.WorkflowOwnerAddress,
 		SkipConfirmation:                  v.GetBool(settings.Flags.SkipConfirmation.Name),
-		WorkflowRegistryContractChainName: h.environmentSet.WorkflowRegistryChainName,
-		WorkflowRegistryContractAddress:   h.environmentSet.WorkflowRegistryAddress,
+		WorkflowRegistryContractChainName: h.runtimeContext.ResolvedRegistry.ChainName,
+		WorkflowRegistryContractAddress:   h.runtimeContext.ResolvedRegistry.Address,
 	}, nil
 }
 
@@ -193,7 +199,7 @@ func (h *handler) Execute() error {
 		switch txOut.Type {
 		case client.Regular:
 			ui.Success("Transaction confirmed")
-			ui.URL(fmt.Sprintf("%s/tx/%s", h.environmentSet.WorkflowRegistryChainExplorerURL, txOut.Hash))
+			ui.URL(fmt.Sprintf("%s/tx/%s", h.runtimeContext.ResolvedRegistry.ExplorerURL, txOut.Hash))
 			ui.Success(fmt.Sprintf("Deleted workflow ID: %s", hex.EncodeToString(wf.WorkflowId[:])))
 
 		case client.Raw:
@@ -212,9 +218,9 @@ func (h *handler) Execute() error {
 			ui.Line()
 
 		case client.Changeset:
-			chainSelector, err := settings.GetChainSelectorByChainName(h.environmentSet.WorkflowRegistryChainName)
+			chainSelector, err := settings.GetChainSelectorByChainName(h.runtimeContext.ResolvedRegistry.ChainName)
 			if err != nil {
-				return fmt.Errorf("failed to get chain selector for chain %q: %w", h.environmentSet.WorkflowRegistryChainName, err)
+				return fmt.Errorf("failed to get chain selector for chain %q: %w", h.runtimeContext.ResolvedRegistry.ChainName, err)
 			}
 			mcmsConfig, err := settings.GetMCMSConfig(h.settings, chainSelector)
 			if err != nil {

cmd/workflow/deploy/artifacts.go

@@ -33,12 +33,12 @@ func (h *handler) uploadArtifacts() error {
 
 	gql := graphqlclient.New(h.credentials, h.environmentSet, h.log)
 
-	chainSelector, err := settings.GetChainSelectorByChainName(h.environmentSet.WorkflowRegistryChainName)
+	chainSelector, err := settings.GetChainSelectorByChainName(h.runtimeContext.ResolvedRegistry.ChainName)
 	if err != nil {
-		return fmt.Errorf("failed to get chain selector for chain %q: %w", h.environmentSet.WorkflowRegistryChainName, err)
+		return fmt.Errorf("failed to get chain selector for chain %q: %w", h.runtimeContext.ResolvedRegistry.ChainName, err)
 	}
 
-	storageClient := storageclient.New(gql, h.environmentSet.WorkflowRegistryAddress, h.settings.Workflow.UserWorkflowSettings.WorkflowOwnerAddress, chainSelector, h.log)
+	storageClient := storageclient.New(gql, h.runtimeContext.ResolvedRegistry.Address, h.settings.Workflow.UserWorkflowSettings.WorkflowOwnerAddress, chainSelector, h.log)
 	if h.settings.StorageSettings.CREStorage.ServiceTimeout != 0 {
 		storageClient.SetServiceTimeout(h.settings.StorageSettings.CREStorage.ServiceTimeout)
 	}

cmd/workflow/deploy/compile_test.go

@@ -238,6 +238,7 @@ func createTestSettings(workflowOwnerAddress, workflowOwnerType, workflowName, w
 				WorkflowOwnerAddress string `mapstructure:"workflow-owner-address" yaml:"workflow-owner-address"`
 				WorkflowOwnerType    string `mapstructure:"workflow-owner-type" yaml:"workflow-owner-type"`
 				WorkflowName         string `mapstructure:"workflow-name" yaml:"workflow-name"`
+				DeploymentRegistry   string `mapstructure:"deployment-registry" yaml:"deployment-registry"`
 			}{
 				WorkflowOwnerAddress: workflowOwnerAddress,
 				WorkflowOwnerType:    workflowOwnerType,

cmd/workflow/deploy/deploy.go

@@ -95,6 +95,12 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			h := newHandler(runtimeContext, cmd.InOrStdin())
 
+			if runtimeContext.ResolvedRegistry != nil {
+				if err := runtimeContext.ResolvedRegistry.RequireOnChainRegistry("deploy"); err != nil {
+					return err
+				}
+			}
+
 			inputs, err := h.ResolveInputs(runtimeContext.Viper)
 			if err != nil {
 				return err
@@ -173,7 +179,7 @@ func (h *handler) ResolveInputs(v *viper.Viper) (Inputs, error) {
 		WorkflowOwner: h.settings.Workflow.UserWorkflowSettings.WorkflowOwnerAddress,
 		WorkflowTag:   workflowTag,
 		ConfigURL:     configURL,
-		DonFamily:     h.environmentSet.DonFamily,
+		DonFamily:     h.runtimeContext.ResolvedRegistry.DonFamily,
 
 		WorkflowPath: h.settings.Workflow.WorkflowArtifactSettings.WorkflowPath,
 		KeepAlive:    false,
@@ -182,8 +188,8 @@ func (h *handler) ResolveInputs(v *viper.Viper) (Inputs, error) {
 		OutputPath: v.GetString("output"),
 		WasmPath:   v.GetString("wasm"),
 
-		WorkflowRegistryContractChainName: h.environmentSet.WorkflowRegistryChainName,
-		WorkflowRegistryContractAddress:   h.environmentSet.WorkflowRegistryAddress,
+		WorkflowRegistryContractChainName: h.runtimeContext.ResolvedRegistry.ChainName,
+		WorkflowRegistryContractAddress:   h.runtimeContext.ResolvedRegistry.Address,
 		OwnerLabel:                        v.GetString("owner-label"),
 		SkipConfirmation:                  v.GetBool(settings.Flags.SkipConfirmation.Name),
 		SkipTypeChecks:                    v.GetBool(cmdcommon.SkipTypeChecksCLIFlag),

cmd/workflow/deploy/register.go

@@ -68,12 +68,12 @@ func (h *handler) handleUpsert(params client.RegisterWorkflowV2Parameters) error
 	switch txOut.Type {
 	case client.Regular:
 		ui.Success("Transaction confirmed")
-		ui.URL(fmt.Sprintf("%s/tx/%s", h.environmentSet.WorkflowRegistryChainExplorerURL, txOut.Hash))
+		ui.URL(fmt.Sprintf("%s/tx/%s", h.runtimeContext.ResolvedRegistry.ExplorerURL, txOut.Hash))
 		ui.Line()
 		ui.Success("Workflow deployed successfully")
 		ui.Line()
 		ui.Bold("Details:")
-		ui.Dim(fmt.Sprintf("   Contract address: %s", h.environmentSet.WorkflowRegistryAddress))
+		ui.Dim(fmt.Sprintf("   Contract address: %s", h.runtimeContext.ResolvedRegistry.Address))
 		ui.Dim(fmt.Sprintf("   Transaction hash: %s", txOut.Hash))
 		ui.Dim(fmt.Sprintf("   Workflow Name:    %s", workflowName))
 		ui.Dim(fmt.Sprintf("   Workflow ID:      %s", h.workflowArtifact.WorkflowID))
@@ -99,9 +99,9 @@ func (h *handler) handleUpsert(params client.RegisterWorkflowV2Parameters) error
 		ui.Line()
 
 	case client.Changeset:
-		chainSelector, err := settings.GetChainSelectorByChainName(h.environmentSet.WorkflowRegistryChainName)
+		chainSelector, err := settings.GetChainSelectorByChainName(h.runtimeContext.ResolvedRegistry.ChainName)
 		if err != nil {
-			return fmt.Errorf("failed to get chain selector for chain %q: %w", h.environmentSet.WorkflowRegistryChainName, err)
+			return fmt.Errorf("failed to get chain selector for chain %q: %w", h.runtimeContext.ResolvedRegistry.ChainName, err)
 		}
 		mcmsConfig, err := settings.GetMCMSConfig(h.settings, chainSelector)
 		if err != nil {

cmd/workflow/pause/pause.go

@@ -45,6 +45,12 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			handler := newHandler(runtimeContext)
 
+			if runtimeContext.ResolvedRegistry != nil {
+				if err := runtimeContext.ResolvedRegistry.RequireOnChainRegistry("pause"); err != nil {
+					return err
+				}
+			}
+
 			inputs, err := handler.ResolveInputs(runtimeContext.Viper)
 			if err != nil {
 				return err
@@ -107,8 +113,8 @@ func (h *handler) ResolveInputs(v *viper.Viper) (Inputs, error) {
 	return Inputs{
 		WorkflowName:                      h.settings.Workflow.UserWorkflowSettings.WorkflowName,
 		WorkflowOwner:                     h.settings.Workflow.UserWorkflowSettings.WorkflowOwnerAddress,
-		WorkflowRegistryContractChainName: h.environmentSet.WorkflowRegistryChainName,
-		WorkflowRegistryContractAddress:   h.environmentSet.WorkflowRegistryAddress,
+		WorkflowRegistryContractChainName: h.runtimeContext.ResolvedRegistry.ChainName,
+		WorkflowRegistryContractAddress:   h.runtimeContext.ResolvedRegistry.Address,
 	}, nil
 }
 
@@ -176,11 +182,11 @@ func (h *handler) Execute() error {
 	switch txOut.Type {
 	case client.Regular:
 		ui.Success("Transaction confirmed")
-		ui.URL(fmt.Sprintf("%s/tx/%s", h.environmentSet.WorkflowRegistryChainExplorerURL, txOut.Hash))
+		ui.URL(fmt.Sprintf("%s/tx/%s", h.runtimeContext.ResolvedRegistry.ExplorerURL, txOut.Hash))
 		ui.Success("Workflows paused successfully")
 		ui.Line()
 		ui.Bold("Details:")
-		ui.Dim(fmt.Sprintf("   Contract address: %s", h.environmentSet.WorkflowRegistryAddress))
+		ui.Dim(fmt.Sprintf("   Contract address: %s", h.runtimeContext.ResolvedRegistry.Address))
 		ui.Dim(fmt.Sprintf("   Transaction hash: %s", txOut.Hash))
 		ui.Dim(fmt.Sprintf("   Workflow Name:    %s", workflowName))
 		for _, w := range activeWorkflowIDs {
@@ -204,9 +210,9 @@ func (h *handler) Execute() error {
 		ui.Line()
 
 	case client.Changeset:
-		chainSelector, err := settings.GetChainSelectorByChainName(h.environmentSet.WorkflowRegistryChainName)
+		chainSelector, err := settings.GetChainSelectorByChainName(h.runtimeContext.ResolvedRegistry.ChainName)
 		if err != nil {
-			return fmt.Errorf("failed to get chain selector for chain %q: %w", h.environmentSet.WorkflowRegistryChainName, err)
+			return fmt.Errorf("failed to get chain selector for chain %q: %w", h.runtimeContext.ResolvedRegistry.ChainName, err)
 		}
 		mcmsConfig, err := settings.GetMCMSConfig(h.settings, chainSelector)
 		if err != nil {

cmd/workflow/simulate/simulate_test.go

@@ -111,6 +111,7 @@ func createSimulateTestSettings(workflowName, workflowPath, configPath string) *
 				WorkflowOwnerAddress string `mapstructure:"workflow-owner-address" yaml:"workflow-owner-address"`
 				WorkflowOwnerType    string `mapstructure:"workflow-owner-type" yaml:"workflow-owner-type"`
 				WorkflowName         string `mapstructure:"workflow-name" yaml:"workflow-name"`
+				DeploymentRegistry   string `mapstructure:"deployment-registry" yaml:"deployment-registry"`
 			}{
 				WorkflowName: workflowName,
 			},

internal/runtime/runtime_context.go

@@ -23,14 +23,15 @@ var (
 )
 
 type Context struct {
-	Logger         *zerolog.Logger
-	Viper          *viper.Viper
-	ClientFactory  client.Factory
-	Settings       *settings.Settings
-	Credentials    *credentials.Credentials
-	EnvironmentSet *environments.EnvironmentSet
-	TenantContext  *tenantctx.EnvironmentContext
-	Workflow       WorkflowRuntime
+	Logger           *zerolog.Logger
+	Viper            *viper.Viper
+	ClientFactory    client.Factory
+	Settings         *settings.Settings
+	Credentials      *credentials.Credentials
+	EnvironmentSet   *environments.EnvironmentSet
+	TenantContext    *tenantctx.EnvironmentContext
+	ResolvedRegistry *settings.ResolvedRegistry
+	Workflow         WorkflowRuntime
 }
 
 type WorkflowRuntime struct {
@@ -111,6 +112,24 @@ func (ctx *Context) AttachTenantContext(validationCtx context.Context) error {
 	return nil
 }
 
+// AttachResolvedRegistry resolves the deployment-registry from workflow
+// settings against the tenant context registries. Must be called after
+// AttachSettings and AttachTenantContext.
+func (ctx *Context) AttachResolvedRegistry() error {
+	deploymentRegistry := ""
+	if ctx.Settings != nil {
+		deploymentRegistry = ctx.Settings.Workflow.UserWorkflowSettings.DeploymentRegistry
+	}
+
+	resolved, err := settings.ResolveRegistry(deploymentRegistry, ctx.TenantContext, ctx.EnvironmentSet)
+	if err != nil {
+		return fmt.Errorf("failed to resolve deployment registry: %w", err)
+	}
+
+	ctx.ResolvedRegistry = resolved
+	return nil
+}
+
 func (ctx *Context) AttachEnvironmentSet() error {
 	var err error