Skip to content

Commit

Permalink
Merge pull request #65 from Tenderly/refactor/ENG-511-replace-alert-w…
Browse files Browse the repository at this point in the history 
…ith-transaction-simple

[ENG-511] Upgrade tenderly/actions version
  • Loading branch information
@delta003
delta003 authored Jan 11, 2022
2 parents 6af9d30 + b46cc79 commit 020f7d5
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 48 deletions.
2 changes: 1 addition & 1 deletion commands/actions/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

const (
TypescriptActionsDependency = "@tenderly/actions"
TypescriptActionsDependencyVersion = "^0.0.6"
TypescriptActionsDependencyVersion = "^0.0.7"
LanguageJavaScript = "javascript"
LanguageTypeScript = "typescript"
)
Expand Down
19 changes: 11 additions & 8 deletions rest/payloads/generated/actions/enums.conjure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,17 +485,18 @@ type TriggerType struct {
type TriggerType_Value string

const (
TriggerType_PERIODIC TriggerType_Value = "PERIODIC"
TriggerType_WEBHOOK TriggerType_Value = "WEBHOOK"
TriggerType_TRANSACTION TriggerType_Value = "TRANSACTION"
TriggerType_BLOCK TriggerType_Value = "BLOCK"
TriggerType_ALERT TriggerType_Value = "ALERT"
TriggerType_UNKNOWN TriggerType_Value = "UNKNOWN"
TriggerType_PERIODIC TriggerType_Value = "PERIODIC"
TriggerType_WEBHOOK TriggerType_Value = "WEBHOOK"
TriggerType_TRANSACTION TriggerType_Value = "TRANSACTION"
TriggerType_BLOCK TriggerType_Value = "BLOCK"
TriggerType_ALERT TriggerType_Value = "ALERT"
TriggerType_TRANSACTIONSIMPLE TriggerType_Value = "TRANSACTIONSIMPLE"
TriggerType_UNKNOWN TriggerType_Value = "UNKNOWN"
)

// TriggerType_Values returns all known variants of TriggerType.
func TriggerType_Values() []TriggerType_Value {
return []TriggerType_Value{TriggerType_PERIODIC, TriggerType_WEBHOOK, TriggerType_TRANSACTION, TriggerType_BLOCK, TriggerType_ALERT}
return []TriggerType_Value{TriggerType_PERIODIC, TriggerType_WEBHOOK, TriggerType_TRANSACTION, TriggerType_BLOCK, TriggerType_ALERT, TriggerType_TRANSACTIONSIMPLE}
}

func New_TriggerType(value TriggerType_Value) TriggerType {
Expand All @@ -505,7 +506,7 @@ func New_TriggerType(value TriggerType_Value) TriggerType {
// IsUnknown returns false for all known variants of TriggerType and true otherwise.
func (e TriggerType) IsUnknown() bool {
switch e.val {
case TriggerType_PERIODIC, TriggerType_WEBHOOK, TriggerType_TRANSACTION, TriggerType_BLOCK, TriggerType_ALERT:
case TriggerType_PERIODIC, TriggerType_WEBHOOK, TriggerType_TRANSACTION, TriggerType_BLOCK, TriggerType_ALERT, TriggerType_TRANSACTIONSIMPLE:
return false
}
return true
Expand Down Expand Up @@ -540,6 +541,8 @@ func (e *TriggerType) UnmarshalText(data []byte) error {
*e = New_TriggerType(TriggerType_BLOCK)
case "ALERT":
*e = New_TriggerType(TriggerType_ALERT)
case "TRANSACTIONSIMPLE":
*e = New_TriggerType(TriggerType_TRANSACTIONSIMPLE)
}
return nil
}
24 changes: 24 additions & 0 deletions rest/payloads/generated/actions/structs.conjure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,11 @@ type TransactionPayload struct {
Logs []TransactionLog `json:"logs"`
// Optional because it is added later so some payloads don't have it.
Input *string `json:"input" conjure-docs:"Optional because it is added later so some payloads don't have it."`
// Optional because it is added later so some payloads don't have it.
Value *string `json:"value" conjure-docs:"Optional because it is added later so some payloads don't have it."`
// Optional because it is added later so some payloads don't have it.
Nonce *string `json:"nonce" conjure-docs:"Optional because it is added later so some payloads don't have it."`
AlertId *string `json:"alertId"`
}

func (o TransactionPayload) MarshalJSON() ([]byte, error) {
Expand Down Expand Up @@ -1451,6 +1456,25 @@ func (o *TransactionPayloadSummary) UnmarshalYAML(unmarshal func(interface{}) er
return safejson.Unmarshal(jsonBytes, *&o)
}

type TransactionSimpleTrigger struct {
}

func (o TransactionSimpleTrigger) MarshalYAML() (interface{}, error) {
jsonBytes, err := safejson.Marshal(o)
if err != nil {
return nil, err
}
return safeyaml.JSONtoYAMLMapSlice(jsonBytes)
}

func (o *TransactionSimpleTrigger) UnmarshalYAML(unmarshal func(interface{}) error) error {
jsonBytes, err := safeyaml.UnmarshalerToJSONBytes(unmarshal)
if err != nil {
return err
}
return safejson.Unmarshal(jsonBytes, *&o)
}

type TransactionTrigger struct {
Status []TransactionStatus `json:"status"`
Filter TransactionFilter `json:"filter"`
Expand Down
129 changes: 90 additions & 39 deletions rest/payloads/generated/actions/unions.conjure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,27 @@ import (

// Payload is sent to user function.
type Payload struct {
typ string
periodic *PeriodicPayload
webhook *WebhookPayload
block *BlockPayload
transaction *TransactionPayload
alert *AlertPayload
typ string
periodic *PeriodicPayload
webhook *WebhookPayload
block *BlockPayload
transaction *TransactionPayload
transactionsimple *TransactionPayload
alert *AlertPayload
}

type payloadDeserializer struct {
Type string `json:"type"`
Periodic *PeriodicPayload `json:"periodic"`
Webhook *WebhookPayload `json:"webhook"`
Block *BlockPayload `json:"block"`
Transaction *TransactionPayload `json:"transaction"`
Alert *AlertPayload `json:"alert"`
Type string `json:"type"`
Periodic *PeriodicPayload `json:"periodic"`
Webhook *WebhookPayload `json:"webhook"`
Block *BlockPayload `json:"block"`
Transaction *TransactionPayload `json:"transaction"`
Transactionsimple *TransactionPayload `json:"transactionsimple"`
Alert *AlertPayload `json:"alert"`
}

func (u *payloadDeserializer) toStruct() Payload {
return Payload{typ: u.Type, periodic: u.Periodic, webhook: u.Webhook, block: u.Block, transaction: u.Transaction, alert: u.Alert}
return Payload{typ: u.Type, periodic: u.Periodic, webhook: u.Webhook, block: u.Block, transaction: u.Transaction, transactionsimple: u.Transactionsimple, alert: u.Alert}
}

func (u *Payload) toSerializer() (interface{}, error) {
Expand All @@ -57,6 +59,11 @@ func (u *Payload) toSerializer() (interface{}, error) {
Type string `json:"type"`
Transaction TransactionPayload `json:"transaction"`
}{Type: "transaction", Transaction: *u.transaction}, nil
case "transactionsimple":
return struct {
Type string `json:"type"`
Transactionsimple TransactionPayload `json:"transactionsimple"`
}{Type: "transactionsimple", Transactionsimple: *u.transactionsimple}, nil
case "alert":
return struct {
Type string `json:"type"`
Expand Down Expand Up @@ -113,6 +120,8 @@ func (u *Payload) Accept(v PayloadVisitor) error {
return v.VisitBlock(*u.block)
case "transaction":
return v.VisitTransaction(*u.transaction)
case "transactionsimple":
return v.VisitTransactionsimple(*u.transactionsimple)
case "alert":
return v.VisitAlert(*u.alert)
}
Expand All @@ -123,6 +132,7 @@ type PayloadVisitor interface {
VisitWebhook(v WebhookPayload) error
VisitBlock(v BlockPayload) error
VisitTransaction(v TransactionPayload) error
VisitTransactionsimple(v TransactionPayload) error
VisitAlert(v AlertPayload) error
VisitUnknown(typeName string) error
}
Expand All @@ -142,6 +152,8 @@ func (u *Payload) AcceptWithContext(ctx context.Context, v PayloadVisitorWithCon
return v.VisitBlockWithContext(ctx, *u.block)
case "transaction":
return v.VisitTransactionWithContext(ctx, *u.transaction)
case "transactionsimple":
return v.VisitTransactionsimpleWithContext(ctx, *u.transactionsimple)
case "alert":
return v.VisitAlertWithContext(ctx, *u.alert)
}
Expand All @@ -152,6 +164,7 @@ type PayloadVisitorWithContext interface {
VisitWebhookWithContext(ctx context.Context, v WebhookPayload) error
VisitBlockWithContext(ctx context.Context, v BlockPayload) error
VisitTransactionWithContext(ctx context.Context, v TransactionPayload) error
VisitTransactionsimpleWithContext(ctx context.Context, v TransactionPayload) error
VisitAlertWithContext(ctx context.Context, v AlertPayload) error
VisitUnknownWithContext(ctx context.Context, typeName string) error
}
Expand All @@ -172,31 +185,37 @@ func NewPayloadFromTransaction(v TransactionPayload) Payload {
return Payload{typ: "transaction", transaction: &v}
}

func NewPayloadFromTransactionsimple(v TransactionPayload) Payload {
return Payload{typ: "transactionsimple", transactionsimple: &v}
}

func NewPayloadFromAlert(v AlertPayload) Payload {
return Payload{typ: "alert", alert: &v}
}

// Payload summary is exposed in dashboard, in list views.
type PayloadSummary struct {
typ string
periodic *PeriodicPayloadSummary
webhook *WebhookPayloadSummary
block *BlockPayloadSummary
transaction *TransactionPayloadSummary
alert *AlertPayloadSummary
typ string
periodic *PeriodicPayloadSummary
webhook *WebhookPayloadSummary
block *BlockPayloadSummary
transaction *TransactionPayloadSummary
transactionsimple *TransactionPayloadSummary
alert *AlertPayloadSummary
}

type payloadSummaryDeserializer struct {
Type string `json:"type"`
Periodic *PeriodicPayloadSummary `json:"periodic"`
Webhook *WebhookPayloadSummary `json:"webhook"`
Block *BlockPayloadSummary `json:"block"`
Transaction *TransactionPayloadSummary `json:"transaction"`
Alert *AlertPayloadSummary `json:"alert"`
Type string `json:"type"`
Periodic *PeriodicPayloadSummary `json:"periodic"`
Webhook *WebhookPayloadSummary `json:"webhook"`
Block *BlockPayloadSummary `json:"block"`
Transaction *TransactionPayloadSummary `json:"transaction"`
Transactionsimple *TransactionPayloadSummary `json:"transactionsimple"`
Alert *AlertPayloadSummary `json:"alert"`
}

func (u *payloadSummaryDeserializer) toStruct() PayloadSummary {
return PayloadSummary{typ: u.Type, periodic: u.Periodic, webhook: u.Webhook, block: u.Block, transaction: u.Transaction, alert: u.Alert}
return PayloadSummary{typ: u.Type, periodic: u.Periodic, webhook: u.Webhook, block: u.Block, transaction: u.Transaction, transactionsimple: u.Transactionsimple, alert: u.Alert}
}

func (u *PayloadSummary) toSerializer() (interface{}, error) {
Expand All @@ -223,6 +242,11 @@ func (u *PayloadSummary) toSerializer() (interface{}, error) {
Type string `json:"type"`
Transaction TransactionPayloadSummary `json:"transaction"`
}{Type: "transaction", Transaction: *u.transaction}, nil
case "transactionsimple":
return struct {
Type string `json:"type"`
Transactionsimple TransactionPayloadSummary `json:"transactionsimple"`
}{Type: "transactionsimple", Transactionsimple: *u.transactionsimple}, nil
case "alert":
return struct {
Type string `json:"type"`
Expand Down Expand Up @@ -279,6 +303,8 @@ func (u *PayloadSummary) Accept(v PayloadSummaryVisitor) error {
return v.VisitBlock(*u.block)
case "transaction":
return v.VisitTransaction(*u.transaction)
case "transactionsimple":
return v.VisitTransactionsimple(*u.transactionsimple)
case "alert":
return v.VisitAlert(*u.alert)
}
Expand All @@ -289,6 +315,7 @@ type PayloadSummaryVisitor interface {
VisitWebhook(v WebhookPayloadSummary) error
VisitBlock(v BlockPayloadSummary) error
VisitTransaction(v TransactionPayloadSummary) error
VisitTransactionsimple(v TransactionPayloadSummary) error
VisitAlert(v AlertPayloadSummary) error
VisitUnknown(typeName string) error
}
Expand All @@ -308,6 +335,8 @@ func (u *PayloadSummary) AcceptWithContext(ctx context.Context, v PayloadSummary
return v.VisitBlockWithContext(ctx, *u.block)
case "transaction":
return v.VisitTransactionWithContext(ctx, *u.transaction)
case "transactionsimple":
return v.VisitTransactionsimpleWithContext(ctx, *u.transactionsimple)
case "alert":
return v.VisitAlertWithContext(ctx, *u.alert)
}
Expand All @@ -318,6 +347,7 @@ type PayloadSummaryVisitorWithContext interface {
VisitWebhookWithContext(ctx context.Context, v WebhookPayloadSummary) error
VisitBlockWithContext(ctx context.Context, v BlockPayloadSummary) error
VisitTransactionWithContext(ctx context.Context, v TransactionPayloadSummary) error
VisitTransactionsimpleWithContext(ctx context.Context, v TransactionPayloadSummary) error
VisitAlertWithContext(ctx context.Context, v AlertPayloadSummary) error
VisitUnknownWithContext(ctx context.Context, typeName string) error
}
Expand All @@ -338,31 +368,37 @@ func NewPayloadSummaryFromTransaction(v TransactionPayloadSummary) PayloadSummar
return PayloadSummary{typ: "transaction", transaction: &v}
}

func NewPayloadSummaryFromTransactionsimple(v TransactionPayloadSummary) PayloadSummary {
return PayloadSummary{typ: "transactionsimple", transactionsimple: &v}
}

func NewPayloadSummaryFromAlert(v AlertPayloadSummary) PayloadSummary {
return PayloadSummary{typ: "alert", alert: &v}
}

// Trigger is confired by user. CLI has another trigger representation and does translation.
type Trigger struct {
typ string
periodic *PeriodicTrigger
webhook *WebhookTrigger
block *BlockTrigger
transaction *TransactionTrigger
alert *AlertTrigger
typ string
periodic *PeriodicTrigger
webhook *WebhookTrigger
block *BlockTrigger
transaction *TransactionTrigger
transactionsimple *TransactionSimpleTrigger
alert *AlertTrigger
}

type triggerDeserializer struct {
Type string `json:"type"`
Periodic *PeriodicTrigger `json:"periodic"`
Webhook *WebhookTrigger `json:"webhook"`
Block *BlockTrigger `json:"block"`
Transaction *TransactionTrigger `json:"transaction"`
Alert *AlertTrigger `json:"alert"`
Type string `json:"type"`
Periodic *PeriodicTrigger `json:"periodic"`
Webhook *WebhookTrigger `json:"webhook"`
Block *BlockTrigger `json:"block"`
Transaction *TransactionTrigger `json:"transaction"`
Transactionsimple *TransactionSimpleTrigger `json:"transactionsimple"`
Alert *AlertTrigger `json:"alert"`
}

func (u *triggerDeserializer) toStruct() Trigger {
return Trigger{typ: u.Type, periodic: u.Periodic, webhook: u.Webhook, block: u.Block, transaction: u.Transaction, alert: u.Alert}
return Trigger{typ: u.Type, periodic: u.Periodic, webhook: u.Webhook, block: u.Block, transaction: u.Transaction, transactionsimple: u.Transactionsimple, alert: u.Alert}
}

func (u *Trigger) toSerializer() (interface{}, error) {
Expand All @@ -389,6 +425,11 @@ func (u *Trigger) toSerializer() (interface{}, error) {
Type string `json:"type"`
Transaction TransactionTrigger `json:"transaction"`
}{Type: "transaction", Transaction: *u.transaction}, nil
case "transactionsimple":
return struct {
Type string `json:"type"`
Transactionsimple TransactionSimpleTrigger `json:"transactionsimple"`
}{Type: "transactionsimple", Transactionsimple: *u.transactionsimple}, nil
case "alert":
return struct {
Type string `json:"type"`
Expand Down Expand Up @@ -445,6 +486,8 @@ func (u *Trigger) Accept(v TriggerVisitor) error {
return v.VisitBlock(*u.block)
case "transaction":
return v.VisitTransaction(*u.transaction)
case "transactionsimple":
return v.VisitTransactionsimple(*u.transactionsimple)
case "alert":
return v.VisitAlert(*u.alert)
}
Expand All @@ -455,6 +498,7 @@ type TriggerVisitor interface {
VisitWebhook(v WebhookTrigger) error
VisitBlock(v BlockTrigger) error
VisitTransaction(v TransactionTrigger) error
VisitTransactionsimple(v TransactionSimpleTrigger) error
VisitAlert(v AlertTrigger) error
VisitUnknown(typeName string) error
}
Expand All @@ -474,6 +518,8 @@ func (u *Trigger) AcceptWithContext(ctx context.Context, v TriggerVisitorWithCon
return v.VisitBlockWithContext(ctx, *u.block)
case "transaction":
return v.VisitTransactionWithContext(ctx, *u.transaction)
case "transactionsimple":
return v.VisitTransactionsimpleWithContext(ctx, *u.transactionsimple)
case "alert":
return v.VisitAlertWithContext(ctx, *u.alert)
}
Expand All @@ -484,6 +530,7 @@ type TriggerVisitorWithContext interface {
VisitWebhookWithContext(ctx context.Context, v WebhookTrigger) error
VisitBlockWithContext(ctx context.Context, v BlockTrigger) error
VisitTransactionWithContext(ctx context.Context, v TransactionTrigger) error
VisitTransactionsimpleWithContext(ctx context.Context, v TransactionSimpleTrigger) error
VisitAlertWithContext(ctx context.Context, v AlertTrigger) error
VisitUnknownWithContext(ctx context.Context, typeName string) error
}
Expand All @@ -504,6 +551,10 @@ func NewTriggerFromTransaction(v TransactionTrigger) Trigger {
return Trigger{typ: "transaction", transaction: &v}
}

func NewTriggerFromTransactionsimple(v TransactionSimpleTrigger) Trigger {
return Trigger{typ: "transactionsimple", transactionsimple: &v}
}

func NewTriggerFromAlert(v AlertTrigger) Trigger {
return Trigger{typ: "alert", alert: &v}
}

0 comments on commit 020f7d5

Please sign in to comment.