Group skywire-cli visor subcommands

cmd/skywire-cli/commands/config/gen.go

@@ -46,6 +46,7 @@ var (
 	disableApps        string
 	bestProtocol       bool
 	serviceConfURL     string
+	fallback           bool
 )
 
 func init() {
@@ -86,34 +87,39 @@ var genConfigCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, _ []string) {
 		mLog := logging.NewMasterLogger()
 		mLog.SetLevel(logrus.InfoLevel)
+		var services visorconfig.Services
 
 		urlstr := []string{"http://", serviceConfURL, "/config"}
-		serviceConfURL = strings.Join(urlstr, "")
+		serviceConfURL1 := strings.Join(urlstr, "")
 		client := http.Client{
 			Timeout: time.Second * 2, // Timeout after 2 seconds
 		}
-		req, err := http.NewRequest(http.MethodGet, serviceConfURL, nil)
+		req, err := http.NewRequest(http.MethodGet, serviceConfURL1, nil)
 		if err != nil {
 			mLog.Fatal(err)
 		}
 
 		res, err := client.Do(req)
 		if err != nil {
-			mLog.Fatal(err)
-		}
-
-		if res.Body != nil {
-			defer res.Body.Close() //nolint
-		}
-
-		body, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			mLog.Fatal(err)
-		}
-		var services visorconfig.Services
-		err = json.Unmarshal(body, &services)
-		if err != nil {
-			mLog.Fatal(err)
+			if serviceConfURL != "skywire.skycoin.com" { // unhardcode this later
+				mLog.WithError(err).Fatal("Failed to fetch servers\n")
+			} else {
+				mLog.WithError(err).Error("Failed to fetch servers\n")
+				mLog.Info("Falling back on hardcoded servers")
+				fallback = true
+			}
+		} else {
+			if res.Body != nil {
+				defer res.Body.Close() //nolint
+			}
+			body, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				mLog.Fatal(err)
+			}
+			err = json.Unmarshal(body, &services)
+			if err != nil {
+				mLog.Fatal(err)
+			}
 		}
 
 		//fmt.Println(services)
@@ -154,6 +160,18 @@ var genConfigCmd = &cobra.Command{
 			genConf = visorconfig.MakeDefaultConfig
 		}
 
+		// fall back on server values from skywire-utilities/pkg/skyenv
+		if fallback {
+			services.DmsgDiscovery = skyenv.DefaultDmsgDiscAddr
+			services.TransportDiscovery = skyenv.DefaultTpDiscAddr
+			services.AddressResolver = skyenv.DefaultAddressResolverAddr
+			services.RouteFinder = skyenv.DefaultRouteFinderAddr
+			services.SetupNodes = append(services.SetupNodes, skyenv.MustPK(skyenv.DefaultSetupPK))
+			services.UptimeTracker = skyenv.DefaultUptimeTrackerAddr
+			services.ServiceDiscovery = skyenv.DefaultServiceDiscAddr
+			services.StunServers = skyenv.GetStunServers()
+		}
+
 		// Generate config.
 		conf, err := genConf(mLog, output, &sk, hypervisor, services)
 		if err != nil {
@@ -216,20 +234,23 @@ var genConfigCmd = &cobra.Command{
 				conf.UptimeTracker.Addr = dmsgHTTPServersList.Prod.UptimeTracker
 				conf.Routing.RouteFinder = dmsgHTTPServersList.Prod.RouteFinder
 				conf.Launcher.ServiceDisc = dmsgHTTPServersList.Prod.ServiceDiscovery
-				/*
-					conf.Dmsg.Servers = dmsgHTTPServersList.Prod.DMSGServers
-					conf.Dmsg.Discovery = services.DmsgDiscovery
-					conf.Transport.AddressResolver = services.AddressResolver
-					conf.Transport.Discovery = services.TransportDiscovery
-					conf.UptimeTracker.Addr = services.UptimeTracker
-					conf.Routing.RouteFinder = services.RouteFinder
-					conf.Routing.SetupNodes = services.SetupNodes
-					conf.Launcher.ServiceDisc = services.ServiceDiscovery
-					conf.StunServers = services.StunServers
-				*/
 			}
 		}
 
+		/*
+				if fallback {
+					conf.Dmsg.Servers = dmsgHTTPServersList.Prod.DMSGServers
+					conf.Dmsg.Discovery = skyenv.DefaultDmsgDiscAddr
+					conf.Transport.AddressResolver = skyenv.DefaultAddressResolverAddr
+					conf.Transport.Discovery = skyenv.DefaultTpDiscAddr
+					conf.UptimeTracker.Addr = skyenv.DefaultUptimeTrackerAddr
+					conf.Routing.RouteFinder = skyenv.DefaultRouteFinderAddr
+					conf.Routing.SetupNodes = skyenv.DefaultSetupPK
+					conf.Launcher.ServiceDisc = skyenv.DefaultServiceDiscAddr
+					conf.StunServers = skyenv.GetStunServers()
+			}
+		*/
+
 		// Read in old config (if any) and obtain old hypervisors.
 		if replaceHypervisors {
 			if oldConf, ok := readOldConfig(mLog, output, true, hypervisor, services); ok {
@@ -318,7 +339,7 @@ func readOldConfig(log *logging.MasterLogger, confPath string, replace bool, hyp
 	}
 
 	if !replace {
-		logger.Fatal("Config file already exists. Specify the 'replace, r' flag to replace this.")
+		logger.Fatal("Config file already exists. Specify the 'replace, r' flag to replace.")
 	}
 
 	conf, err := visorconfig.Parse(log, confPath, raw, hypervisor, services)

cmd/skywire-cli/commands/config/root.go

@@ -3,10 +3,16 @@ package config
 import (
 	"github.com/skycoin/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
+
+	"github.com/skycoin/skywire/cmd/skywire-cli/commands/config/update"
 )
 
 var logger = logging.MustGetLogger("skywire-cli")
 
+func init() {
+	RootCmd.AddCommand(update.RootCmd)
+}
+
 // RootCmd contains commands that interact with the config of local skywire-visor
 var RootCmd = &cobra.Command{
 	Use:   "config",

cmd/skywire-cli/commands/config/update/root.go

@@ -0,0 +1,173 @@
+package update
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/sirupsen/logrus"
+	"github.com/skycoin/skycoin/src/util/logging"
+	"github.com/spf13/cobra"
+
+	"github.com/skycoin/skywire/pkg/visor/visorconfig"
+)
+
+var (
+	addOutput              string
+	addInput               string
+	environment            string
+	updateEndpoints        bool
+	addHypervisorPKs       string
+	resetHypervisor        bool
+	setVPNClientKillswitch string
+	addVPNClientSrv        string
+	addVPNClientPasscode   string
+	resetVPNclient         bool
+	addVPNServerPasscode   string
+	setVPNServerSecure     string
+	resetVPNServer         bool
+	addSkysocksClientSrv   string
+	resetSkysocksClient    bool
+	skysocksPasscode       string
+	resetSkysocks          bool
+	setPublicAutoconnect   string
+	serviceConfURL         string
+	minHops                int
+	output                 string
+)
+
+var logger = logging.MustGetLogger("skywire-cli")
+
+func init() {
+	RootCmd.Flags().SortFlags = false
+	RootCmd.Flags().BoolVarP(&updateEndpoints, "endpoints", "a", false, "update server endpoints")
+	RootCmd.Flags().StringVarP(&serviceConfURL, "url", "b", "skywire.skycoin.com", "service configuration URL")
+	RootCmd.Flags().StringVarP(&environment, "environment", "c", "production", "desired environment (values production or testing)")
+	RootCmd.Flags().StringVar(&setPublicAutoconnect, "public-autoconn", "", "change public autoconnect configuration")
+	RootCmd.Flags().IntVar(&minHops, "set-minhop", -1, "change min hops value")
+	RootCmd.PersistentFlags().StringVarP(&addInput, "input", "i", "skywire-config.json", "path of input config file.")
+	RootCmd.PersistentFlags().StringVarP(&addOutput, "output", "o", "skywire-config.json", "path of output config file.")
+	RootCmd.PersistentFlags().BoolVarP(&pkg, "pkg", "p", false, "read from /opt/skywire/skywire.json")
+}
+
+// RootCmd contains commands that update the config
+var RootCmd = &cobra.Command{
+	Use:   "update",
+	Short: "update a config file",
+	PreRun: func(_ *cobra.Command, _ []string) {
+		var err error
+		if output, err = filepath.Abs(addOutput); err != nil {
+			logger.WithError(err).Fatal("Invalid config output.")
+		}
+	},
+	Run: func(cmd *cobra.Command, _ []string) {
+		mLog := logging.NewMasterLogger()
+		mLog.SetLevel(logrus.InfoLevel)
+		if cmd.Flags().Changed("serviceConfURL") {
+			updateEndpoints = true
+		}
+		var services visorconfig.Services
+		if updateEndpoints {
+			urlstr := []string{"http://", serviceConfURL, "/config"}
+			serviceConfURL = strings.Join(urlstr, "")
+			client := http.Client{
+				Timeout: time.Second * 2, // Timeout after 2 seconds
+			}
+			req, err := http.NewRequest(http.MethodGet, serviceConfURL, nil)
+			if err != nil {
+				mLog.Fatal(err)
+			}
+			res, err := client.Do(req)
+			if err != nil {
+				mLog.Fatal(err)
+			}
+			if res.Body != nil {
+				defer res.Body.Close() //nolint
+			}
+			body, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				mLog.Fatal(err)
+			}
+			err = json.Unmarshal(body, &services)
+			if err != nil {
+				mLog.Fatal(err)
+			}
+		}
+
+		conf, ok := visorconfig.ReadConfig(addInput)
+		if ok != nil {
+			mLog.WithError(ok).Fatal("Failed to parse config.")
+		}
+
+		switch environment {
+		case "production":
+			visorconfig.SetDefaultProductionValues(conf)
+		case "testing":
+			visorconfig.SetDefaultTestingValues(conf)
+		default:
+			logger.Fatal("Unrecognized environment value: ", environment)
+		}
+
+		switch setPublicAutoconnect {
+		case "true":
+			conf.Transport.PublicAutoconnect = true
+		case "false":
+			conf.Transport.PublicAutoconnect = false
+		case "":
+			break
+		default:
+			logger.Fatal("Unrecognized public autoconnect value: ", setPublicAutoconnect)
+		}
+
+		if minHops >= 0 {
+			conf.Routing.MinHops = uint16(minHops)
+		}
+
+		saveConfig(conf)
+	},
+}
+
+func changeAppsConfig(conf *visorconfig.V1, appName string, argName string, argValue string) {
+	apps := conf.Launcher.Apps
+	for index := range apps {
+		if apps[index].Name != appName {
+			continue
+		}
+		updated := false
+		for ind, arg := range apps[index].Args {
+			if arg == argName {
+				apps[index].Args[ind+1] = argValue
+				updated = true
+			}
+		}
+		if !updated {
+			apps[index].Args = append(apps[index].Args, argName, argValue)
+		}
+	}
+}
+
+func resetAppsConfig(conf *visorconfig.V1, appName string) {
+	apps := conf.Launcher.Apps
+	for index := range apps {
+		if apps[index].Name == appName {
+			apps[index].Args = []string{}
+		}
+	}
+}
+
+func saveConfig(conf *visorconfig.V1) {
+	// Save config to file.
+	if err := conf.Flush(); err != nil {
+		logger.WithError(err).Fatal("Failed to flush config to file.")
+	}
+
+	// Print results.
+	j, err := json.MarshalIndent(conf, "", "\t")
+	if err != nil {
+		logger.WithError(err).Fatal("An unexpected error occurred. Please contact a developer.")
+	}
+	logger.Infof("Updated file '%s' to: %s", output, j)
+}