Merge pull request #516 from threefoldtech/tfuser-improvments

Some modifications to tfuser

go.sum

@@ -197,6 +197,8 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/gomodule/redigo v1.7.0 h1:ZKld1VOtsGhAe37E7wMxEDgAlGM5dvFY+DiOhSkhP9Y=
 github.com/gomodule/redigo v1.7.0/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
+github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=

tools/tfuser/cmds_live.go

@@ -20,6 +20,7 @@ func cmdsLive(c *cli.Context) error {
 		start    = c.Int("start")
 		end      = c.Int("end")
 		expired  = c.Bool("expired")
+		deleted  = c.Bool("deleted")
 	)
 
 	keypair, err := identity.LoadKeyPair(seedPath)
@@ -32,6 +33,7 @@ func cmdsLive(c *cli.Context) error {
 		start:    start,
 		end:      end,
 		expired:  expired,
+		deleted:  deleted,
 	}
 
 	cResults := s.Scrap(keypair.Identity())
@@ -90,7 +92,7 @@ func printResult(r res) {
 			panic(err)
 		}
 
-		fmt.Printf("\tnetwork ID: %s\n", data.NetID)
+		fmt.Printf("\tnetwork ID: %s\n", data.Name)
 	}
 }
 
@@ -99,12 +101,14 @@ type scraper struct {
 	start    int
 	end      int
 	expired  bool
+	deleted  bool
 	wg       sync.WaitGroup
 }
 type job struct {
 	id      int
 	user    string
 	expired bool
+	deleted bool
 }
 type res struct {
 	provision.Reservation
@@ -155,7 +159,10 @@ func worker(wg *sync.WaitGroup, cIn <-chan job, cOut chan<- res) {
 			continue
 		}
 
-		if !job.expired && res.Expired() == true {
+		if !job.expired && res.Expired() {
+			continue
+		}
+		if !job.deleted && res.ToDelete {
 			continue
 		}
 		if res.User != job.user {

tools/tfuser/cmds_provision.go

@@ -118,22 +118,23 @@ func cmdsProvision(c *cli.Context) error {
 		return errors.Wrap(err, "could not find provision schema")
 	}
 
-	r := &provision.Reservation{}
-	if err := json.Unmarshal(schema, r); err != nil {
+	var reservation provision.Reservation
+	if err := json.Unmarshal(schema, &reservation); err != nil {
 		return errors.Wrap(err, "failed to read the provision schema")
 	}
 
-	r.Duration = duration
-	r.Created = time.Now()
+	reservation.Duration = duration
+	reservation.Created = time.Now()
 	// set the user ID into the reservation schema
-	r.User = keypair.Identity()
+	reservation.User = keypair.Identity()
 
 	for _, nodeID := range nodeIDs {
+		r := reservation //make a copy
 		r.NodeID = nodeID
 
 		custom, ok := provCustomModifiers[r.Type]
 		if ok {
-			if err := custom(r); err != nil {
+			if err := custom(&r); err != nil {
 				return err
 			}
 		}
@@ -142,11 +143,7 @@ func cmdsProvision(c *cli.Context) error {
 			return errors.Wrap(err, "failed to sign the reservation")
 		}
 
-		if err := output(path, r); err != nil {
-			return errors.Wrapf(err, "failed to write provision schema to %s after signature", path)
-		}
-
-		id, err := client.Reserve(r)
+		id, err := client.Reserve(&r)
 		if err != nil {
 			return errors.Wrap(err, "failed to send reservation")
 		}

tools/tfuser/main.go

@@ -257,10 +257,6 @@ func main() {
 									Name:  "password, p",
 									Usage: "optional password",
 								},
-								cli.StringFlag{
-									Name:  "node, n",
-									Usage: "node ID. Required if password is set to encrypt the password",
-								},
 								cli.BoolFlag{
 									Name:  "public",
 									Usage: "TODO",
@@ -380,6 +376,10 @@ func main() {
 					Name:  "expired",
 					Usage: "include expired reservations",
 				},
+				cli.BoolFlag{
+					Name:  "deleted",
+					Usage: "include deleted reservations",
+				},
 			},
 			Action: cmdsLive,
 		},