Merge hardware and target. (tinkerbell#88)

* Merged hardware and target.

Now while creating a workflow you can directly provide hardware/devices mac addr.
And now there is no need of targets.

* using hello-world as the first example

Signed-off-by: Gaurav Gahlot <[email protected]>

* fixes

Signed-off-by: Gaurav Gahlot <[email protected]>

* moved comments out of data JSON

Signed-off-by: Gaurav Gahlot <[email protected]>

* Changed the way of writing template and creating workflow

* Updating the docs with current implementation

* Incorporated some minor review comments

Co-authored-by: Gaurav Gahlot <[email protected]>

Author: parauliya

cli/tink/cmd/target.go

@@ -12,9 +12,9 @@ import (
 
 var (
 	fTemplate = "template"
-	fTarget   = "target"
+	fHardware = "hardware"
 	template  string
-	target    string
+	hardware  string
 )
 
 // createCmd represents the create subcommand for worflow command
@@ -25,11 +25,6 @@ var createCmd = &cobra.Command{
 	PreRunE: func(c *cobra.Command, args []string) error {
 		tmp, _ := c.Flags().GetString(fTemplate)
 		err := validateID(tmp)
-		if err != nil {
-			return err
-		}
-		tar, _ := c.Flags().GetString(fTarget)
-		err = validateID(tar)
 		return err
 	},
 	Run: func(c *cobra.Command, args []string) {
@@ -40,14 +35,14 @@ var createCmd = &cobra.Command{
 func addFlags() {
 	flags := createCmd.PersistentFlags()
 	flags.StringVarP(&template, "template", "t", "", "workflow template")
-	flags.StringVarP(&target, "target", "r", "", "workflow target")
+	flags.StringVarP(&hardware, "hardware", "r", "", "workflow targeted hardwares")
 
-	createCmd.MarkPersistentFlagRequired(fTarget)
+	createCmd.MarkPersistentFlagRequired(fHardware)
 	createCmd.MarkPersistentFlagRequired(fTemplate)
 }
 
 func createWorkflow(c *cobra.Command, args []string) {
-	req := workflow.CreateRequest{Template: template, Target: target}
+	req := workflow.CreateRequest{Template: template, Target: hardware}
 	res, err := client.WorkflowClient.CreateWorkflow(context.Background(), &req)
 	if err != nil {
 		log.Fatal(err)

cli/tink/cmd/target/commands.go

@@ -7,19 +7,17 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/pkg/errors"
 	"github.com/tinkerbell/tink/protos/hardware"
-	"github.com/tinkerbell/tink/protos/target"
 	"github.com/tinkerbell/tink/protos/template"
 	"github.com/tinkerbell/tink/protos/workflow"
-	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )
 
 // gRPC clients
 var (
 	TemplateClient template.TemplateClient
-	TargetClient   target.TargetClient
 	WorkflowClient workflow.WorkflowSvcClient
 	HardwareClient hardware.HardwareServiceClient
 )
@@ -66,15 +64,14 @@ func Setup() {
 		log.Fatal(err)
 	}
 	TemplateClient = template.NewTemplateClient(conn)
-	TargetClient = target.NewTargetClient(conn)
 	WorkflowClient = workflow.NewWorkflowSvcClient(conn)
 	HardwareClient = hardware.NewHardwareServiceClient(conn)
 }
 
 func NewTinkerbellClient() (hardware.HardwareServiceClient, error) {
 	conn, err := GetConnection()
-        if err != nil {
-                log.Fatal(err)
-        }
+	if err != nil {
+		log.Fatal(err)
+	}
 	return hardware.NewHardwareServiceClient(conn), nil
 }

cli/tink/cmd/target/create.go

@@ -14,9 +14,9 @@ import (
 	"github.com/docker/distribution/reference"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
-	pb "github.com/tinkerbell/tink/protos/workflow"
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
+	pb "github.com/tinkerbell/tink/protos/workflow"
 	"gopkg.in/yaml.v2"
 )
 
@@ -91,13 +91,13 @@ func CreateWorkflow(ctx context.Context, db *sql.DB, wf Workflow, data string, i
 func insertInWorkflow(ctx context.Context, db *sql.DB, wf Workflow, tx *sql.Tx) error {
 	_, err := tx.Exec(`
 	INSERT INTO
-		workflow (created_at, updated_at, template, target, id)
+		workflow (created_at, updated_at, template, devices, id)
 	VALUES
 		($1, $1, $2, $3, $4)
 	ON CONFLICT (id)
 	DO
 	UPDATE SET
-		(updated_at, deleted_at, template, target) = ($1, NULL, $2, $3);
+		(updated_at, deleted_at, template, devices) = ($1, NULL, $2, $3);
 	`, time.Now(), wf.Template, wf.Target, wf.ID)
 	if err != nil {
 		return errors.Wrap(err, "INSERT in to workflow")
@@ -378,7 +378,7 @@ func GetfromWfWorkflowTable(ctx context.Context, db *sql.DB, id string) ([]strin
 // GetWorkflow returns a workflow
 func GetWorkflow(ctx context.Context, db *sql.DB, id string) (Workflow, error) {
 	query := `
-	SELECT template, target
+	SELECT template, devices
 	FROM workflow
 	WHERE
 		id = $1
@@ -448,7 +448,7 @@ func DeleteWorkflow(ctx context.Context, db *sql.DB, id string, state int32) err
 // ListWorkflows returns all workflows
 func ListWorkflows(db *sql.DB, fn func(wf Workflow) error) error {
 	rows, err := db.Query(`
-	SELECT id, template, target, created_at, updated_at
+	SELECT id, template, devices, created_at, updated_at
 	FROM workflow
 	WHERE
 		deleted_at IS NULL;
@@ -510,15 +510,15 @@ func UpdateWorkflow(ctx context.Context, db *sql.DB, wf Workflow, state int32) e
 		_, err = tx.Exec(`
 		UPDATE workflow
 		SET
-			updated_at = NOW(), target = $2
+			updated_at = NOW(), devices = $2
 		WHERE
 			id = $1;
 		`, wf.ID, wf.Target)
 	} else {
 		_, err = tx.Exec(`
 		UPDATE workflow
 		SET
-			updated_at = NOW(), template = $2, target = $3
+			updated_at = NOW(), template = $2, devices = $3
 		WHERE
 			id = $1;
 		`, wf.ID, wf.Template, wf.Target)

cli/tink/cmd/target/delete.go

@@ -25,21 +25,10 @@ CREATE TABLE IF NOT EXISTS template (
 CREATE INDEX IF NOT EXISTS idx_tid ON template (id);
 CREATE INDEX IF NOT EXISTS idx_tdeleted_at ON template (deleted_at NULLS FIRST);
 
-CREATE TABLE IF NOT EXISTS targets (
-        id UUID UNIQUE
-        , inserted_at TIMESTAMPTZ
-        , deleted_at TIMESTAMPTZ
-        , data JSONB
-);
-
-CREATE INDEX IF NOT EXISTS idx_rid ON targets (id);
-CREATE INDEX IF NOT EXISTS idx_rdeleted_at ON targets (deleted_at NULLS FIRST);
-CREATE INDEX IF NOT EXISTS idxgin_rtype ON targets USING GIN (data JSONB_PATH_OPS);
-
 CREATE TABLE IF NOT EXISTS workflow (
 	id UUID UNIQUE NOT NULL
 	, template UUID NOT NULL
-	, target UUID NOT NULL
+	, devices JSONB NOT NULL
 	, created_at TIMESTAMPTZ
 	, updated_at TIMESTAMPTZ
 	, deleted_at TIMESTAMPTZ
@@ -84,4 +73,4 @@ CREATE TABLE IF NOT EXISTS workflow_data (
         , version INT
         , metadata JSONB
         , data JSONB
-);
+);

cli/tink/cmd/target/get.go

@@ -6,14 +6,13 @@ Command line interface for Packet Workflow.
 
 ### Synopsis
 
-Command line interface for Packet Workflow. The CLI allows you to update the hardware details with respect to a worker machine. It also enables you to create a template and a target which is eventually used to create a workflow.
+Command line interface for Packet Workflow. The CLI allows you to update the hardware details with respect to a worker machine. It also enables you to create a template which is eventually used to create a workflow.
 
 ### Operations
 
 ```shell
   hardware    tink hardware client
   help        Help about any command
-  target      tink target client
   template    tink template client
   workflow    tink workflow client
 ```
@@ -27,7 +26,6 @@ Command line interface for Packet Workflow. The CLI allows you to update the har
 ### See Also
 
  - [tink hardware](hardware.md) - Hardware (worker) data operations 
- - [tink target](target.md) - Target operations
  - [tink template](template.md) - Template operations
  - [tink workflow](workflow.md) - Workflow operations
 

cli/tink/cmd/target/list.go

@@ -23,7 +23,6 @@ Hardware operations:
 
 ### See Also
 
- - [tink target](target.md) - Target operations
  - [tink template](template.md) - Template operations
  - [tink workflow](workflow.md) - Workflow operations
 

cli/tink/cmd/target/update.go

@@ -16,7 +16,7 @@ Template operations:
 ### Options
 
 ```
-  -h, --help   help for target
+  -h, --help   help for template
 ```
 
 ### Examples
@@ -47,6 +47,5 @@ Template operations:
 ### See Also
 
  - [tink hardware](hardware.md) - Hardware (worker) data operations 
- - [tink target](target.md) - Target operations
  - [tink workflow](workflow.md) - Workflow operations
 

cli/tink/cmd/workflow/create.go

@@ -18,20 +18,22 @@ Workflow operations:
 ### Options
 
 ```
-  -h, --help   help for target
+  -h, --help   help for workflow
 ```
 
 ### Examples
 
- - Create a workflow using a template and a target
+ - Create a workflow using a template and hardware devices
  ```shell
-  $ tink workflow create -t <template-uuid> -r <target-uuid>
-  $ tink workflow create -t edb80a56-b1f2-4502-abf9-17326324192b -r 9356ae1d-6165-4890-908d-7860ed04b421
+  $ tink workflow create -t <template-uuid> -r <hardware_input_in_json_format>
+  $ tink workflow create -t edb80a56-b1f2-4502-abf9-17326324192b -r {"device_1": "mac/IP"}
  ```
+ #### Note: 
+ 1. The key used in the above command which is "device_1" should be in sync with "worker" field in the template. Click [here](../concepts.md) to check the template structure.
+ 2. These keys can only contain letter, numbers and underscore.
 
 ### See Also
 
- - [tink hardware](hardware.md) - Hardware (worker) data operations 
- - [tink target](target.md) - Target operations
+ - [tink hardware](hardware.md) - Hardware (worker) data operations
  - [tink template](template.md) - Template operations
 

client/main.go

@@ -10,7 +10,7 @@ Installs operating systems and handles deprovisioning.
 
 ### Tinkerbell
 
-Service responsible for processing workflows. It is comprised of a server and a CLI, which communicate over gRPC. The CLI is used to create a workflow along with its building blocks, i.e., a template and a target.
+Service responsible for processing workflows. It is comprised of a server and a CLI, which communicate over gRPC. The CLI is used to create a workflow along with its building blocks, i.e., a template hardware devices.
 
 ### Hegel
 

db/target.go

@@ -1,8 +1,11 @@
 # Concepts
 
+### Hardware
+A *hardware device* is defined separately and is substituted in a template at the time of creating a workflow.
+
 ### Template
 
-A template is a Go template based definition that defines the overall flow of a workflow. A user must write a template based on a valid template format. Template can consist of custom variable which can be substituted before execution. For example, a target is defined separately and is substituted in a template at the time of creating a workflow.
+A template is a Go template based definition that defines the overall flow of a workflow. A user must write a template based on a valid template format. Template can consist of custom variable which can be substituted before execution. For example, a hardware device is defined separately and is substituted in a template at the time of creating a workflow.
 
 A template is stored as a blob in the database and is parsed later during the creation of a worflow. A user can CRUD a template using the CLI (`tink template`). Here is a sample workflow template: 
 
@@ -12,7 +15,7 @@ name: ubuntu_provisioning
 global_timeout: 6000
 tasks:
 - name: "os-installation"
-  worker: "{{index .Targets "machine1" "mac_addr"}}"
+  worker: "{{.device_1}}"
   volumes:
     - /dev:/dev
     - /dev/console:/dev/console
@@ -45,28 +48,6 @@ A template comprises Tasks, which are executed in a sequential manner. A task ca
 It is important to note that an action can also have its own volumes and environment variables. Therefore, any entry at an action will overwrite the value defined at the task level. For example, in the above template the `MIRROR_HOST` environment variable defined at action `disk-partition` will overwrite the value defined at task level. However, the other actions will receive the original value defined at the task level.
 
 
-### Targets
-
-Targets are mapping between the virtual worker name and the actual host. Currently we are refer targets with MAC or IP address. Here is a sample target definition:
-
-```json
-{
-    "machine1":  {
-        "ip_addr": "192.168.1.2"
-    },
-    "machine2" :  {
-        "mac_addr": "ca:00:64:b8:2d:00"
-    }
-}
-```
-
-A target can be accessed in template like (refer above template):
-
-```
-{{ index .Targets "machine1" "ip_addr"}}
-{{ index .Targets "machine2" "mac_addr"}}
-```
-
 ### Provisioner
 
 The provisioner machine is the main driver for executing a workflow. A provisioner houses the following components:
@@ -104,4 +85,3 @@ The other worker may retrieve and use this data and eventually add some more:
 ```
 ![](img/ephemeral-data.png)
 
-

db/workflow.go

@@ -3,7 +3,7 @@ name: hello_world_workflow
 global_timeout: 600
 tasks:
 - name: "hello world"
-  worker: "{{index .Targets "machine1" "mac_addr"}}"
+  worker: "{{.device_1}}"
   actions:
   - name: "hello_world"
     image: hello-world

deploy/db/docker-entrypoint-initdb.d/tinkerbell-init.sql

@@ -67,18 +67,14 @@ $ docker push <registry-host>/hello-world
 ### Workflow
 
 We can now define a workflow with the following steps:
- - Create a target:
- ```shell
-  $ tink target create '{"targets": {"machine1": {"mac_addr": "<worker-mac-address>"}}}'
- ```
  - Create a template:
  ```shell
   # get the template from examples/hello-world.tmpl and save it
   $ tink template create -n hello-world -p hello-world.tmpl
  ```
  - Create a workflow:
  ```shell
-  $ tink workflow create -t <template-uuid> -r <target-uuid>
+  $ tink workflow create -t <template-uuid> -r '{"device_1":"mac/IP"}'
  ```
  - Reboot the worker machine
 

docs/cli/README.md

@@ -1,25 +1,14 @@
 # Writing a [Workflow](concepts.md#workflow)
 
-Any workflow comprises two building blocks: target and template. 
+Any workflow comprises two building blocks: worker (targeted hardware) and a template.
 
-### Creating a [target](concepts.md#target)
+### Creating a [worker](concepts.md#worker)
 
-A target is referred with MAC or IP address. Here is a sample target definition using the MAC address:
-
-```json
-{
-    "machine1" :  {
-        "mac_addr": "98:03:9b:4b:c5:34"
-    }
-}
-```
-
-The command below creates a workflow target and returns its UUID:
+A worker is targeted hardware on which workflow needs to run.
+User need to push the hardware details as per the below command:
 ```shell
- $ tink target create '{"targets": {"machine1": {"mac_addr": "98:03:9b:4b:c5:34"}}}' 
+ $ tink hardware push "<targeted hardware data in json format>" 
 ```
-
-
 ### Creating a [template](concepts.md#template)
 
 Consider a sample template like the following saved as `/tmp/sample.tmpl`.
@@ -30,18 +19,18 @@ name: ubuntu_provisioning
 global_timeout: 2500
 tasks:
 - name: "os-installation"
-  worker: "{{index .Targets "machine1" "mac_addr"}}"
+  worker: "{{.device_1}}"
   volumes:
     - /dev:/dev
     - /lib/firmware:/lib/firmware:ro
   environment:
-    MIRROR_HOST: 192.168.1.2
+    MIRROR_HOST: <MIRROR_HOST_IP>
   actions:
   - name: "disk-partition"
     image: disk-partition
     timeout: 600
     environment:
-       MIRROR_HOST: 192.168.1.3
+       MIRROR_HOST: <MIRROR_HOST_IP>
     volumes:
       - /statedir:/statedir
   - name: "install-root-fs"
@@ -61,11 +50,11 @@ Key points:
  - An action cannot have space (` `) in its name.
  - Environment variables and volumes at action level overwrites the values for duplicate keys defined at task level.
 
-A target can be accessed in a template like:
+A worker can be accessed in a template like:
 
 ```
-{{ index .Targets "machine1" "ip_addr"}}
-{{ index .Targets "machine2" "mac_addr"}}
+{{.device_1}}
+{{.device_2}}
 ```
 
 The following command creates a workflow template and returns a UUID:
@@ -76,17 +65,17 @@ The following command creates a workflow template and returns a UUID:
 
 ### Creating a [workflow](concepts.md#workflow)
 
-We can create a workflow using the above created (or existing) template and target. 
+We can create a workflow using the above created (or existing) template and worker. 
 ```shell
- $ tink workflow create -t <template-uuid> -r <target-uuid>
- $ tink workflow create -t edb80a56-b1f2-4502-abf9-17326324192b -r 9356ae1d-6165-4890-908d-7860ed04b421
+ $ tink workflow create -t <template-uuid> -r '{worker machines in json format}'
+ $ tink workflow create -t edb80a56-b1f2-4502-abf9-17326324192b -r '{"device_1":"mac/IP"}'
 ```
 
 The above command returns a UUID for the workflow thus created. The workflow ID can be used for getting further details about a workflow. Please refer the [Tinkerbell CLI reference](cli/workflow.md) for the same.
 
-It's a good practice to verify that the targets have been well substituted in the template. In order to do so, use the following command:
+It's a good practice to verify that the worker have been well substituted in the template. In order to do so, use the following command:
 ```yaml
- $ tink workflow get edb80a56-b1f2-4502-abf9-17326324192b
+ $ tink workflow get <workflow Id returned from the above command>
 
 version: '0.1'
 name: ubuntu_provisioning
@@ -117,5 +106,5 @@ tasks:
       - /statedir:/statedir
 ```
 
-Notice how `worker` is set to the MAC address we had defined in the target.
+Notice how `worker` is set to the MAC address we had defined in the input while creating a workflow.
 

docs/cli/hardware.md

@@ -3,56 +3,23 @@ module github.com/tinkerbell/tink
 go 1.13
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.4.14 // indirect
-	github.com/containerd/containerd v1.3.2 // indirect
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v1.4.2-0.20191212201129-5f9f41018e9d
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/fsnotify/fsnotify v1.4.7 // indirect
-	github.com/go-openapi/strfmt v0.19.3 // indirect
-	github.com/gogo/protobuf v1.2.0 // indirect
 	github.com/golang/protobuf v1.3.5
-	github.com/google/go-cmp v0.3.1 // indirect
-	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/mux v1.6.2 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36
-	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
-	github.com/kr/pretty v0.2.0 // indirect
 	github.com/lib/pq v1.2.1-0.20191011153232-f91d3411e481
-	github.com/magiconair/properties v1.8.0 // indirect
-	github.com/mattn/go-runewidth v0.0.5 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/packethost/pkg v0.0.0-20190410153520-e8e15f4ce770
-	github.com/pelletier/go-toml v1.2.0 // indirect
+	github.com/packethost/tinkerbell v0.0.0-20200326045848-98d7d0594340
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
-	github.com/rollbar/rollbar-go v1.0.2 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.1
-	github.com/spf13/afero v1.1.1 // indirect
-	github.com/spf13/cast v1.2.0 // indirect
 	github.com/spf13/cobra v0.0.3
-	github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
-	github.com/spf13/pflag v1.0.1 // indirect
 	github.com/spf13/viper v1.0.2
-	go.mongodb.org/mongo-driver v1.1.2 // indirect
-	go.uber.org/atomic v1.2.0 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.7.1 // indirect
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
 	golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect
-	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940 // indirect
 	google.golang.org/grpc v1.28.0
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v2 v2.2.2
-	gotest.tools v2.2.0+incompatible // indirect
 )

docs/cli/target.md

@@ -13,13 +13,12 @@ import (
 
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/packethost/pkg/log"
+	"github.com/pkg/errors"
 	"github.com/tinkerbell/tink/db"
 	"github.com/tinkerbell/tink/metrics"
 	"github.com/tinkerbell/tink/protos/hardware"
-	"github.com/tinkerbell/tink/protos/target"
 	"github.com/tinkerbell/tink/protos/template"
 	"github.com/tinkerbell/tink/protos/workflow"
-	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )
@@ -70,7 +69,6 @@ func SetupGRPC(ctx context.Context, log log.Logger, facility string, errCh chan<
 	// register servers
 	s := grpc.NewServer(params...)
 	template.RegisterTemplateServer(s, server)
-	target.RegisterTargetServer(s, server)
 	workflow.RegisterWorkflowSvcServer(s, server)
 	hardware.RegisterHardwareServiceServer(s, server)
 

docs/cli/template.md

@@ -5,15 +5,16 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
+	"fmt"
 	"text/template"
 
+	"github.com/pkg/errors"
+	"github.com/prometheus/client_golang/prometheus"
+	uuid "github.com/satori/go.uuid"
 	"github.com/tinkerbell/tink/db"
 	"github.com/tinkerbell/tink/metrics"
 	"github.com/tinkerbell/tink/protos/workflow"
 	workflowpb "github.com/tinkerbell/tink/protos/workflow"
-	"github.com/pkg/errors"
-	"github.com/prometheus/client_golang/prometheus"
-	uuid "github.com/satori/go.uuid"
 )
 
 var state = map[int32]workflow.State{
@@ -262,40 +263,34 @@ func (s *server) ShowWorkflowEvents(req *workflow.GetRequest, stream workflow.Wo
 	return nil
 }
 
-func createYaml(ctx context.Context, sqlDB *sql.DB, temp string, tar string) (string, error) {
+func createYaml(ctx context.Context, sqlDB *sql.DB, temp string, devices string) (string, error) {
 	tempData, err := db.GetTemplate(ctx, sqlDB, temp)
 	if err != nil {
 		return "", err
 	}
-	tarData, err := db.TargetsByID(ctx, sqlDB, tar)
-	if err != nil {
-		return "", err
-	}
-	return renderTemplate(string(tempData), []byte(tarData))
+	return renderTemplate(string(tempData), []byte(devices))
 }
 
-func renderTemplate(tempData string, tarData []byte) (string, error) {
-	type machine map[string]string
-	type Environment struct {
-		Targets map[string]machine `json:"targets"`
-	}
-
-	var env Environment
-	t := template.New("workflow-template")
-	_, err := t.Parse(tempData)
+func renderTemplate(tempData string, devices []byte) (string, error) {
+	var hardware map[string]interface{}
+	err := json.Unmarshal(devices, &hardware)
 	if err != nil {
 		logger.Error(err)
 		return "", nil
 	}
-	err = json.Unmarshal(tarData, &env)
+
+	t := template.New("workflow-template")
+	_, err = t.Parse(string(tempData))
 	if err != nil {
 		logger.Error(err)
 		return "", nil
 	}
+
 	buf := new(bytes.Buffer)
-	err = t.Execute(buf, env)
+	err = t.Execute(buf, hardware)
 	if err != nil {
 		return "", nil
 	}
+	fmt.Println(buf.String())
 	return buf.String(), nil
 }

docs/cli/workflow.md

@@ -12,12 +12,7 @@ var Log = logger
 
 // SetupWorkflow ... Set up workflow
 func SetupWorkflow(tar string, tmpl string) (string, error) {
-	//Add target machine mac/ip addr into targets table
-	targetID, err := CreateTargets(tar)
-	if err != nil {
-		return "", err
-	}
-	logger.Infoln("Target Created : ", targetID)
+	targetID := "c9d6faa4-08a2-4285-ae6c-f3401211bd56"
 	//Add template in template table
 	templateID, err := CreateTemplate(tmpl)
 	if err != nil {