working commit

app/server/server.go

@@ -71,6 +71,7 @@ func (srv *Server) SetRundir(dir string) {
 func (srv *Server) SetDatadir(dir string) {
 	srv.conf.Database.Basepath = dir
 	srv.conf.Storage.Basepath = dir
+	srv.conf.Datadir = dir
 }
 
 func (srv *Server) SetPort(port int64) {
@@ -120,14 +121,16 @@ func (srv *Server) ReadStat() error {
 	var err error
 	// Read state file
 	statefilePath := filepath.Join(srv.conf.Datadir, "server.yaml")
-	stateData, err := ioutil.ReadFile(statefilePath)
-	if err == nil {
-		stat := descr.Server{}
-		err = yaml.Unmarshal(stateData, &stat)
-		if err != nil {
-			return err
+	if auxtool.FileExists(statefilePath) {
+		stateData, err := ioutil.ReadFile(statefilePath)
+		if err == nil {
+			stat := descr.Server{}
+			err = yaml.Unmarshal(stateData, &stat)
+			if err != nil {
+				return err
+			}
+			srv.stat = stat
 		}
-		srv.stat = stat
 	}
 	return err
 }
@@ -156,25 +159,27 @@ func (srv *Server) Build() error {
 
 	// Creating datadir
 	datadir := srv.conf.Datadir
-	srv.logg.Infof("Creating data directory %s ", datadir)
-	err = os.MkdirAll(datadir, 0750)
-	if err != nil {
-		return err
+	if !auxtool.DirExists(datadir) {
+		srv.logg.Infof("Creating data directory %s ", datadir)
+		err = os.MkdirAll(datadir, 0750)
+		if err != nil {
+			return err
+		}
 	}
-
 	// Read state file
 	srv.logg.Infof("Reading server status")
 	err = srv.ReadStat()
 	if err != nil {
 		return err
 	}
-
 	// Creating database dir
 	dbdir := srv.conf.Database.Basepath
-	srv.logg.Infof("Creating database directory %s ", dbdir)
-	err = os.MkdirAll(dbdir, 0750)
-	if err != nil {
-		return err
+	if !auxtool.DirExists(dbdir) {
+		srv.logg.Infof("Creating database directory %s ", dbdir)
+		err = os.MkdirAll(dbdir, 0750)
+		if err != nil {
+			return err
+		}
 	}
 	// Creating database
 	mdb := maindb.NewDatabase(dbdir)

pkg/client/grant.go

@@ -18,7 +18,7 @@ import (
 	"mstore/app/operator"
 )
 
-func (cli *Client) CreateGrant(ctx context.Context, hosturi, accountID, operation, pattern string) error {
+func (cli *Client) CreateGrant(ctx context.Context, hosturi, accountID, right, pattern string) error {
 	var err error
 
 	apiuri, err := setApiPath(hosturi, "/v3/api/grant/create")
@@ -27,7 +27,7 @@ func (cli *Client) CreateGrant(ctx context.Context, hosturi, accountID, operatio
 	}
 	operParams := operator.CreateGrantParams{
 		AccountID: accountID,
-		Operation: operation,
+		Right:     right,
 		Pattern:   pattern,
 	}
 	paramsJson, err := json.Marshal(operParams)