From 463ab401affd66a08d24dd96ac60f7bc8c7ae631 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Sat, 14 Jun 2025 17:32:38 +0000 Subject: [PATCH] lexicons: update repo and spindle.member lexicons - add spindle to repo - fix spindle.member lexicon field name Signed-off-by: oppiliappan --- lexicons/repo.json | 4 ++++ api/tangled/cbor_gen.go | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------- api/tangled/spindlemember.go | 4 ++-- api/tangled/tangledrepo.go | 2 ++ lexicons/spindle/member.json | 2 +- 5 file(s) changed, 87 insertion(s)(+), 48 deletion(s)(-) diff --git a/lexicons/repo.json b/lexicons/repo.json --- a/lexicons/repo.json +++ b/lexicons/repo.json @@ -28,6 +28,10 @@ "type": "string", "description": "knot where the repo was created" }, + "spindle": { + "type": "string", + "description": "CI runner to send jobs to and receive results from" + }, "description": { "type": "string", "format": "datetime", diff --git a/api/tangled/cbor_gen.go b/api/tangled/cbor_gen.go --- a/api/tangled/cbor_gen.go +++ b/api/tangled/cbor_gen.go @@ -7184,13 +7184,17 @@ } cw := cbg.NewCborWriter(w) - fieldCount := 7 + fieldCount := 8 if t.Description == nil { fieldCount-- } if t.Source == nil { + fieldCount-- + } + + if t.Spindle == nil { fieldCount-- } @@ -7313,6 +7317,38 @@ return err } if _, err := cw.WriteString(string(*t.Source)); err != nil { + return err + } + } + } + + // t.Spindle (string) (string) + if t.Spindle != nil { + + if len("spindle") > 1000000 { + return xerrors.Errorf("Value in field \"spindle\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("spindle"))); err != nil { + return err + } + if _, err := cw.WriteString(string("spindle")); err != nil { + return err + } + + if t.Spindle == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Spindle) > 1000000 { + return xerrors.Errorf("Value in field t.Spindle was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Spindle))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Spindle)); err != nil { return err } } @@ -7481,6 +7517,27 @@ t.Source = (*string)(&sval) } } + // t.Spindle (string) (string) + case "spindle": + + { + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Spindle = (*string)(&sval) + } + } // t.CreatedAt (string) (string) case "createdAt": @@ -7531,13 +7588,8 @@ } cw := cbg.NewCborWriter(w) - fieldCount := 4 - if t.Instance == nil { - fieldCount-- - } - - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + if _, err := cw.Write([]byte{164}); err != nil { return err } @@ -7584,35 +7636,26 @@ } // t.Instance (string) (string) - if t.Instance != nil { + if len("instance") > 1000000 { + return xerrors.Errorf("Value in field \"instance\" was too long") + } - if len("instance") > 1000000 { - return xerrors.Errorf("Value in field \"instance\" was too long") - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("instance"))); err != nil { + return err + } + if _, err := cw.WriteString(string("instance")); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("instance"))); err != nil { - return err - } - if _, err := cw.WriteString(string("instance")); err != nil { - return err - } + if len(t.Instance) > 1000000 { + return xerrors.Errorf("Value in field t.Instance was too long") + } - if t.Instance == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Instance) > 1000000 { - return xerrors.Errorf("Value in field t.Instance was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Instance))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Instance)); err != nil { - return err - } - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Instance))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Instance)); err != nil { + return err } // t.CreatedAt (string) (string) @@ -7707,22 +7750,12 @@ case "instance": { - b, err := cr.ReadByte() + sval, err := cbg.ReadStringWithMax(cr, 1000000) if err != nil { return err } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Instance = (*string)(&sval) - } + t.Instance = string(sval) } // t.CreatedAt (string) (string) case "createdAt": diff --git a/api/tangled/spindlemember.go b/api/tangled/spindlemember.go --- a/api/tangled/spindlemember.go +++ b/api/tangled/spindlemember.go @@ -20,6 +20,6 @@ LexiconTypeID string `json:"$type,const=sh.tangled.spindle.member" cborgen:"$type,const=sh.tangled.spindle.member"` CreatedAt string `json:"createdAt" cborgen:"createdAt"` // instance: spindle instance that the subject is now a member of - Instance *string `json:"instance,omitempty" cborgen:"instance,omitempty"` - Subject string `json:"subject" cborgen:"subject"` + Instance string `json:"instance" cborgen:"instance"` + Subject string `json:"subject" cborgen:"subject"` } diff --git a/api/tangled/tangledrepo.go b/api/tangled/tangledrepo.go --- a/api/tangled/tangledrepo.go +++ b/api/tangled/tangledrepo.go @@ -27,4 +27,6 @@ Owner string `json:"owner" cborgen:"owner"` // source: source of the repo Source *string `json:"source,omitempty" cborgen:"source,omitempty"` + // spindle: CI runner to send jobs to and receive results from + Spindle *string `json:"spindle,omitempty" cborgen:"spindle,omitempty"` } diff --git a/lexicons/spindle/member.json b/lexicons/spindle/member.json --- a/lexicons/spindle/member.json +++ b/lexicons/spindle/member.json @@ -11,7 +11,7 @@ "type": "object", "required": [ "subject", - "domain", + "instance", "createdAt" ], "properties": { -- tangled.sh