Merge branch 'master' into feat/CI

VERSION

@@ -1 +1 @@
-3.0.14
+3.0.15

cmd/flag.go

@@ -24,6 +24,10 @@ var (
 		Value: "mainnet",
 		Usage: "Network of your Darknode (default: mainnet)",
 	}
+	ConfigFlag = cli.StringFlag{
+		Name: "config",
+		Usage: "Path of the config file",
+	}
 	AddressFlag = cli.StringFlag{
 		Name:  "address",
 		Usage: "Ethereum address you want to withdraw the tokens to",

cmd/main.go

@@ -40,7 +40,7 @@ func main() {
 			Usage: "Deploy a new Darknode",
 			Flags: []cli.Flag{
 				// General
-				NameFlag, TagsFlag, NetworkFlag,
+				NameFlag, TagsFlag, NetworkFlag, ConfigFlag,
 				// AWS
 				AwsFlag, AwsAccessKeyFlag, AwsSecretKeyFlag, AwsInstanceFlag, AwsRegionFlag, AwsProfileFlag,
 				// Digital Ocean

cmd/provider/aws.go

@@ -66,6 +66,7 @@ func (p providerAws) Name() string {
 func (p providerAws) Deploy(ctx *cli.Context) error {
 	name := ctx.String("name")
 	tags := ctx.String("tags")
+	config := ctx.String("config")
 
 	latestVersion, err := util.LatestStableRelease()
 	if err != nil {
@@ -81,7 +82,7 @@ func (p providerAws) Deploy(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if err := initNode(name, tags, network); err != nil {
+	if err := initNode(name, tags, network, config); err != nil {
 		return err
 	}
 

cmd/provider/do.go

@@ -32,6 +32,7 @@ func (p providerDo) Name() string {
 func (p providerDo) Deploy(ctx *cli.Context) error {
 	name := ctx.String("name")
 	tags := ctx.String("tags")
+	config := ctx.String("config")
 
 	latestVersion, err := util.LatestStableRelease()
 	if err != nil {
@@ -47,7 +48,7 @@ func (p providerDo) Deploy(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if err := initNode(name, tags, network); err != nil {
+	if err := initNode(name, tags, network, config); err != nil {
 		return err
 	}
 

cmd/provider/gcp.go

@@ -70,6 +70,7 @@ func (p providerGcp) Name() string {
 func (p providerGcp) Deploy(ctx *cli.Context) error {
 	name := ctx.String("name")
 	tags := ctx.String("tags")
+	config := ctx.String("config")
 
 	latestVersion, err := util.LatestStableRelease()
 	if err != nil {
@@ -89,7 +90,7 @@ func (p providerGcp) Deploy(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if err := initNode(name, tags, network); err != nil {
+	if err := initNode(name, tags, network, config); err != nil {
 		return err
 	}
 

cmd/provider/provider.go

@@ -83,20 +83,40 @@ func GetProvider(name string) (string, error) {
 }
 
 // initialise all files needed by deploying a new node
-func initNode(name, tags string, network darknode.Network) error {
+func initNode(name, tags string, network darknode.Network, configFile string) error {
 	if err := initNodeDirectory(name, tags); err != nil {
 		return err
 	}
 	if err := util.GenerateSshKeyAndWriteToDir(name); err != nil {
 		return err
 	}
 
-	// Generate a new config and write to a file.
-	config, err := darknode.NewConfig(network)
-	if err != nil {
-		return err
+	// Use given config for the new darknode
+	var conf darknode.Config
+	if configFile != "" {
+		path, err := filepath.Abs(configFile)
+		if err != nil{
+			return errors.New("invalid config path")
+		}
+
+		file, err := os.Open(path)
+		if err != nil {
+			return fmt.Errorf("cannot open config file, err = %v", err)
+		}
+		defer file.Close()
+
+		if err := json.NewDecoder(file).Decode(&conf); err != nil {
+			return err
+		}
+	} else {
+		var err error
+		conf, err = darknode.NewConfig(network)
+		if err != nil {
+			return err
+		}
 	}
-	configData, err := json.MarshalIndent(config, "", "    ")
+
+	configData, err := json.MarshalIndent(conf, "", "    ")
 	if err != nil {
 		return err
 	}