Merge pull request #64 from kdeng3849/add-endpoints

add endpoints for crud operations & update hardware data model

.gitignore

@@ -3,6 +3,7 @@ certs/
 cmd/tink-cli/tink-cli
 cmd/tink-server/tink-server
 cmd/tink-worker/tink-worker
+.idea
 
 # Terraform
 .terraform

Makefile

@@ -10,7 +10,7 @@ cli: ${cli}
 worker : ${worker}
 
 ${server} ${cli} ${worker}:
-	CGO_ENABLED=0 go build -o $@ ./$@
+	CGO_ENABLED=0 GOOS=$$GOOS go build -o $@ ./$@
 
 run: ${binaries}
 	docker-compose up -d --build db

cmd/tink-cli/cmd/hardware/all.go

@@ -2,6 +2,7 @@ package hardware
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -24,10 +25,14 @@ var allCmd = &cobra.Command{
 		var hw *hardware.Hardware
 		err = nil
 		for hw, err = alls.Recv(); err == nil && hw != nil; hw, err = alls.Recv() {
-			fmt.Println(hw.JSON)
+			b, err := json.Marshal(hw)
+			if err != nil {
+				log.Println(err)
+			}
+			fmt.Println(string(b))
 		}
 		if err != nil && err != io.EOF {
-			log.Fatal(err)
+			log.Println(err)
 		}
 	},
 }

cmd/tink-cli/cmd/hardware/id.go

@@ -4,6 +4,7 @@ package hardware
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 
@@ -22,11 +23,15 @@ var idCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, id := range args {
-			hw, err := client.HardwareClient.ByID(context.Background(), &hardware.GetRequest{ID: id})
+			hw, err := client.HardwareClient.ByID(context.Background(), &hardware.GetRequest{Id: id})
 			if err != nil {
 				log.Fatal(err)
 			}
-			fmt.Println(hw.JSON)
+			b, err := json.Marshal(hw)
+			if err != nil {
+				log.Fatal(err)
+			}
+			fmt.Println(string(b))
 		}
 	},
 }

cmd/tink-cli/cmd/hardware/ip.go

@@ -4,6 +4,7 @@ package hardware
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 	"net"
@@ -28,11 +29,15 @@ var ipCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, ip := range args {
-			hw, err := client.HardwareClient.ByIP(context.Background(), &hardware.GetRequest{IP: ip})
+			hw, err := client.HardwareClient.ByIP(context.Background(), &hardware.GetRequest{Ip: ip})
 			if err != nil {
 				log.Fatal(err)
 			}
-			fmt.Println(hw.JSON)
+			b, err := json.Marshal(hw)
+			if err != nil {
+				log.Fatal(err)
+			}
+			fmt.Println(string(b))
 		}
 	},
 }

cmd/tink-cli/cmd/hardware/mac.go

@@ -4,6 +4,7 @@ package hardware
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 	"net"
@@ -28,11 +29,15 @@ var macCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, mac := range args {
-			hw, err := client.HardwareClient.ByMAC(context.Background(), &hardware.GetRequest{MAC: mac})
+			hw, err := client.HardwareClient.ByMAC(context.Background(), &hardware.GetRequest{Mac: mac})
 			if err != nil {
 				log.Fatal(err)
 			}
-			fmt.Println(hw.JSON)
+			b, err := json.Marshal(hw)
+			if err != nil {
+				log.Fatal(err)
+			}
+			fmt.Println(string(b))
 		}
 	},
 }

cmd/tink-cli/cmd/hardware/push.go

@@ -51,7 +51,13 @@ tink hardware push --file /tmp/data.json`,
 		} else if s.ID == "" {
 			log.Fatalf("invalid json, ID is required: %s", data)
 		}
-		if _, err := client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: data}); err != nil {
+
+		hw := hardware.Hardware{}
+		err := json.Unmarshal([]byte(data), &hw)
+		if err != nil {
+			log.Fatal(err)
+		}
+		if _, err := client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: &hw}); err != nil {
 			log.Fatal(err)
 		}
 		log.Println("Hardware data pushed successfully")

cmd/tink-cli/cmd/hardware/watch.go

@@ -4,6 +4,7 @@ package hardware
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -26,7 +27,7 @@ var watchCmd = &cobra.Command{
 		stdoutLock := sync.Mutex{}
 		for _, id := range args {
 			go func(id string) {
-				stream, err := client.HardwareClient.Watch(context.Background(), &hardware.GetRequest{ID: id})
+				stream, err := client.HardwareClient.Watch(context.Background(), &hardware.GetRequest{Id: id})
 				if err != nil {
 					log.Fatal(err)
 				}
@@ -35,7 +36,11 @@ var watchCmd = &cobra.Command{
 				err = nil
 				for hw, err = stream.Recv(); err == nil && hw != nil; hw, err = stream.Recv() {
 					stdoutLock.Lock()
-					fmt.Println(hw.JSON)
+					b, err := json.Marshal(hw)
+					if err != nil {
+						log.Fatal(err)
+					}
+					fmt.Println(string(b))
 					stdoutLock.Unlock()
 				}
 				if err != nil && err != io.EOF {

cmd/tink-cli/cmd/template/create.go

@@ -50,7 +50,7 @@ cat /tmp/example.tmpl | tink template create -n example`,
 
 		data := readAll(reader)
 		if data != nil {
-			if err := tryParseTemplate(data); err != nil {
+			if err := tryParseTemplate(string(data)); err != nil {
 				log.Println(err)
 				return
 			}
@@ -74,16 +74,16 @@ func addFlags() {
 	createCmd.MarkPersistentFlagRequired(fName)
 }
 
-func tryParseTemplate(data []byte) error {
+func tryParseTemplate(data string) error {
 	tmpl := *tt.New("")
-	if _, err := tmpl.Parse(string(data)); err != nil {
+	if _, err := tmpl.Parse(data); err != nil {
 		return err
 	}
 	return nil
 }
 
 func createTemplate(data []byte) {
-	req := template.WorkflowTemplate{Name: templateName, Data: data}
+	req := template.WorkflowTemplate{Name: templateName, Data: string(data)}
 	res, err := client.TemplateClient.CreateTemplate(context.Background(), &req)
 	if err != nil {
 		log.Println(err)

cmd/tink-cli/cmd/template/update.go

@@ -50,7 +50,7 @@ func updateTemplate(id string) {
 		req.Name = templateName
 	} else if filePath != "" && templateName == "" {
 		data := readTemplateData()
-		if data != nil {
+		if data != "" {
 			if err := tryParseTemplate(data); err != nil {
 				log.Println(err)
 				return
@@ -69,7 +69,7 @@ func updateTemplate(id string) {
 	fmt.Println("Updated Template: ", id)
 }
 
-func readTemplateData() []byte {
+func readTemplateData() string {
 	f, err := os.Open(filePath)
 	if err != nil {
 		log.Println(err)
@@ -80,7 +80,7 @@ func readTemplateData() []byte {
 	if err != nil {
 		log.Println(err)
 	}
-	return data
+	return string(data)
 }
 
 func init() {

db/hardware.go

@@ -66,13 +66,15 @@ func InsertIntoDB(ctx context.Context, db *sql.DB, data string) error {
 func GetByMAC(ctx context.Context, db *sql.DB, mac string) (string, error) {
 	arg := `
 	{
-	  "network_ports": [
-	    {
-	      "data": {
-		"mac": "` + mac + `"
-	      }
-	    }
-	  ]
+		"network": {
+			"interfaces": [
+				{
+					"dhcp": {
+						"mac": "` + mac + `"
+					}
+				}
+			]
+		}
 	}
 	`
 	query := `
@@ -94,19 +96,25 @@ func GetByIP(ctx context.Context, db *sql.DB, ip string) (string, error) {
 	  "instance": {
 	    "ip_addresses": [
 	      {
-		"address": "` + ip + `"
+		    "address": "` + ip + `"
 	      }
 	    ]
 	  }
 	}
 	`
 	hardwareOrManagement := `
 	{
-		"ip_addresses": [
-			{
-				"address": "` + ip + `"
-			}
-		]
+		"network": {
+			"interfaces": [
+				{
+					"dhcp": {
+						"ip": {
+							"address": "` + ip + `"
+						}
+					}
+				}
+			]
+		}
 	}
 	`
 
@@ -141,7 +149,7 @@ func GetByID(ctx context.Context, db *sql.DB, id string) (string, error) {
 }
 
 // GetAll : get data for all machine
-func GetAll(db *sql.DB, fn func(string) error) error {
+func GetAll(db *sql.DB, fn func([]byte) error) error {
 	rows, err := db.Query(`
 	SELECT data
 	FROM hardware
@@ -163,7 +171,7 @@ func GetAll(db *sql.DB, fn func(string) error) error {
 			return err
 		}
 
-		err = fn(string(buf))
+		err = fn(buf)
 		if err != nil {
 			return err
 		}

db/template.go

@@ -12,7 +12,7 @@ import (
 )
 
 // CreateTemplate creates a new workflow template
-func CreateTemplate(ctx context.Context, db *sql.DB, name string, data []byte, id uuid.UUID) error {
+func CreateTemplate(ctx context.Context, db *sql.DB, name string, data string, id uuid.UUID) error {
 	tx, err := db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable})
 	if err != nil {
 		return errors.Wrap(err, "BEGIN transaction")
@@ -40,20 +40,21 @@ func CreateTemplate(ctx context.Context, db *sql.DB, name string, data []byte, i
 }
 
 // GetTemplate returns a workflow template
-func GetTemplate(ctx context.Context, db *sql.DB, id string) ([]byte, error) {
+func GetTemplate(ctx context.Context, db *sql.DB, id string) (string, string, error) {
 	query := `
-	SELECT data
+	SELECT name, data
 	FROM template
 	WHERE
 		id = $1
 	AND
 		deleted_at IS NULL
 	`
 	row := db.QueryRowContext(ctx, query, id)
-	buf := []byte{}
-	err := row.Scan(&buf)
+	name := []byte{}
+	data := []byte{}
+	err := row.Scan(&name, &data)
 	if err == nil {
-		return buf, nil
+		return string(name), string(data), nil
 	}
 
 	if err != sql.ErrNoRows {
@@ -63,7 +64,7 @@ func GetTemplate(ctx context.Context, db *sql.DB, id string) ([]byte, error) {
 		err = nil
 	}
 
-	return []byte{}, nil
+	return "", "", nil
 }
 
 // DeleteTemplate deletes a workflow template
@@ -136,20 +137,20 @@ func ListTemplates(db *sql.DB, fn func(id, n string, in, del *timestamp.Timestam
 }
 
 // UpdateTemplate update a given template
-func UpdateTemplate(ctx context.Context, db *sql.DB, name string, data []byte, id uuid.UUID) error {
+func UpdateTemplate(ctx context.Context, db *sql.DB, name string, data string, id uuid.UUID) error {
 	tx, err := db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable})
 	if err != nil {
 		return errors.Wrap(err, "BEGIN transaction")
 	}
 
-	if data == nil && name != "" {
+	if data == "" && name != "" {
 		_, err = tx.Exec(`
 		UPDATE template 
 		SET 
 			updated_at = NOW(), name = $2
 		WHERE 
 			id = $1;`, id, name)
-	} else if data != nil && name == "" {
+	} else if data != "" && name == "" {
 		_, err = tx.Exec(`
 		UPDATE template 
 		SET