Merge pull request #455 from oasisprotocol/matevz/fix/existing-provider-machine

cmd/rofl/deploy: Fix --provider behaviour

Author: matevz

build/rofl/provider/defaults.go

@@ -1,8 +1,20 @@
 package provider
 
-// DefaultSchedulerApp contains the default scheduler app IDs for each network/paratime.
-var DefaultSchedulerApp = map[string]map[string]string{
-	"testnet": {
-		"sapphire": "rofl1qrqw99h0f7az3hwt2cl7yeew3wtz0fxunu7luyfg",
+import "github.com/oasisprotocol/oasis-sdk/client-sdk/go/config"
+
+// RoflServices contains per network/ParaTime default ROFL services.
+type RoflServices struct {
+	// Scheduler is a ROFL app ID of the preferred scheduler app.
+	Scheduler string
+
+	// Provider is the address of the preferred provider.
+	Provider string
+}
+
+// DefaultRoflServices contains default built-in ROFL services for all supported networks/ParaTimes.
+var DefaultRoflServices = map[string]RoflServices{
+	config.DefaultNetworks.All["testnet"].ParaTimes.All["sapphire"].ID: {
+		Scheduler: "rofl1qrqw99h0f7az3hwt2cl7yeew3wtz0fxunu7luyfg",
+		Provider:  "oasis1qp2ens0hsp7gh23wajxa4hpetkdek3swyyulyrmz",
 	},
 }

cmd/rofl/deploy.go

@@ -17,6 +17,7 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	"github.com/oasisprotocol/oasis-core/go/common/sgx"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/client"
+	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/config"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/connection"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/modules/rofl"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/modules/roflmarket"
@@ -90,16 +91,20 @@ var (
 
 			switch machine.Provider {
 			case "":
-				// Not yet set, require the provider to be specified.
+				// Not yet set, obtain a new machine from the provider.
 				if deployProvider == "" {
-					cobra.CheckErr(fmt.Sprintf("Provider not configured for deployment '%s' machine '%s'. Please specify --provider.", deploymentName, deployMachine))
+					if npa.ParaTime.ID == config.DefaultNetworks.All["testnet"].ParaTimes.All["sapphire"].ID {
+						deployProvider = provider.DefaultRoflServices[npa.ParaTime.ID].Provider
+					} else {
+						cobra.CheckErr(fmt.Sprintf("Provider not configured for deployment '%s' machine '%s'. Please specify --provider.", deploymentName, deployMachine))
+					}
 				}
 
 				machine.Provider = deployProvider
 			default:
-				// Already set, require the provider to be omitted.
-				if deployProvider != "" {
-					cobra.CheckErr(fmt.Sprintf("Provider already configured for deployment '%s' machine '%s'. Omit --provider.", deploymentName, deployMachine))
+				// Already set, require the provider to be omitted or equal.
+				if deployProvider != "" && deployProvider != machine.Provider {
+					cobra.CheckErr(fmt.Sprintf("Provider '%s' conflicts with existing provider '%s' for deployment '%s' machine '%s'. Omit --provider.", deployProvider, machine.Provider, deploymentName, deployMachine))
 				}
 			}
 
@@ -345,7 +350,7 @@ func showProviderOffer(offer *roflmarket.Offer) {
 func init() {
 	providerFlags := flag.NewFlagSet("", flag.ContinueOnError)
 	// Default to Testnet playground provider.
-	providerFlags.StringVar(&deployProvider, "provider", "oasis1qp2ens0hsp7gh23wajxa4hpetkdek3swyyulyrmz", "set the provider address")
+	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")

cmd/rofl/provider/mgmt.go

@@ -36,8 +36,8 @@ var (
 			}
 
 			var schedulerApp rofl.AppID
-			rawSchedulerApp, ok := provider.DefaultSchedulerApp[npa.NetworkName][npa.ParaTimeName]
-			if ok {
+			rawSchedulerApp := provider.DefaultRoflServices[npa.ParaTime.ID].Scheduler
+			if rawSchedulerApp != "" {
 				err := schedulerApp.UnmarshalText([]byte(rawSchedulerApp))
 				cobra.CheckErr(err)
 			}