Started working on functions for creating attribute values
All checks were successful
ci / build (push) Successful in 3m20s
All checks were successful
ci / build (push) Successful in 3m20s
Also finished mapping attribute values to/from UCL
This commit is contained in:
parent
32ae488066
commit
204c79ca2d
6 changed files with 139 additions and 8 deletions
52
internal/common/ui/commandctrl/cmdpacks/modav.go
Normal file
52
internal/common/ui/commandctrl/cmdpacks/modav.go
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
package cmdpacks
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
|
||||
"ucl.lmika.dev/ucl"
|
||||
)
|
||||
|
||||
type avModule struct {
|
||||
}
|
||||
|
||||
func (avModule) avTrue(ctx context.Context, args ucl.CallArgs) (_ any, err error) {
|
||||
return attributeValueProxy{value: &types.AttributeValueMemberBOOL{Value: true}}, nil
|
||||
}
|
||||
|
||||
func (avModule) avFalse(ctx context.Context, args ucl.CallArgs) (_ any, err error) {
|
||||
return attributeValueProxy{value: &types.AttributeValueMemberBOOL{Value: false}}, nil
|
||||
}
|
||||
|
||||
func (avModule) avNull(ctx context.Context, args ucl.CallArgs) (_ any, err error) {
|
||||
return attributeValueProxy{value: &types.AttributeValueMemberNULL{Value: true}}, nil
|
||||
}
|
||||
|
||||
func (avModule) avStringSet(ctx context.Context, args ucl.CallArgs) (_ any, err error) {
|
||||
var listable ucl.Listable
|
||||
|
||||
if err := args.Bind(&listable); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ss := make([]string, listable.Len())
|
||||
for i := 0; i < listable.Len(); i++ {
|
||||
item := listable.Index(i)
|
||||
ss[i] = item.String()
|
||||
}
|
||||
|
||||
return attributeValueProxy{value: &types.AttributeValueMemberSS{Value: ss}}, nil
|
||||
}
|
||||
|
||||
func moduleAttrValue() ucl.Module {
|
||||
m := avModule{}
|
||||
|
||||
return ucl.Module{
|
||||
Name: "av",
|
||||
Builtins: map[string]ucl.BuiltinHandler{
|
||||
"true": m.avTrue,
|
||||
"false": m.avFalse,
|
||||
"null": m.avNull,
|
||||
"string-set": m.avStringSet,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
@ -3,12 +3,12 @@ package cmdpacks
|
|||
import (
|
||||
"context"
|
||||
"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
|
||||
"github.com/pkg/errors"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/common/ui/commandctrl"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/controllers"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/models"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/models/queryexpr"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/services/tables"
|
||||
"github.com/pkg/errors"
|
||||
"time"
|
||||
"ucl.lmika.dev/repl"
|
||||
"ucl.lmika.dev/ucl"
|
||||
|
|
@ -252,8 +252,12 @@ func (rs *rsModule) rsSet(ctx context.Context, args ucl.CallArgs) (_ any, err er
|
|||
return nil, err
|
||||
}
|
||||
|
||||
// TEMP: attribute is always S
|
||||
if err := q.SetEvalItem(item.item, &types.AttributeValueMemberS{Value: val.String()}); err != nil {
|
||||
vs, err := mapUCLObjectToAttributeType(val)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err := q.SetEvalItem(item.item, vs); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
item.resultSet.SetDirty(item.idx, true)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package cmdpacks
|
|||
import (
|
||||
"fmt"
|
||||
"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
|
||||
"github.com/pkg/errors"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/models"
|
||||
"maps"
|
||||
"strconv"
|
||||
|
|
@ -200,6 +201,18 @@ func (tp itemProxy) Each(fn func(k string, v ucl.Object) error) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
type attributeValueProxy struct {
|
||||
value types.AttributeValue
|
||||
}
|
||||
|
||||
func (ip attributeValueProxy) String() string {
|
||||
return "attributeValueProxy()"
|
||||
}
|
||||
|
||||
func (ip attributeValueProxy) Truthy() bool {
|
||||
return ip.value != nil
|
||||
}
|
||||
|
||||
func convertAttributeValueToUCLObject(attrValue types.AttributeValue) ucl.Object {
|
||||
switch t := attrValue.(type) {
|
||||
case *types.AttributeValueMemberS:
|
||||
|
|
@ -210,7 +223,58 @@ func convertAttributeValueToUCLObject(attrValue types.AttributeValue) ucl.Object
|
|||
return nil
|
||||
}
|
||||
return ucl.IntObject(i)
|
||||
case *types.AttributeValueMemberBOOL:
|
||||
return ucl.BoolObject(t.Value)
|
||||
case *types.AttributeValueMemberL:
|
||||
vs := make(ucl.ListObject, len(t.Value))
|
||||
for i, v := range t.Value {
|
||||
vs[i] = convertAttributeValueToUCLObject(v)
|
||||
}
|
||||
return &vs
|
||||
case *types.AttributeValueMemberM:
|
||||
hs := make(ucl.HashObject)
|
||||
for k, v := range t.Value {
|
||||
hs[k] = convertAttributeValueToUCLObject(v)
|
||||
}
|
||||
return hs
|
||||
}
|
||||
// TODO: the rest
|
||||
return nil
|
||||
|
||||
return attributeValueProxy{value: attrValue}
|
||||
}
|
||||
|
||||
func mapUCLObjectToAttributeType(obj ucl.Object) (types.AttributeValue, error) {
|
||||
switch t := obj.(type) {
|
||||
case ucl.StringObject:
|
||||
return &types.AttributeValueMemberS{Value: t.String()}, nil
|
||||
case ucl.IntObject:
|
||||
return &types.AttributeValueMemberN{Value: t.String()}, nil
|
||||
case ucl.BoolObject:
|
||||
return &types.AttributeValueMemberBOOL{Value: t.Truthy()}, nil
|
||||
case ucl.Listable:
|
||||
vals := make([]types.AttributeValue, t.Len())
|
||||
for i := 0; i < t.Len(); i++ {
|
||||
v, err := mapUCLObjectToAttributeType(t.Index(i))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
vals[i] = v
|
||||
}
|
||||
return &types.AttributeValueMemberL{Value: vals}, nil
|
||||
case ucl.Hashable:
|
||||
vals := make(map[string]types.AttributeValue)
|
||||
if err := t.Each(func(k string, v ucl.Object) error {
|
||||
vv, err := mapUCLObjectToAttributeType(v)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
vals[k] = vv
|
||||
return nil
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &types.AttributeValueMemberM{Value: vals}, nil
|
||||
case attributeValueProxy:
|
||||
return t.value, nil
|
||||
}
|
||||
return nil, errors.New("unsupported attribute type")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ package cmdpacks
|
|||
import (
|
||||
"context"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/pkg/errors"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/common/ui/commandctrl"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/controllers"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/models"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/services"
|
||||
"lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/services/tables"
|
||||
"github.com/pkg/errors"
|
||||
"ucl.lmika.dev/repl"
|
||||
"ucl.lmika.dev/ucl"
|
||||
)
|
||||
|
|
@ -398,6 +398,7 @@ func (sc StandardCommands) InstOptions() []ucl.InstOption {
|
|||
ucl.WithModule(sc.modUI),
|
||||
ucl.WithModule(modulePB(sc.PBProvider)),
|
||||
ucl.WithModule(moduleOpt(sc.SettingsController)),
|
||||
ucl.WithModule(moduleAttrValue()),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue