refactor: JSON columns now JSON not JSONString

Author: graza-io

config/github_connection.go

@@ -1,12 +1,12 @@
 package config
 
-import "github.com/turbot/tailpipe-plugin-sdk/parse"
+const PluginName = "github"
 
 type GitHubConnection struct {
 }
 
-func NewGitHubConnection() parse.Config {
-	return &GitHubConnection{}
+func (c *GitHubConnection) Identifier() string {
+	return PluginName
 }
 
 func (c *GitHubConnection) Validate() error {

github/plugin.go

@@ -21,7 +21,7 @@ func NewPlugin() (_ plugin.TailpipePlugin, err error) {
 	}()
 
 	p := &Plugin{
-		PluginImpl: plugin.NewPluginImpl[*config.GitHubConnection]("github"),
+		PluginImpl: plugin.NewPluginImpl(config.PluginName),
 	}
 
 	return p, nil

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/jackc/pgx/v5 v5.6.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
+	github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
 	github.com/satyrius/gonx v1.4.0 // indirect
 	github.com/smarty/assertions v1.16.0 // indirect
 	github.com/turbot/pipes-sdk-go v0.9.1 // indirect

go.sum

@@ -592,6 +592,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 h1:18kd+8ZUlt/ARXhljq+14TwAoKa61q6dX8jtwOf6DH8=
+github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

rows/audit_log.go

@@ -1,12 +1,10 @@
 package rows
 
 import (
-	"encoding/json"
 	"strconv"
 	"time"
 
 	"github.com/turbot/tailpipe-plugin-sdk/enrichment"
-	"github.com/turbot/tailpipe-plugin-sdk/types"
 )
 
 /*
@@ -22,26 +20,26 @@ import (
 type AuditLog struct {
 	enrichment.CommonFields
 
-	Action                   *string           `json:"action,omitempty"`
-	Actor                    *string           `json:"actor,omitempty"`
-	ActorID                  *int64            `json:"actor_id,omitempty"`
-	ActorIP                  *string           `json:"actor_ip,omitempty"`
-	ActorLocation            *types.JSONString `json:"actor_location,omitempty"`
-	Business                 *string           `json:"business,omitempty"`
-	BusinessID               *int64            `json:"business_id,omitempty"`
-	CreatedAt                *time.Time        `json:"created_at,omitempty"`
-	DocumentID               *string           `json:"_document_id,omitempty"`
-	ExternalIdentityNameID   *string           `json:"external_identity_nameid,omitempty"`
-	ExternalIdentityUsername *string           `json:"external_identity_username,omitempty"`
-	HashedToken              *string           `json:"hashed_token,omitempty"`
-	Org                      *string           `json:"org,omitempty"`
-	OrgID                    *string           `json:"org_id,omitempty"`
-	Timestamp                *time.Time        `json:"timestamp,omitempty"`
-	TokenID                  *int64            `json:"token_id,omitempty"`
-	TokenScopes              *string           `json:"token_scopes,omitempty"`
-	User                     *string           `json:"user,omitempty"`
-	UserID                   *int64            `json:"user_id,omitempty"`
-	AdditionalFields         *types.JSONString `json:"additional_fields,omitempty"`
+	Action                   *string                 `json:"action,omitempty"`
+	Actor                    *string                 `json:"actor,omitempty"`
+	ActorID                  *int64                  `json:"actor_id,omitempty"`
+	ActorIP                  *string                 `json:"actor_ip,omitempty"`
+	ActorLocation            *map[string]interface{} `json:"actor_location,omitempty" parquet:"type=JSON"`
+	Business                 *string                 `json:"business,omitempty"`
+	BusinessID               *int64                  `json:"business_id,omitempty"`
+	CreatedAt                *time.Time              `json:"created_at,omitempty"`
+	DocumentID               *string                 `json:"_document_id,omitempty"`
+	ExternalIdentityNameID   *string                 `json:"external_identity_nameid,omitempty"`
+	ExternalIdentityUsername *string                 `json:"external_identity_username,omitempty"`
+	HashedToken              *string                 `json:"hashed_token,omitempty"`
+	Org                      *string                 `json:"org,omitempty"`
+	OrgID                    *string                 `json:"org_id,omitempty"`
+	Timestamp                *time.Time              `json:"timestamp,omitempty"`
+	TokenID                  *int64                  `json:"token_id,omitempty"`
+	TokenScopes              *string                 `json:"token_scopes,omitempty"`
+	User                     *string                 `json:"user,omitempty"`
+	UserID                   *int64                  `json:"user_id,omitempty"`
+	AdditionalFields         *map[string]interface{} `json:"additional_fields,omitempty" parquet:"type=JSON"`
 }
 
 type ActorLocation struct {
@@ -77,11 +75,7 @@ func (a *AuditLog) FromMap(in map[string]interface{}) {
 			}
 		case "actor_location":
 			if location, ok := value.(map[string]interface{}); ok {
-				locJSON, err := json.Marshal(location)
-				if err == nil {
-					locStr := types.JSONString(locJSON)
-					a.ActorLocation = &locStr
-				}
+				a.ActorLocation = &location
 			}
 		case "business":
 			if strVal, ok := value.(string); ok {
@@ -153,9 +147,6 @@ func (a *AuditLog) FromMap(in map[string]interface{}) {
 
 	// Marshal dynamic fields into JSON and store in AdditionalFields
 	if len(dynamicFields) > 0 {
-		if dynamicJSON, err := json.Marshal(dynamicFields); err == nil {
-			djStr := types.JSONString(dynamicJSON)
-			a.AdditionalFields = &djStr
-		}
+		a.AdditionalFields = &dynamicFields
 	}
 }

tables/audit_log_table_config.go

@@ -3,6 +3,10 @@ package tables
 type AuditLogTableConfig struct {
 }
 
+func (a *AuditLogTableConfig) Identifier() string {
+	return AuditLogTableIdentifier
+}
+
 func (a *AuditLogTableConfig) Validate() error {
 	return nil
 }