chore: updated steampipe sdk

graza-io · graza-io · commit 2a7225ba185b · 2023-01-10T14:45:31.000Z
diff --git a/clickup/connection_config.go b/clickup/connection_config.go
@@ -1,8 +1,8 @@
 package clickup
 
 import (
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/schema"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/schema"
 )
 
 type PluginConfig struct {
diff --git a/clickup/plugin.go b/clickup/plugin.go
@@ -2,8 +2,8 @@ package clickup
 
 import (
 	"context"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func Plugin(ctx context.Context) *plugin.Plugin {
diff --git a/clickup/table_folder.go b/clickup/table_folder.go
@@ -3,9 +3,9 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupFolder() *plugin.Table {
@@ -30,7 +30,7 @@ func listFolders(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	spaceId := d.KeyColumnQuals["space_id"].GetStringValue()
+	spaceId := d.EqualsQuals["space_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listFolders", "spaceId", spaceId)
 
 	folders, _, err := client.Folders.GetFolders(ctx, spaceId, true)
@@ -53,7 +53,7 @@ func getFolder(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	folderId := d.KeyColumnQuals["id"].GetStringValue()
+	folderId := d.EqualsQuals["id"].GetStringValue()
 	plugin.Logger(ctx).Debug("getFolder", "id", folderId)
 
 	folder, _, err := client.Folders.GetFolder(ctx, folderId)
diff --git a/clickup/table_folderless_list.go b/clickup/table_folderless_list.go
@@ -3,7 +3,7 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
 )
 
 func tableClickupFolderlessList() *plugin.Table {
@@ -24,7 +24,7 @@ func listFolderlessLists(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	spaceId := d.KeyColumnQuals["space_id"].GetStringValue()
+	spaceId := d.EqualsQuals["space_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listFolderlessLists", "spaceId", spaceId)
 
 	lists, _, err := client.Lists.GetFolderlessLists(ctx, spaceId, true)
diff --git a/clickup/table_goal.go b/clickup/table_goal.go
@@ -3,9 +3,9 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupGoal() *plugin.Table {
@@ -30,7 +30,7 @@ func listGoals(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	teamId := d.KeyColumnQuals["team_id"].GetStringValue()
+	teamId := d.EqualsQuals["team_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listGoals", "teamId", teamId)
 
 	goals, goalFolders, _, err := client.Goals.GetGoals(ctx, teamId, true)
@@ -60,7 +60,7 @@ func getGoal(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (i
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	goalId := d.KeyColumnQuals["id"].GetStringValue()
+	goalId := d.EqualsQuals["id"].GetStringValue()
 	plugin.Logger(ctx).Debug("getGoal", "id", goalId)
 
 	goal, _, err := client.Goals.GetGoal(ctx, goalId)
diff --git a/clickup/table_list.go b/clickup/table_list.go
@@ -3,9 +3,9 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupList() *plugin.Table {
@@ -30,7 +30,7 @@ func listLists(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	folderId := d.KeyColumnQuals["folder_id"].GetStringValue()
+	folderId := d.EqualsQuals["folder_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listLists", "folderId", folderId)
 
 	lists, _, err := client.Lists.GetLists(ctx, folderId, true)
@@ -53,7 +53,7 @@ func getList(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (i
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	listId := d.KeyColumnQuals["id"].GetStringValue()
+	listId := d.EqualsQuals["id"].GetStringValue()
 	plugin.Logger(ctx).Debug("getList", "id", listId)
 
 	list, _, err := client.Lists.GetList(ctx, listId)
diff --git a/clickup/table_list_member.go b/clickup/table_list_member.go
@@ -3,9 +3,9 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupListMember() *plugin.Table {
@@ -26,7 +26,7 @@ func listListMembers(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrate
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	listId := d.KeyColumnQuals["list_id"].GetStringValue()
+	listId := d.EqualsQuals["list_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listListMembers", "listId", listId)
 
 	members, _, err := client.Members.GetListMembers(ctx, listId)
diff --git a/clickup/table_space.go b/clickup/table_space.go
@@ -3,9 +3,9 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupSpace() *plugin.Table {
@@ -30,7 +30,7 @@ func listSpace(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	teamId := d.KeyColumnQuals["team_id"].GetStringValue()
+	teamId := d.EqualsQuals["team_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listSpace", "teamId", teamId)
 
 	spaces, _, err := client.Spaces.GetSpaces(ctx, teamId)
@@ -53,7 +53,7 @@ func getSpace(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	spaceId := d.KeyColumnQuals["id"].GetStringValue()
+	spaceId := d.EqualsQuals["id"].GetStringValue()
 	plugin.Logger(ctx).Debug("getSpace", "id", spaceId)
 
 	space, _, err := client.Spaces.GetSpace(ctx, spaceId)
diff --git a/clickup/table_task.go b/clickup/table_task.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"github.com/raksul/go-clickup/clickup"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupTask() *plugin.Table {
@@ -44,7 +44,7 @@ func listTasks(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	q := d.KeyColumnQuals
+	q := d.EqualsQuals
 
 	// Default options
 	opts := &clickup.GetTasksOptions{
@@ -106,7 +106,7 @@ func getTask(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (i
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	taskId := d.KeyColumnQuals["id"].GetStringValue()
+	taskId := d.EqualsQuals["id"].GetStringValue()
 
 	opts := &clickup.GetTaskOptions{}
 
diff --git a/clickup/table_task_assignee.go b/clickup/table_task_assignee.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"github.com/raksul/go-clickup/clickup"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupTaskAssignee() *plugin.Table {
@@ -27,7 +27,7 @@ func listTaskAssignees(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	taskId := d.KeyColumnQuals["task_id"].GetStringValue()
+	taskId := d.EqualsQuals["task_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listTaskAssignees", "taskId", taskId)
 
 	opts := &clickup.GetTaskOptions{}
diff --git a/clickup/table_task_watcher.go b/clickup/table_task_watcher.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/raksul/go-clickup/clickup"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
 )
 
 func tableClickupTaskWatcher() *plugin.Table {
@@ -25,7 +25,7 @@ func listTaskWatchers(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	taskId := d.KeyColumnQuals["task_id"].GetStringValue()
+	taskId := d.EqualsQuals["task_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listTaskWatchers", "taskId", taskId)
 
 	opts := &clickup.GetTaskOptions{}
diff --git a/clickup/table_team.go b/clickup/table_team.go
@@ -3,8 +3,8 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
 )
 
 func tableClickupTeam() *plugin.Table {
diff --git a/clickup/table_team_member.go b/clickup/table_team_member.go
@@ -3,9 +3,9 @@ package clickup
 import (
 	"context"
 	"fmt"
-	"github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
 )
 
 func tableClickupTeamMember() *plugin.Table {
@@ -26,7 +26,7 @@ func listTeamMembers(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrate
 		return nil, fmt.Errorf("unable to establish a connection: %v", err)
 	}
 
-	teamId := d.KeyColumnQuals["team_id"].GetStringValue()
+	teamId := d.EqualsQuals["team_id"].GetStringValue()
 	plugin.Logger(ctx).Debug("listTeamMembers", "teamId", teamId)
 
 	// Note: No SDK method to obtain a single team
diff --git a/clickup/utils.go b/clickup/utils.go
@@ -1,41 +1,41 @@
-package clickup
-
-import (
-	"context"
-	"errors"
-	"github.com/raksul/go-clickup/clickup"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin"
-	"github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"
-	"os"
-	"strconv"
-	"time"
-)
-
-func connect(_ context.Context, d *plugin.QueryData) (*clickup.Client, error) {
-	token := os.Getenv("CLICKUP_TOKEN")
-
-	clickupConfig := GetConfig(d.Connection)
-	if clickupConfig.Token != nil {
-		token = *clickupConfig.Token
-	}
-
-	if token == "" {
-		return nil, errors.New("the 'token' must be set in connection configuration file or 'CLICKUP_TOKEN' environment variable must be set. Please set and then restart Steampipe")
-	}
-
-	client := clickup.NewClient(nil, token)
-	return client, nil
-}
-
-// Transform Functions
-func unixTimeTransform(_ context.Context, input *transform.TransformData) (interface{}, error) {
-	if input.Value == nil || input.Value == "" {
-		return nil, nil
-	}
-
-	value, err := strconv.ParseInt(input.Value.(string), 0, 64)
-	if err != nil {
-		return nil, err
-	}
-	return time.Unix(value/1000, 0), nil
-}
+package clickup
+
+import (
+	"context"
+	"errors"
+	"github.com/raksul/go-clickup/clickup"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
+	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
+	"os"
+	"strconv"
+	"time"
+)
+
+func connect(_ context.Context, d *plugin.QueryData) (*clickup.Client, error) {
+	token := os.Getenv("CLICKUP_TOKEN")
+
+	clickupConfig := GetConfig(d.Connection)
+	if clickupConfig.Token != nil {
+		token = *clickupConfig.Token
+	}
+
+	if token == "" {
+		return nil, errors.New("the 'token' must be set in connection configuration file or 'CLICKUP_TOKEN' environment variable must be set. Please set and then restart Steampipe")
+	}
+
+	client := clickup.NewClient(nil, token)
+	return client, nil
+}
+
+// Transform Functions
+func unixTimeTransform(_ context.Context, input *transform.TransformData) (interface{}, error) {
+	if input.Value == nil || input.Value == "" {
+		return nil, nil
+	}
+
+	value, err := strconv.ParseInt(input.Value.(string), 0, 64)
+	if err != nil {
+		return nil, err
+	}
+	return time.Unix(value/1000, 0), nil
+}
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package clickup`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/turbot/steampipe-plugin-sdk/v4/plugin"`
`5`		`- "github.com/turbot/steampipe-plugin-sdk/v4/plugin/schema"`
	`4`	`+ "github.com/turbot/steampipe-plugin-sdk/v5/plugin"`
	`5`	`+ "github.com/turbot/steampipe-plugin-sdk/v5/plugin/schema"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type PluginConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ package clickup`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "github.com/turbot/steampipe-plugin-sdk/v4/plugin"`
`6`		`- "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform"`
	`5`	`+ "github.com/turbot/steampipe-plugin-sdk/v5/plugin"`
	`6`	`+ "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func Plugin(ctx context.Context) *plugin.Plugin {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package clickup`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/turbot/steampipe-plugin-sdk/v4/plugin"`
	`6`	`+ "github.com/turbot/steampipe-plugin-sdk/v5/plugin"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func tableClickupFolderlessList() *plugin.Table {`
`@@ -24,7 +24,7 @@ func listFolderlessLists(ctx context.Context, d plugin.QueryData, h plugin.Hyd`
`24`	`24`	`return nil, fmt.Errorf("unable to establish a connection: %v", err)`
`25`	`25`	`}`
`26`	`26`
`27`		`- spaceId := d.KeyColumnQuals["space_id"].GetStringValue()`
	`27`	`+ spaceId := d.EqualsQuals["space_id"].GetStringValue()`
`28`	`28`	`plugin.Logger(ctx).Debug("listFolderlessLists", "spaceId", spaceId)`
`29`	`29`
`30`	`30`	`lists, _, err := client.Lists.GetFolderlessLists(ctx, spaceId, true)`