Skip to content

Commit 04412ef

Browse files
authored
Merge pull request #1522 from 0chain/feature/cli-key-file-raw-param
Feature: add raw key file param
2 parents f865e7f + 9d48039 commit 04412ef

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed

code/go/0chain.net/blobber/flags.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
var (
99
deploymentMode int
1010
keysFile string
11+
keysFileRaw string
1112
mountPoint string
1213
metadataDB string
1314
logDir string
@@ -24,6 +25,7 @@ var (
2425
func init() {
2526
flag.IntVar(&deploymentMode, "deployment_mode", 2, "deployment mode: 0=dev,1=test, 2=mainnet")
2627
flag.StringVar(&keysFile, "keys_file", "", "keys_file")
28+
flag.StringVar(&keysFileRaw, "keys_file_raw", "", "keys_file_raw")
2729
flag.StringVar(&mountPoint, "files_dir", "", "Mounted partition where all files will be stored")
2830
flag.StringVar(&metadataDB, "db_dir", "", "db_dir")
2931
flag.StringVar(&logDir, "log_dir", "", "log_dir")

code/go/0chain.net/blobber/node.go

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"bytes"
45
"errors"
56
"fmt"
67
"os"
@@ -18,15 +19,23 @@ var publicKey, privateKey string
1819
func setupNode() error {
1920
fmt.Println("> setup blobber")
2021

21-
err := readKeysFromAws()
22-
if err != nil {
23-
err = readKeysFromFile(&keysFile)
22+
var err error
23+
24+
if keysFileRaw != "" {
25+
err = readKeysFromString(&keysFileRaw)
26+
27+
fmt.Println("using blobber keys from local string")
28+
} else {
29+
err = readKeysFromAws()
2430
if err != nil {
25-
panic(err)
31+
err = readKeysFromFile(&keysFile)
32+
if err != nil {
33+
panic(err)
34+
}
35+
fmt.Println("using blobber keys from local")
36+
} else {
37+
fmt.Println("using blobber keys from aws")
2638
}
27-
fmt.Println("using blobber keys from local")
28-
} else {
29-
fmt.Println("using blobber keys from aws")
3039
}
3140

3241
node.Self.SetKeys(publicKey, privateKey)
@@ -72,6 +81,12 @@ func readKeysFromAws() error {
7281
return nil
7382
}
7483

84+
func readKeysFromString(keyFileRaw *string) error {
85+
publicKey, privateKey, _, _ = encryption.ReadKeys(
86+
bytes.NewBufferString(*keyFileRaw))
87+
return nil
88+
}
89+
7590
func readKeysFromFile(keysFile *string) error {
7691
reader, err := os.Open(*keysFile)
7792
if err != nil {
@@ -80,4 +95,4 @@ func readKeysFromFile(keysFile *string) error {
8095
defer reader.Close()
8196
publicKey, privateKey, _, _ = encryption.ReadKeys(reader)
8297
return nil
83-
}
98+
}

0 commit comments

Comments
 (0)