Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support alternative table types #84

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Support alternative table types #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e1bcf1
Support alternative table types
HuwCampbell Feb 9, 2024
a6c7308
Add validation rules
HuwCampbell Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions client/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ type EntityPopulation struct {

// TimestampInfo ..
type TimestampInfo struct {
Column string `json:"timestampColumn"`
Zone string `json:"timezone,omitempty"`
Type string `json:"adt_type"`
PrimaryKey *int `json:"primaryKey,omitempty"`
Column string `json:"timestampColumn,omitempty"`
From string `json:"fromColumn,omitempty"`
ValidTo string `json:"validTillColumn,omitempty"`
Zone string `json:"timezone,omitempty"`
}

// EventDescription ..
Expand Down Expand Up @@ -543,7 +547,6 @@ type EnumAttributeDisplay struct {
Colour string `json:"colour,omitempty"`
}

// EventDescription ..
type EventStoreTopicColumns struct {
Entity string `json:"entity"`
TimestampInfo *TimestampInfo `json:"timestampInfo"`
Expand Down
215 changes: 189 additions & 26 deletions client/resource_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,33 @@ func ResourceTable() *schema.Resource {
Elem: eventSchema(),
},

"scd2": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
ConflictsWith: []string{"event", "point_in_time"},
Elem: scd2Schema(),
},

"point_in_time": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
ConflictsWith: []string{"event", "scd2"},
Elem: pointInTimeSchema(),
},

"entity_mapping": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validateAnamlIdentifier(),
ConflictsWith: []string{"event"},
ConflictsWith: []string{"event", "scd2", "point_in_time"},
},
"extra_features": {
Type: schema.TypeList,
Description: "Tables upon which this view is created",
Optional: true,
ConflictsWith: []string{"event"},
ConflictsWith: []string{"event", "scd2", "point_in_time"},

Elem: &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -177,12 +193,79 @@ func eventSchema() *schema.Resource {
ValidateDiagFunc: validateMapKeysAnamlIdentifier(),
},
"timestamp_column": {
Type: schema.TypeString,
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotWhiteSpace,
},
"timezone": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotWhiteSpace,
},
},
}
}

func scd2Schema() *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
"entities": {
Type: schema.TypeMap,
Required: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
ValidateDiagFunc: validateMapKeysAnamlIdentifier(),
},
"primary_key": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validateAnamlIdentifier(),
},
"from_column": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotWhiteSpace,
},
"valid_to_column": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotWhiteSpace,
},
"timezone": {
Type: schema.TypeString,
Optional: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotWhiteSpace,
Optional: true,
},
},
}
}

func pointInTimeSchema() *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
"entities": {
Type: schema.TypeMap,
Required: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
ValidateDiagFunc: validateMapKeysAnamlIdentifier(),
},
"primary_key": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validateAnamlIdentifier(),
},
"timestamp_column": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotWhiteSpace,
},
"timezone": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotWhiteSpace,
},
},
}
Expand Down Expand Up @@ -259,10 +342,7 @@ func resourceTableRead(d *schema.ResourceData, m interface{}) error {
return err
}

eventItems := flattenEntityDescription(table.EventInfo)
if err := d.Set("event", eventItems); err != nil {
return err
}
flattenEntityDescription(d, table.EventInfo)

if err := d.Set("expression", table.Expression); err != nil {
return err
Expand Down Expand Up @@ -370,50 +450,133 @@ func buildTable(d *schema.ResourceData) *Table {
}

func expandEntityDescription(d *schema.ResourceData) *EventDescription {
vIR := d.Get("event").([]interface{})
ed := EventDescription{}

if len(vIR) == 1 {
r := vIR[0].(map[string]interface{})

events := d.Get("event").([]interface{})
if len(events) == 1 {
r := events[0].(map[string]interface{})
entities := make(map[string]string)

for k, v := range r["entities"].(map[string]interface{}) {
entities[k] = v.(string)
}

ed = EventDescription{
return &EventDescription{
Entities: entities,
TimestampInfo: &TimestampInfo{
Type: "event",
Column: r["timestamp_column"].(string),
Zone: r["timezone"].(string),
},
}
} else {
return nil
}

return &ed
scd2s := d.Get("scd2").([]interface{})
if len(scd2s) == 1 {
r := scd2s[0].(map[string]interface{})
entities := make(map[string]string)

for k, v := range r["entities"].(map[string]interface{}) {
entities[k] = v.(string)
}

primary, _ := strconv.Atoi(r["primary_key"].(string))
return &EventDescription{
Entities: entities,
TimestampInfo: &TimestampInfo{
Type: "scd2",
PrimaryKey: &primary,
From: r["from_column"].(string),
ValidTo: r["valid_to_column"].(string),
Zone: r["timezone"].(string),
},
}
}

pits := d.Get("point_in_time").([]interface{})
if len(pits) == 1 {
r := pits[0].(map[string]interface{})
entities := make(map[string]string)

for k, v := range r["entities"].(map[string]interface{}) {
entities[k] = v.(string)
}

primary, _ := strconv.Atoi(r["primary_key"].(string))
return &EventDescription{
Entities: entities,
TimestampInfo: &TimestampInfo{
Type: "snapshot",
PrimaryKey: &primary,
Column: r["timestamp_column"].(string),
Zone: r["timezone"].(string),
},
}
}

return nil
}

func flattenEntityDescription(ed *EventDescription) []interface{} {
func flattenEntityDescription(d *schema.ResourceData, ed *EventDescription) error {
if ed != nil {
ois := make([]interface{}, 1, 1)

nothing := make([]interface{}, 0, 0)
oi := make(map[string]interface{})

oi["entities"] = ed.Entities

td := ed.TimestampInfo
oi["timestamp_column"] = td.Column
oi["timezone"] = td.Zone
if td.Type == "event" {
oi["timestamp_column"] = td.Column
oi["timezone"] = td.Zone

ois[0] = oi
if err := d.Set("event", ois); err != nil {
return err
}
if err := d.Set("point_in_time", nothing); err != nil {
return err
}
if err := d.Set("scd2", nothing); err != nil {
return err
}
}

ois[0] = oi
if td.Type == "scd2" && td.PrimaryKey != nil {
oi["primary_key"] = strconv.Itoa(*td.PrimaryKey)
oi["from_column"] = td.From
oi["valid_to_column"] = td.ValidTo
oi["timezone"] = td.Zone

ois[0] = oi
if err := d.Set("scd2", ois); err != nil {
return err
}
if err := d.Set("point_in_time", nothing); err != nil {
return err
}
if err := d.Set("event", nothing); err != nil {
return err
}
}

return ois
if td.Type == "snapshot" && td.PrimaryKey != nil {
oi["primary_key"] = strconv.Itoa(*td.PrimaryKey)
oi["timestamp_column"] = td.Column
oi["timezone"] = td.Zone

ois[0] = oi
if err := d.Set("point_in_time", ois); err != nil {
return err
}
if err := d.Set("scd2", nothing); err != nil {
return err
}
if err := d.Set("event", nothing); err != nil {
return err
}
}
}

return make([]interface{}, 0)
return nil
}

func expandSourceReferences(d *schema.ResourceData) *SourceReference {
Expand Down
Loading