diff --git a/api/tangled/cbor_gen.go b/api/tangled/cbor_gen.go index eba0337..9fbeded 100644 --- a/api/tangled/cbor_gen.go +++ b/api/tangled/cbor_gen.go @@ -866,7 +866,7 @@ func (t *FeedStar) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *GitRefUpdate) MarshalCBOR(w io.Writer) error { +func (t *GitRefUpdate_Meta_CommitCount_ByEmail_Elem) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -874,187 +874,59 @@ func (t *GitRefUpdate) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{168}); err != nil { - return err - } - - // t.Ref (string) (string) - if len("ref") > 1000000 { - return xerrors.Errorf("Value in field \"ref\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ref"))); err != nil { - return err - } - if _, err := cw.WriteString(string("ref")); err != nil { - return err - } - - if len(t.Ref) > 1000000 { - return xerrors.Errorf("Value in field t.Ref was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Ref))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Ref)); err != nil { - return err - } - - // t.Meta (tangled.GitRefUpdate_Meta) (struct) - if len("meta") > 1000000 { - return xerrors.Errorf("Value in field \"meta\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("meta"))); err != nil { - return err - } - if _, err := cw.WriteString(string("meta")); err != nil { - return err - } - - if err := t.Meta.MarshalCBOR(cw); err != nil { - return err - } - - // t.LexiconTypeID (string) (string) - if len("$type") > 1000000 { - return xerrors.Errorf("Value in field \"$type\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { - return err - } - if _, err := cw.WriteString(string("$type")); err != nil { - return err - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.git.refUpdate"))); err != nil { - return err - } - if _, err := cw.WriteString(string("sh.tangled.git.refUpdate")); err != nil { - return err - } - - // t.NewSha (string) (string) - if len("newSha") > 1000000 { - return xerrors.Errorf("Value in field \"newSha\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("newSha"))); err != nil { - return err - } - if _, err := cw.WriteString(string("newSha")); err != nil { - return err - } - - if len(t.NewSha) > 1000000 { - return xerrors.Errorf("Value in field t.NewSha was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.NewSha))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.NewSha)); err != nil { - return err - } - - // t.OldSha (string) (string) - if len("oldSha") > 1000000 { - return xerrors.Errorf("Value in field \"oldSha\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("oldSha"))); err != nil { - return err - } - if _, err := cw.WriteString(string("oldSha")); err != nil { - return err - } - - if len(t.OldSha) > 1000000 { - return xerrors.Errorf("Value in field t.OldSha was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.OldSha))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.OldSha)); err != nil { - return err - } - - // t.RepoDid (string) (string) - if len("repoDid") > 1000000 { - return xerrors.Errorf("Value in field \"repoDid\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repoDid"))); err != nil { - return err - } - if _, err := cw.WriteString(string("repoDid")); err != nil { - return err - } - - if len(t.RepoDid) > 1000000 { - return xerrors.Errorf("Value in field t.RepoDid was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RepoDid))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.RepoDid)); err != nil { + if _, err := cw.Write([]byte{162}); err != nil { return err } - // t.RepoName (string) (string) - if len("repoName") > 1000000 { - return xerrors.Errorf("Value in field \"repoName\" was too long") + // t.Count (int64) (int64) + if len("count") > 1000000 { + return xerrors.Errorf("Value in field \"count\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repoName"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("count"))); err != nil { return err } - if _, err := cw.WriteString(string("repoName")); err != nil { + if _, err := cw.WriteString(string("count")); err != nil { return err } - if len(t.RepoName) > 1000000 { - return xerrors.Errorf("Value in field t.RepoName was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RepoName))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.RepoName)); err != nil { - return err + if t.Count >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Count)); err != nil { + return err + } + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.Count-1)); err != nil { + return err + } } - // t.CommitterDid (string) (string) - if len("committerDid") > 1000000 { - return xerrors.Errorf("Value in field \"committerDid\" was too long") + // t.Email (string) (string) + if len("email") > 1000000 { + return xerrors.Errorf("Value in field \"email\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("committerDid"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("email"))); err != nil { return err } - if _, err := cw.WriteString(string("committerDid")); err != nil { + if _, err := cw.WriteString(string("email")); err != nil { return err } - if len(t.CommitterDid) > 1000000 { - return xerrors.Errorf("Value in field t.CommitterDid was too long") + if len(t.Email) > 1000000 { + return xerrors.Errorf("Value in field t.Email was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CommitterDid))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Email))); err != nil { return err } - if _, err := cw.WriteString(string(t.CommitterDid)); err != nil { + if _, err := cw.WriteString(string(t.Email)); err != nil { return err } return nil } -func (t *GitRefUpdate) UnmarshalCBOR(r io.Reader) (err error) { - *t = GitRefUpdate{} +func (t *GitRefUpdate_Meta_CommitCount_ByEmail_Elem) UnmarshalCBOR(r io.Reader) (err error) { + *t = GitRefUpdate_Meta_CommitCount_ByEmail_Elem{} cr := cbg.NewCborReader(r) @@ -1073,12 +945,12 @@ func (t *GitRefUpdate) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("GitRefUpdate: map struct too large (%d)", extra) + return fmt.Errorf("GitRefUpdate_Meta_CommitCount_ByEmail_Elem: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 12) + nameBuf := make([]byte, 5) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -1094,39 +966,34 @@ func (t *GitRefUpdate) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Ref (string) (string) - case "ref": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Ref = string(sval) - } - // t.Meta (tangled.GitRefUpdate_Meta) (struct) - case "meta": - + // t.Count (int64) (int64) + case "count": { - - b, err := cr.ReadByte() + maj, extra, err := cr.ReadHeader() if err != nil { return err } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") } - t.Meta = new(GitRefUpdate_Meta) - if err := t.Meta.UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.Meta pointer: %w", err) + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) } + t.Count = int64(extraI) } - // t.LexiconTypeID (string) (string) - case "$type": + // t.Email (string) (string) + case "email": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -1134,84 +1001,29 @@ func (t *GitRefUpdate) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.LexiconTypeID = string(sval) + t.Email = string(sval) } - // t.NewSha (string) (string) - case "newSha": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - t.NewSha = string(sval) + default: + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { + return err } - // t.OldSha (string) (string) - case "oldSha": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.OldSha = string(sval) - } - // t.RepoDid (string) (string) - case "repoDid": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.RepoDid = string(sval) - } - // t.RepoName (string) (string) - case "repoName": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.RepoName = string(sval) - } - // t.CommitterDid (string) (string) - case "committerDid": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.CommitterDid = string(sval) - } - - default: - // Field doesn't exist on this type, so ignore it - if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { - return err - } - } - } + } + } return nil } -func (t *GitRefUpdate_Meta) MarshalCBOR(w io.Writer) error { +func (t *GitRefUpdate_Meta_CommitCount) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 3 + fieldCount := 1 - if t.LangBreakdown == nil { + if t.ByEmail == nil { fieldCount-- } @@ -1219,61 +1031,39 @@ func (t *GitRefUpdate_Meta) MarshalCBOR(w io.Writer) error { return err } - // t.CommitCount (tangled.GitRefUpdate_Meta_CommitCount) (struct) - if len("commitCount") > 1000000 { - return xerrors.Errorf("Value in field \"commitCount\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("commitCount"))); err != nil { - return err - } - if _, err := cw.WriteString(string("commitCount")); err != nil { - return err - } - - if err := t.CommitCount.MarshalCBOR(cw); err != nil { - return err - } - - // t.IsDefaultRef (bool) (bool) - if len("isDefaultRef") > 1000000 { - return xerrors.Errorf("Value in field \"isDefaultRef\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("isDefaultRef"))); err != nil { - return err - } - if _, err := cw.WriteString(string("isDefaultRef")); err != nil { - return err - } - - if err := cbg.WriteBool(w, t.IsDefaultRef); err != nil { - return err - } - - // t.LangBreakdown (tangled.GitRefUpdate_Meta_LangBreakdown) (struct) - if t.LangBreakdown != nil { + // t.ByEmail ([]*tangled.GitRefUpdate_Meta_CommitCount_ByEmail_Elem) (slice) + if t.ByEmail != nil { - if len("langBreakdown") > 1000000 { - return xerrors.Errorf("Value in field \"langBreakdown\" was too long") + if len("byEmail") > 1000000 { + return xerrors.Errorf("Value in field \"byEmail\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("langBreakdown"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("byEmail"))); err != nil { return err } - if _, err := cw.WriteString(string("langBreakdown")); err != nil { + if _, err := cw.WriteString(string("byEmail")); err != nil { return err } - if err := t.LangBreakdown.MarshalCBOR(cw); err != nil { + if len(t.ByEmail) > 8192 { + return xerrors.Errorf("Slice value in field t.ByEmail was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.ByEmail))); err != nil { return err } + for _, v := range t.ByEmail { + if err := v.MarshalCBOR(cw); err != nil { + return err + } + + } } return nil } -func (t *GitRefUpdate_Meta) UnmarshalCBOR(r io.Reader) (err error) { - *t = GitRefUpdate_Meta{} +func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { + *t = GitRefUpdate_Meta_CommitCount{} cr := cbg.NewCborReader(r) @@ -1292,12 +1082,12 @@ func (t *GitRefUpdate_Meta) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("GitRefUpdate_Meta: map struct too large (%d)", extra) + return fmt.Errorf("GitRefUpdate_Meta_CommitCount: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 13) + nameBuf := make([]byte, 7) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -1313,63 +1103,54 @@ func (t *GitRefUpdate_Meta) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.CommitCount (tangled.GitRefUpdate_Meta_CommitCount) (struct) - case "commitCount": - - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - t.CommitCount = new(GitRefUpdate_Meta_CommitCount) - if err := t.CommitCount.UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.CommitCount pointer: %w", err) - } - } - - } - // t.IsDefaultRef (bool) (bool) - case "isDefaultRef": + // t.ByEmail ([]*tangled.GitRefUpdate_Meta_CommitCount_ByEmail_Elem) (slice) + case "byEmail": maj, extra, err = cr.ReadHeader() if err != nil { return err } - if maj != cbg.MajOther { - return fmt.Errorf("booleans must be major type 7") + + if extra > 8192 { + return fmt.Errorf("t.ByEmail: array too large (%d)", extra) } - switch extra { - case 20: - t.IsDefaultRef = false - case 21: - t.IsDefaultRef = true - default: - return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) + + if maj != cbg.MajArray { + return fmt.Errorf("expected cbor array") } - // t.LangBreakdown (tangled.GitRefUpdate_Meta_LangBreakdown) (struct) - case "langBreakdown": - { + if extra > 0 { + t.ByEmail = make([]*GitRefUpdate_Meta_CommitCount_ByEmail_Elem, extra) + } + + for i := 0; i < int(extra); i++ { + { + var maj byte + var extra uint64 + var err error + _ = maj + _ = extra + _ = err + + { + + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.ByEmail[i] = new(GitRefUpdate_Meta_CommitCount_ByEmail_Elem) + if err := t.ByEmail[i].UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.ByEmail[i] pointer: %w", err) + } + } - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - t.LangBreakdown = new(GitRefUpdate_Meta_LangBreakdown) - if err := t.LangBreakdown.UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.LangBreakdown pointer: %w", err) } - } + } } default: @@ -1382,7 +1163,7 @@ func (t *GitRefUpdate_Meta) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *GitRefUpdate_Meta_CommitCount) MarshalCBOR(w io.Writer) error { +func (t *GitRefUpdate_Meta_LangBreakdown) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -1391,7 +1172,7 @@ func (t *GitRefUpdate_Meta_CommitCount) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) fieldCount := 1 - if t.ByEmail == nil { + if t.Inputs == nil { fieldCount-- } @@ -1399,28 +1180,28 @@ func (t *GitRefUpdate_Meta_CommitCount) MarshalCBOR(w io.Writer) error { return err } - // t.ByEmail ([]*tangled.GitRefUpdate_Meta_CommitCount_ByEmail_Elem) (slice) - if t.ByEmail != nil { + // t.Inputs ([]*tangled.GitRefUpdate_Pair) (slice) + if t.Inputs != nil { - if len("byEmail") > 1000000 { - return xerrors.Errorf("Value in field \"byEmail\" was too long") + if len("inputs") > 1000000 { + return xerrors.Errorf("Value in field \"inputs\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("byEmail"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("inputs"))); err != nil { return err } - if _, err := cw.WriteString(string("byEmail")); err != nil { + if _, err := cw.WriteString(string("inputs")); err != nil { return err } - if len(t.ByEmail) > 8192 { - return xerrors.Errorf("Slice value in field t.ByEmail was too long") + if len(t.Inputs) > 8192 { + return xerrors.Errorf("Slice value in field t.Inputs was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.ByEmail))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Inputs))); err != nil { return err } - for _, v := range t.ByEmail { + for _, v := range t.Inputs { if err := v.MarshalCBOR(cw); err != nil { return err } @@ -1430,8 +1211,8 @@ func (t *GitRefUpdate_Meta_CommitCount) MarshalCBOR(w io.Writer) error { return nil } -func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { - *t = GitRefUpdate_Meta_CommitCount{} +func (t *GitRefUpdate_Meta_LangBreakdown) UnmarshalCBOR(r io.Reader) (err error) { + *t = GitRefUpdate_Meta_LangBreakdown{} cr := cbg.NewCborReader(r) @@ -1450,12 +1231,12 @@ func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("GitRefUpdate_Meta_CommitCount: map struct too large (%d)", extra) + return fmt.Errorf("GitRefUpdate_Meta_LangBreakdown: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 7) + nameBuf := make([]byte, 6) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -1471,8 +1252,8 @@ func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.ByEmail ([]*tangled.GitRefUpdate_Meta_CommitCount_ByEmail_Elem) (slice) - case "byEmail": + // t.Inputs ([]*tangled.GitRefUpdate_Pair) (slice) + case "inputs": maj, extra, err = cr.ReadHeader() if err != nil { @@ -1480,7 +1261,7 @@ func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { } if extra > 8192 { - return fmt.Errorf("t.ByEmail: array too large (%d)", extra) + return fmt.Errorf("t.Inputs: array too large (%d)", extra) } if maj != cbg.MajArray { @@ -1488,7 +1269,7 @@ func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { } if extra > 0 { - t.ByEmail = make([]*GitRefUpdate_Meta_CommitCount_ByEmail_Elem, extra) + t.Inputs = make([]*GitRefUpdate_Pair, extra) } for i := 0; i < int(extra); i++ { @@ -1510,9 +1291,9 @@ func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { if err := cr.UnreadByte(); err != nil { return err } - t.ByEmail[i] = new(GitRefUpdate_Meta_CommitCount_ByEmail_Elem) - if err := t.ByEmail[i].UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.ByEmail[i] pointer: %w", err) + t.Inputs[i] = new(GitRefUpdate_Pair) + if err := t.Inputs[i].UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.Inputs[i] pointer: %w", err) } } @@ -1531,204 +1312,78 @@ func (t *GitRefUpdate_Meta_CommitCount) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *GitRefUpdate_Meta_CommitCount_ByEmail_Elem) MarshalCBOR(w io.Writer) error { +func (t *GitRefUpdate_Meta) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) + fieldCount := 3 - if _, err := cw.Write([]byte{162}); err != nil { + if t.LangBreakdown == nil { + fieldCount-- + } + + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { return err } - // t.Count (int64) (int64) - if len("count") > 1000000 { - return xerrors.Errorf("Value in field \"count\" was too long") + // t.CommitCount (tangled.GitRefUpdate_Meta_CommitCount) (struct) + if len("commitCount") > 1000000 { + return xerrors.Errorf("Value in field \"commitCount\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("count"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("commitCount"))); err != nil { return err } - if _, err := cw.WriteString(string("count")); err != nil { + if _, err := cw.WriteString(string("commitCount")); err != nil { return err } - if t.Count >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Count)); err != nil { - return err - } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.Count-1)); err != nil { - return err - } - } - - // t.Email (string) (string) - if len("email") > 1000000 { - return xerrors.Errorf("Value in field \"email\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("email"))); err != nil { - return err - } - if _, err := cw.WriteString(string("email")); err != nil { + if err := t.CommitCount.MarshalCBOR(cw); err != nil { return err } - if len(t.Email) > 1000000 { - return xerrors.Errorf("Value in field t.Email was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Email))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Email)); err != nil { - return err + // t.IsDefaultRef (bool) (bool) + if len("isDefaultRef") > 1000000 { + return xerrors.Errorf("Value in field \"isDefaultRef\" was too long") } - return nil -} - -func (t *GitRefUpdate_Meta_CommitCount_ByEmail_Elem) UnmarshalCBOR(r io.Reader) (err error) { - *t = GitRefUpdate_Meta_CommitCount_ByEmail_Elem{} - - cr := cbg.NewCborReader(r) - maj, extra, err := cr.ReadHeader() - if err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("isDefaultRef"))); err != nil { return err } - defer func() { - if err == io.EOF { - err = io.ErrUnexpectedEOF - } - }() - - if maj != cbg.MajMap { - return fmt.Errorf("cbor input should be of type map") - } - - if extra > cbg.MaxLength { - return fmt.Errorf("GitRefUpdate_Meta_CommitCount_ByEmail_Elem: map struct too large (%d)", extra) - } - - n := extra - - nameBuf := make([]byte, 5) - for i := uint64(0); i < n; i++ { - nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) - if err != nil { - return err - } - - if !ok { - // Field doesn't exist on this type, so ignore it - if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { - return err - } - continue - } - - switch string(nameBuf[:nameLen]) { - // t.Count (int64) (int64) - case "count": - { - maj, extra, err := cr.ReadHeader() - if err != nil { - return err - } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") - } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") - } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - - t.Count = int64(extraI) - } - // t.Email (string) (string) - case "email": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Email = string(sval) - } - - default: - // Field doesn't exist on this type, so ignore it - if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { - return err - } - } - } - - return nil -} -func (t *GitRefUpdate_Meta_LangBreakdown) MarshalCBOR(w io.Writer) error { - if t == nil { - _, err := w.Write(cbg.CborNull) + if _, err := cw.WriteString(string("isDefaultRef")); err != nil { return err } - cw := cbg.NewCborWriter(w) - fieldCount := 1 - - if t.Inputs == nil { - fieldCount-- - } - - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + if err := cbg.WriteBool(w, t.IsDefaultRef); err != nil { return err } - // t.Inputs ([]*tangled.GitRefUpdate_Pair) (slice) - if t.Inputs != nil { + // t.LangBreakdown (tangled.GitRefUpdate_Meta_LangBreakdown) (struct) + if t.LangBreakdown != nil { - if len("inputs") > 1000000 { - return xerrors.Errorf("Value in field \"inputs\" was too long") + if len("langBreakdown") > 1000000 { + return xerrors.Errorf("Value in field \"langBreakdown\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("inputs"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("langBreakdown"))); err != nil { return err } - if _, err := cw.WriteString(string("inputs")); err != nil { + if _, err := cw.WriteString(string("langBreakdown")); err != nil { return err } - if len(t.Inputs) > 8192 { - return xerrors.Errorf("Slice value in field t.Inputs was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Inputs))); err != nil { + if err := t.LangBreakdown.MarshalCBOR(cw); err != nil { return err } - for _, v := range t.Inputs { - if err := v.MarshalCBOR(cw); err != nil { - return err - } - - } } return nil } -func (t *GitRefUpdate_Meta_LangBreakdown) UnmarshalCBOR(r io.Reader) (err error) { - *t = GitRefUpdate_Meta_LangBreakdown{} +func (t *GitRefUpdate_Meta) UnmarshalCBOR(r io.Reader) (err error) { + *t = GitRefUpdate_Meta{} cr := cbg.NewCborReader(r) @@ -1747,12 +1402,12 @@ func (t *GitRefUpdate_Meta_LangBreakdown) UnmarshalCBOR(r io.Reader) (err error) } if extra > cbg.MaxLength { - return fmt.Errorf("GitRefUpdate_Meta_LangBreakdown: map struct too large (%d)", extra) + return fmt.Errorf("GitRefUpdate_Meta: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 6) + nameBuf := make([]byte, 13) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -1768,54 +1423,63 @@ func (t *GitRefUpdate_Meta_LangBreakdown) UnmarshalCBOR(r io.Reader) (err error) } switch string(nameBuf[:nameLen]) { - // t.Inputs ([]*tangled.GitRefUpdate_Pair) (slice) - case "inputs": + // t.CommitCount (tangled.GitRefUpdate_Meta_CommitCount) (struct) + case "commitCount": + + { + + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.CommitCount = new(GitRefUpdate_Meta_CommitCount) + if err := t.CommitCount.UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.CommitCount pointer: %w", err) + } + } + + } + // t.IsDefaultRef (bool) (bool) + case "isDefaultRef": maj, extra, err = cr.ReadHeader() if err != nil { return err } - - if extra > 8192 { - return fmt.Errorf("t.Inputs: array too large (%d)", extra) - } - - if maj != cbg.MajArray { - return fmt.Errorf("expected cbor array") + if maj != cbg.MajOther { + return fmt.Errorf("booleans must be major type 7") } - - if extra > 0 { - t.Inputs = make([]*GitRefUpdate_Pair, extra) + switch extra { + case 20: + t.IsDefaultRef = false + case 21: + t.IsDefaultRef = true + default: + return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) } + // t.LangBreakdown (tangled.GitRefUpdate_Meta_LangBreakdown) (struct) + case "langBreakdown": - for i := 0; i < int(extra); i++ { - { - var maj byte - var extra uint64 - var err error - _ = maj - _ = extra - _ = err - - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - t.Inputs[i] = new(GitRefUpdate_Pair) - if err := t.Inputs[i].UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.Inputs[i] pointer: %w", err) - } - } + { + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.LangBreakdown = new(GitRefUpdate_Meta_LangBreakdown) + if err := t.LangBreakdown.UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.LangBreakdown pointer: %w", err) } - } + } default: @@ -1977,7 +1641,7 @@ func (t *GitRefUpdate_Pair) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *GraphFollow) MarshalCBOR(w io.Writer) error { +func (t *GitRefUpdate) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -1985,7 +1649,46 @@ func (t *GraphFollow) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{163}); err != nil { + if _, err := cw.Write([]byte{168}); err != nil { + return err + } + + // t.Ref (string) (string) + if len("ref") > 1000000 { + return xerrors.Errorf("Value in field \"ref\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ref"))); err != nil { + return err + } + if _, err := cw.WriteString(string("ref")); err != nil { + return err + } + + if len(t.Ref) > 1000000 { + return xerrors.Errorf("Value in field t.Ref was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Ref))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Ref)); err != nil { + return err + } + + // t.Meta (tangled.GitRefUpdate_Meta) (struct) + if len("meta") > 1000000 { + return xerrors.Errorf("Value in field \"meta\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("meta"))); err != nil { + return err + } + if _, err := cw.WriteString(string("meta")); err != nil { + return err + } + + if err := t.Meta.MarshalCBOR(cw); err != nil { return err } @@ -2001,63 +1704,132 @@ func (t *GraphFollow) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.graph.follow"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.git.refUpdate"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.graph.follow")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.git.refUpdate")); err != nil { return err } - // t.Subject (string) (string) - if len("subject") > 1000000 { - return xerrors.Errorf("Value in field \"subject\" was too long") + // t.NewSha (string) (string) + if len("newSha") > 1000000 { + return xerrors.Errorf("Value in field \"newSha\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("newSha"))); err != nil { return err } - if _, err := cw.WriteString(string("subject")); err != nil { + if _, err := cw.WriteString(string("newSha")); err != nil { return err } - if len(t.Subject) > 1000000 { - return xerrors.Errorf("Value in field t.Subject was too long") + if len(t.NewSha) > 1000000 { + return xerrors.Errorf("Value in field t.NewSha was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.NewSha))); err != nil { return err } - if _, err := cw.WriteString(string(t.Subject)); err != nil { + if _, err := cw.WriteString(string(t.NewSha)); err != nil { return err } - // t.CreatedAt (string) (string) - if len("createdAt") > 1000000 { - return xerrors.Errorf("Value in field \"createdAt\" was too long") + // t.OldSha (string) (string) + if len("oldSha") > 1000000 { + return xerrors.Errorf("Value in field \"oldSha\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("oldSha"))); err != nil { return err } - if _, err := cw.WriteString(string("createdAt")); err != nil { + if _, err := cw.WriteString(string("oldSha")); err != nil { return err } - if len(t.CreatedAt) > 1000000 { - return xerrors.Errorf("Value in field t.CreatedAt was too long") + if len(t.OldSha) > 1000000 { + return xerrors.Errorf("Value in field t.OldSha was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.OldSha))); err != nil { return err } - if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + if _, err := cw.WriteString(string(t.OldSha)); err != nil { + return err + } + + // t.RepoDid (string) (string) + if len("repoDid") > 1000000 { + return xerrors.Errorf("Value in field \"repoDid\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repoDid"))); err != nil { + return err + } + if _, err := cw.WriteString(string("repoDid")); err != nil { + return err + } + + if len(t.RepoDid) > 1000000 { + return xerrors.Errorf("Value in field t.RepoDid was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RepoDid))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.RepoDid)); err != nil { + return err + } + + // t.RepoName (string) (string) + if len("repoName") > 1000000 { + return xerrors.Errorf("Value in field \"repoName\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repoName"))); err != nil { + return err + } + if _, err := cw.WriteString(string("repoName")); err != nil { + return err + } + + if len(t.RepoName) > 1000000 { + return xerrors.Errorf("Value in field t.RepoName was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RepoName))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.RepoName)); err != nil { + return err + } + + // t.CommitterDid (string) (string) + if len("committerDid") > 1000000 { + return xerrors.Errorf("Value in field \"committerDid\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("committerDid"))); err != nil { + return err + } + if _, err := cw.WriteString(string("committerDid")); err != nil { + return err + } + + if len(t.CommitterDid) > 1000000 { + return xerrors.Errorf("Value in field t.CommitterDid was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CommitterDid))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.CommitterDid)); err != nil { return err } return nil } -func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { - *t = GraphFollow{} +func (t *GitRefUpdate) UnmarshalCBOR(r io.Reader) (err error) { + *t = GitRefUpdate{} cr := cbg.NewCborReader(r) @@ -2076,12 +1848,12 @@ func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("GraphFollow: map struct too large (%d)", extra) + return fmt.Errorf("GitRefUpdate: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 9) + nameBuf := make([]byte, 12) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2097,7 +1869,38 @@ func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.LexiconTypeID (string) (string) + // t.Ref (string) (string) + case "ref": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Ref = string(sval) + } + // t.Meta (tangled.GitRefUpdate_Meta) (struct) + case "meta": + + { + + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.Meta = new(GitRefUpdate_Meta) + if err := t.Meta.UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.Meta pointer: %w", err) + } + } + + } + // t.LexiconTypeID (string) (string) case "$type": { @@ -2108,8 +1911,8 @@ func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Subject (string) (string) - case "subject": + // t.NewSha (string) (string) + case "newSha": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -2117,10 +1920,10 @@ func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Subject = string(sval) + t.NewSha = string(sval) } - // t.CreatedAt (string) (string) - case "createdAt": + // t.OldSha (string) (string) + case "oldSha": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -2128,7 +1931,40 @@ func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.CreatedAt = string(sval) + t.OldSha = string(sval) + } + // t.RepoDid (string) (string) + case "repoDid": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.RepoDid = string(sval) + } + // t.RepoName (string) (string) + case "repoName": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.RepoName = string(sval) + } + // t.CommitterDid (string) (string) + case "committerDid": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.CommitterDid = string(sval) } default: @@ -2141,7 +1977,7 @@ func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *KnotMember) MarshalCBOR(w io.Writer) error { +func (t *GraphFollow) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -2149,7 +1985,7 @@ func (t *KnotMember) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{164}); err != nil { + if _, err := cw.Write([]byte{163}); err != nil { return err } @@ -2165,50 +2001,27 @@ func (t *KnotMember) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.knot.member"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.graph.follow"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.knot.member")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.graph.follow")); err != nil { return err } - // t.Domain (string) (string) - if len("domain") > 1000000 { - return xerrors.Errorf("Value in field \"domain\" was too long") + // t.Subject (string) (string) + if len("subject") > 1000000 { + return xerrors.Errorf("Value in field \"subject\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("domain"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { return err } - if _, err := cw.WriteString(string("domain")); err != nil { + if _, err := cw.WriteString(string("subject")); err != nil { return err } - if len(t.Domain) > 1000000 { - return xerrors.Errorf("Value in field t.Domain was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Domain))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Domain)); err != nil { - return err - } - - // t.Subject (string) (string) - if len("subject") > 1000000 { - return xerrors.Errorf("Value in field \"subject\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { - return err - } - if _, err := cw.WriteString(string("subject")); err != nil { - return err - } - - if len(t.Subject) > 1000000 { - return xerrors.Errorf("Value in field t.Subject was too long") + if len(t.Subject) > 1000000 { + return xerrors.Errorf("Value in field t.Subject was too long") } if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil { @@ -2243,8 +2056,8 @@ func (t *KnotMember) MarshalCBOR(w io.Writer) error { return nil } -func (t *KnotMember) UnmarshalCBOR(r io.Reader) (err error) { - *t = KnotMember{} +func (t *GraphFollow) UnmarshalCBOR(r io.Reader) (err error) { + *t = GraphFollow{} cr := cbg.NewCborReader(r) @@ -2263,7 +2076,7 @@ func (t *KnotMember) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("KnotMember: map struct too large (%d)", extra) + return fmt.Errorf("GraphFollow: map struct too large (%d)", extra) } n := extra @@ -2295,17 +2108,6 @@ func (t *KnotMember) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Domain (string) (string) - case "domain": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Domain = string(sval) - } // t.Subject (string) (string) case "subject": @@ -2339,7 +2141,7 @@ func (t *KnotMember) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Pipeline) MarshalCBOR(w io.Writer) error { +func (t *KnotMember) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -2347,7 +2149,7 @@ func (t *Pipeline) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{163}); err != nil { + if _, err := cw.Write([]byte{164}); err != nil { return err } @@ -2363,59 +2165,86 @@ func (t *Pipeline) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.pipeline"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.knot.member"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.pipeline")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.knot.member")); err != nil { return err } - // t.Workflows ([]*tangled.Pipeline_Workflow) (slice) - if len("workflows") > 1000000 { - return xerrors.Errorf("Value in field \"workflows\" was too long") + // t.Domain (string) (string) + if len("domain") > 1000000 { + return xerrors.Errorf("Value in field \"domain\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("workflows"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("domain"))); err != nil { return err } - if _, err := cw.WriteString(string("workflows")); err != nil { + if _, err := cw.WriteString(string("domain")); err != nil { return err } - if len(t.Workflows) > 8192 { - return xerrors.Errorf("Slice value in field t.Workflows was too long") + if len(t.Domain) > 1000000 { + return xerrors.Errorf("Value in field t.Domain was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Workflows))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Domain))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Domain)); err != nil { return err } - for _, v := range t.Workflows { - if err := v.MarshalCBOR(cw); err != nil { - return err - } + // t.Subject (string) (string) + if len("subject") > 1000000 { + return xerrors.Errorf("Value in field \"subject\" was too long") } - // t.TriggerMetadata (tangled.Pipeline_TriggerMetadata) (struct) - if len("triggerMetadata") > 1000000 { - return xerrors.Errorf("Value in field \"triggerMetadata\" was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { + return err + } + if _, err := cw.WriteString(string("subject")); err != nil { + return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("triggerMetadata"))); err != nil { + if len(t.Subject) > 1000000 { + return xerrors.Errorf("Value in field t.Subject was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil { return err } - if _, err := cw.WriteString(string("triggerMetadata")); err != nil { + if _, err := cw.WriteString(string(t.Subject)); err != nil { return err } - if err := t.TriggerMetadata.MarshalCBOR(cw); err != nil { + // t.CreatedAt (string) (string) + if len("createdAt") > 1000000 { + return xerrors.Errorf("Value in field \"createdAt\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + return err + } + if _, err := cw.WriteString(string("createdAt")); err != nil { + return err + } + + if len(t.CreatedAt) > 1000000 { + return xerrors.Errorf("Value in field t.CreatedAt was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { return err } return nil } -func (t *Pipeline) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline{} +func (t *KnotMember) UnmarshalCBOR(r io.Reader) (err error) { + *t = KnotMember{} cr := cbg.NewCborReader(r) @@ -2434,12 +2263,12 @@ func (t *Pipeline) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline: map struct too large (%d)", extra) + return fmt.Errorf("KnotMember: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 15) + nameBuf := make([]byte, 9) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2466,74 +2295,38 @@ func (t *Pipeline) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Workflows ([]*tangled.Pipeline_Workflow) (slice) - case "workflows": - - maj, extra, err = cr.ReadHeader() - if err != nil { - return err - } - - if extra > 8192 { - return fmt.Errorf("t.Workflows: array too large (%d)", extra) - } + // t.Domain (string) (string) + case "domain": - if maj != cbg.MajArray { - return fmt.Errorf("expected cbor array") - } + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } - if extra > 0 { - t.Workflows = make([]*Pipeline_Workflow, extra) + t.Domain = string(sval) } + // t.Subject (string) (string) + case "subject": - for i := 0; i < int(extra); i++ { - { - var maj byte - var extra uint64 - var err error - _ = maj - _ = extra - _ = err - - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - t.Workflows[i] = new(Pipeline_Workflow) - if err := t.Workflows[i].UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.Workflows[i] pointer: %w", err) - } - } - - } - + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err } + + t.Subject = string(sval) } - // t.TriggerMetadata (tangled.Pipeline_TriggerMetadata) (struct) - case "triggerMetadata": + // t.CreatedAt (string) (string) + case "createdAt": { - - 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 - } - t.TriggerMetadata = new(Pipeline_TriggerMetadata) - if err := t.TriggerMetadata.UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.TriggerMetadata pointer: %w", err) - } - } + t.CreatedAt = string(sval) } default: @@ -2546,7 +2339,7 @@ func (t *Pipeline) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Pipeline_CloneOpts) MarshalCBOR(w io.Writer) error { +func (t *Knot) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -2554,68 +2347,56 @@ func (t *Pipeline_CloneOpts) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{163}); err != nil { + if _, err := cw.Write([]byte{162}); err != nil { return err } - // t.Skip (bool) (bool) - if len("skip") > 1000000 { - return xerrors.Errorf("Value in field \"skip\" was too long") + // t.LexiconTypeID (string) (string) + if len("$type") > 1000000 { + return xerrors.Errorf("Value in field \"$type\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("skip"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { return err } - if _, err := cw.WriteString(string("skip")); err != nil { + if _, err := cw.WriteString(string("$type")); err != nil { return err } - if err := cbg.WriteBool(w, t.Skip); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.knot"))); err != nil { + return err + } + if _, err := cw.WriteString(string("sh.tangled.knot")); err != nil { return err } - // t.Depth (int64) (int64) - if len("depth") > 1000000 { - return xerrors.Errorf("Value in field \"depth\" was too long") + // t.CreatedAt (string) (string) + if len("createdAt") > 1000000 { + return xerrors.Errorf("Value in field \"createdAt\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("depth"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { return err } - if _, err := cw.WriteString(string("depth")); err != nil { + if _, err := cw.WriteString(string("createdAt")); err != nil { return err } - if t.Depth >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Depth)); err != nil { - return err - } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.Depth-1)); err != nil { - return err - } - } - - // t.Submodules (bool) (bool) - if len("submodules") > 1000000 { - return xerrors.Errorf("Value in field \"submodules\" was too long") + if len(t.CreatedAt) > 1000000 { + return xerrors.Errorf("Value in field t.CreatedAt was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("submodules"))); err != nil { - return err - } - if _, err := cw.WriteString(string("submodules")); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { return err } - - if err := cbg.WriteBool(w, t.Submodules); err != nil { + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { return err } return nil } -func (t *Pipeline_CloneOpts) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline_CloneOpts{} +func (t *Knot) UnmarshalCBOR(r io.Reader) (err error) { + *t = Knot{} cr := cbg.NewCborReader(r) @@ -2634,12 +2415,12 @@ func (t *Pipeline_CloneOpts) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline_CloneOpts: map struct too large (%d)", extra) + return fmt.Errorf("Knot: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 10) + nameBuf := make([]byte, 9) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2655,67 +2436,27 @@ func (t *Pipeline_CloneOpts) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Skip (bool) (bool) - case "skip": + // t.LexiconTypeID (string) (string) + case "$type": - maj, extra, err = cr.ReadHeader() - if err != nil { - return err - } - if maj != cbg.MajOther { - return fmt.Errorf("booleans must be major type 7") - } - switch extra { - case 20: - t.Skip = false - case 21: - t.Skip = true - default: - return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) - } - // t.Depth (int64) (int64) - case "depth": { - maj, extra, err := cr.ReadHeader() + sval, err := cbg.ReadStringWithMax(cr, 1000000) if err != nil { return err } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") - } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") - } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - t.Depth = int64(extraI) + t.LexiconTypeID = string(sval) } - // t.Submodules (bool) (bool) - case "submodules": + // t.CreatedAt (string) (string) + case "createdAt": - maj, extra, err = cr.ReadHeader() - if err != nil { - return err - } - if maj != cbg.MajOther { - return fmt.Errorf("booleans must be major type 7") - } - switch extra { - case 20: - t.Submodules = false - case 21: - t.Submodules = true - default: - return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.CreatedAt = string(sval) } default: @@ -2728,78 +2469,206 @@ func (t *Pipeline_CloneOpts) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Pipeline_Dependency) MarshalCBOR(w io.Writer) error { +func (t *PipelineStatus) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) + fieldCount := 7 - if _, err := cw.Write([]byte{162}); err != nil { + if t.Error == nil { + fieldCount-- + } + + if t.ExitCode == nil { + fieldCount-- + } + + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { return err } - // t.Packages ([]string) (slice) - if len("packages") > 1000000 { - return xerrors.Errorf("Value in field \"packages\" was too long") + // t.LexiconTypeID (string) (string) + if len("$type") > 1000000 { + return xerrors.Errorf("Value in field \"$type\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("packages"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { return err } - if _, err := cw.WriteString(string("packages")); err != nil { + if _, err := cw.WriteString(string("$type")); err != nil { return err } - if len(t.Packages) > 8192 { - return xerrors.Errorf("Slice value in field t.Packages was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.pipeline.status"))); err != nil { + return err + } + if _, err := cw.WriteString(string("sh.tangled.pipeline.status")); err != nil { + return err } - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Packages))); err != nil { + // t.Error (string) (string) + if t.Error != nil { + + if len("error") > 1000000 { + return xerrors.Errorf("Value in field \"error\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("error"))); err != nil { + return err + } + if _, err := cw.WriteString(string("error")); err != nil { + return err + } + + if t.Error == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Error) > 1000000 { + return xerrors.Errorf("Value in field t.Error was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Error))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Error)); err != nil { + return err + } + } + } + + // t.Status (string) (string) + if len("status") > 1000000 { + return xerrors.Errorf("Value in field \"status\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("status"))); err != nil { return err } - for _, v := range t.Packages { - if len(v) > 1000000 { - return xerrors.Errorf("Value in field v was too long") + if _, err := cw.WriteString(string("status")); err != nil { + return err + } + + if len(t.Status) > 1000000 { + return xerrors.Errorf("Value in field t.Status was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Status))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Status)); err != nil { + return err + } + + // t.ExitCode (int64) (int64) + if t.ExitCode != nil { + + if len("exitCode") > 1000000 { + return xerrors.Errorf("Value in field \"exitCode\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("exitCode"))); err != nil { return err } - if _, err := cw.WriteString(string(v)); err != nil { + if _, err := cw.WriteString(string("exitCode")); err != nil { return err } + if t.ExitCode == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if *t.ExitCode >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(*t.ExitCode)); err != nil { + return err + } + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-*t.ExitCode-1)); err != nil { + return err + } + } + } + } - // t.Registry (string) (string) - if len("registry") > 1000000 { - return xerrors.Errorf("Value in field \"registry\" was too long") + // t.Pipeline (string) (string) + if len("pipeline") > 1000000 { + return xerrors.Errorf("Value in field \"pipeline\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("registry"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pipeline"))); err != nil { return err } - if _, err := cw.WriteString(string("registry")); err != nil { + if _, err := cw.WriteString(string("pipeline")); err != nil { return err } - if len(t.Registry) > 1000000 { - return xerrors.Errorf("Value in field t.Registry was too long") + if len(t.Pipeline) > 1000000 { + return xerrors.Errorf("Value in field t.Pipeline was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Registry))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Pipeline))); err != nil { return err } - if _, err := cw.WriteString(string(t.Registry)); err != nil { + if _, err := cw.WriteString(string(t.Pipeline)); err != nil { + return err + } + + // t.Workflow (string) (string) + if len("workflow") > 1000000 { + return xerrors.Errorf("Value in field \"workflow\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("workflow"))); err != nil { + return err + } + if _, err := cw.WriteString(string("workflow")); err != nil { + return err + } + + if len(t.Workflow) > 1000000 { + return xerrors.Errorf("Value in field t.Workflow was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Workflow))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Workflow)); err != nil { + return err + } + + // t.CreatedAt (string) (string) + if len("createdAt") > 1000000 { + return xerrors.Errorf("Value in field \"createdAt\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + return err + } + if _, err := cw.WriteString(string("createdAt")); err != nil { + return err + } + + if len(t.CreatedAt) > 1000000 { + return xerrors.Errorf("Value in field t.CreatedAt was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { return err } return nil } -func (t *Pipeline_Dependency) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline_Dependency{} +func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { + *t = PipelineStatus{} cr := cbg.NewCborReader(r) @@ -2818,12 +2687,12 @@ func (t *Pipeline_Dependency) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline_Dependency: map struct too large (%d)", extra) + return fmt.Errorf("PipelineStatus: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 8) + nameBuf := make([]byte, 9) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2839,48 +2708,98 @@ func (t *Pipeline_Dependency) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Packages ([]string) (slice) - case "packages": + // t.LexiconTypeID (string) (string) + case "$type": - maj, extra, err = cr.ReadHeader() - if err != nil { - return err - } + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } - if extra > 8192 { - return fmt.Errorf("t.Packages: array too large (%d)", extra) + t.LexiconTypeID = string(sval) } + // t.Error (string) (string) + case "error": - if maj != cbg.MajArray { - return fmt.Errorf("expected cbor array") - } + { + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } - if extra > 0 { - t.Packages = make([]string, extra) + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Error = (*string)(&sval) + } } + // t.Status (string) (string) + case "status": - for i := 0; i < int(extra); i++ { - { - var maj byte - var extra uint64 - var err error - _ = maj - _ = extra - _ = err + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + t.Status = string(sval) + } + // t.ExitCode (int64) (int64) + case "exitCode": + { - t.Packages[i] = string(sval) + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") + } + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") + } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) } + t.ExitCode = (*int64)(&extraI) + } + } + // t.Pipeline (string) (string) + case "pipeline": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err } + + t.Pipeline = string(sval) } - // t.Registry (string) (string) - case "registry": + // t.Workflow (string) (string) + case "workflow": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -2888,7 +2807,18 @@ func (t *Pipeline_Dependency) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Registry = string(sval) + t.Workflow = string(sval) + } + // t.CreatedAt (string) (string) + case "createdAt": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.CreatedAt = string(sval) } default: @@ -2901,56 +2831,76 @@ func (t *Pipeline_Dependency) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Pipeline_ManualTriggerData) MarshalCBOR(w io.Writer) error { +func (t *Pipeline_CloneOpts) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 1 - if t.Inputs == nil { - fieldCount-- + if _, err := cw.Write([]byte{163}); err != nil { + return err } - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + // t.Skip (bool) (bool) + if len("skip") > 1000000 { + return xerrors.Errorf("Value in field \"skip\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("skip"))); err != nil { + return err + } + if _, err := cw.WriteString(string("skip")); err != nil { return err } - // t.Inputs ([]*tangled.Pipeline_Pair) (slice) - if t.Inputs != nil { + if err := cbg.WriteBool(w, t.Skip); err != nil { + return err + } - if len("inputs") > 1000000 { - return xerrors.Errorf("Value in field \"inputs\" was too long") - } + // t.Depth (int64) (int64) + if len("depth") > 1000000 { + return xerrors.Errorf("Value in field \"depth\" was too long") + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("inputs"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("depth"))); err != nil { + return err + } + if _, err := cw.WriteString(string("depth")); err != nil { + return err + } + + if t.Depth >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Depth)); err != nil { return err } - if _, err := cw.WriteString(string("inputs")); err != nil { + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.Depth-1)); err != nil { return err } + } - if len(t.Inputs) > 8192 { - return xerrors.Errorf("Slice value in field t.Inputs was too long") - } + // t.Submodules (bool) (bool) + if len("submodules") > 1000000 { + return xerrors.Errorf("Value in field \"submodules\" was too long") + } - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Inputs))); err != nil { - return err - } - for _, v := range t.Inputs { - if err := v.MarshalCBOR(cw); err != nil { - return err - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("submodules"))); err != nil { + return err + } + if _, err := cw.WriteString(string("submodules")); err != nil { + return err + } - } + if err := cbg.WriteBool(w, t.Submodules); err != nil { + return err } return nil } -func (t *Pipeline_ManualTriggerData) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline_ManualTriggerData{} +func (t *Pipeline_CloneOpts) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline_CloneOpts{} cr := cbg.NewCborReader(r) @@ -2969,12 +2919,12 @@ func (t *Pipeline_ManualTriggerData) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline_ManualTriggerData: map struct too large (%d)", extra) + return fmt.Errorf("Pipeline_CloneOpts: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 6) + nameBuf := make([]byte, 10) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2990,67 +2940,80 @@ func (t *Pipeline_ManualTriggerData) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Inputs ([]*tangled.Pipeline_Pair) (slice) - case "inputs": + // t.Skip (bool) (bool) + case "skip": maj, extra, err = cr.ReadHeader() if err != nil { return err } + if maj != cbg.MajOther { + return fmt.Errorf("booleans must be major type 7") + } + switch extra { + case 20: + t.Skip = false + case 21: + t.Skip = true + default: + return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) + } + // t.Depth (int64) (int64) + case "depth": + { + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") + } + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") + } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) + } - if extra > 8192 { - return fmt.Errorf("t.Inputs: array too large (%d)", extra) + t.Depth = int64(extraI) } + // t.Submodules (bool) (bool) + case "submodules": - if maj != cbg.MajArray { - return fmt.Errorf("expected cbor array") + maj, extra, err = cr.ReadHeader() + if err != nil { + return err + } + if maj != cbg.MajOther { + return fmt.Errorf("booleans must be major type 7") + } + switch extra { + case 20: + t.Submodules = false + case 21: + t.Submodules = true + default: + return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) } - if extra > 0 { - t.Inputs = make([]*Pipeline_Pair, extra) + default: + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { + return err } - - for i := 0; i < int(extra); i++ { - { - var maj byte - var extra uint64 - var err error - _ = maj - _ = extra - _ = err - - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - t.Inputs[i] = new(Pipeline_Pair) - if err := t.Inputs[i].UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.Inputs[i] pointer: %w", err) - } - } - - } - - } - } - - default: - // Field doesn't exist on this type, so ignore it - if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { - return err - } - } - } + } + } return nil } -func (t *Pipeline_Pair) MarshalCBOR(w io.Writer) error { +func (t *Pipeline_Dependency) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -3062,56 +3025,66 @@ func (t *Pipeline_Pair) MarshalCBOR(w io.Writer) error { return err } - // t.Key (string) (string) - if len("key") > 1000000 { - return xerrors.Errorf("Value in field \"key\" was too long") + // t.Packages ([]string) (slice) + if len("packages") > 1000000 { + return xerrors.Errorf("Value in field \"packages\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("key"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("packages"))); err != nil { return err } - if _, err := cw.WriteString(string("key")); err != nil { + if _, err := cw.WriteString(string("packages")); err != nil { return err } - if len(t.Key) > 1000000 { - return xerrors.Errorf("Value in field t.Key was too long") + if len(t.Packages) > 8192 { + return xerrors.Errorf("Slice value in field t.Packages was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Packages))); err != nil { return err } - if _, err := cw.WriteString(string(t.Key)); err != nil { - return err + for _, v := range t.Packages { + if len(v) > 1000000 { + return xerrors.Errorf("Value in field v was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { + return err + } + if _, err := cw.WriteString(string(v)); err != nil { + return err + } + } - // t.Value (string) (string) - if len("value") > 1000000 { - return xerrors.Errorf("Value in field \"value\" was too long") + // t.Registry (string) (string) + if len("registry") > 1000000 { + return xerrors.Errorf("Value in field \"registry\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("value"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("registry"))); err != nil { return err } - if _, err := cw.WriteString(string("value")); err != nil { + if _, err := cw.WriteString(string("registry")); err != nil { return err } - if len(t.Value) > 1000000 { - return xerrors.Errorf("Value in field t.Value was too long") + if len(t.Registry) > 1000000 { + return xerrors.Errorf("Value in field t.Registry was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Registry))); err != nil { return err } - if _, err := cw.WriteString(string(t.Value)); err != nil { + if _, err := cw.WriteString(string(t.Registry)); err != nil { return err } return nil } -func (t *Pipeline_Pair) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline_Pair{} +func (t *Pipeline_Dependency) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline_Dependency{} cr := cbg.NewCborReader(r) @@ -3130,12 +3103,12 @@ func (t *Pipeline_Pair) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline_Pair: map struct too large (%d)", extra) + return fmt.Errorf("Pipeline_Dependency: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 5) + nameBuf := make([]byte, 8) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -3151,19 +3124,48 @@ func (t *Pipeline_Pair) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Key (string) (string) - case "key": + // t.Packages ([]string) (slice) + case "packages": - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + maj, extra, err = cr.ReadHeader() + if err != nil { + return err + } - t.Key = string(sval) + if extra > 8192 { + return fmt.Errorf("t.Packages: array too large (%d)", extra) } - // t.Value (string) (string) - case "value": + + if maj != cbg.MajArray { + return fmt.Errorf("expected cbor array") + } + + if extra > 0 { + t.Packages = make([]string, extra) + } + + for i := 0; i < int(extra); i++ { + { + var maj byte + var extra uint64 + var err error + _ = maj + _ = extra + _ = err + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Packages[i] = string(sval) + } + + } + } + // t.Registry (string) (string) + case "registry": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3171,7 +3173,7 @@ func (t *Pipeline_Pair) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Value = string(sval) + t.Registry = string(sval) } default: @@ -3184,114 +3186,56 @@ func (t *Pipeline_Pair) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Pipeline_PullRequestTriggerData) MarshalCBOR(w io.Writer) error { +func (t *Pipeline_ManualTriggerData) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) + fieldCount := 1 - if _, err := cw.Write([]byte{164}); err != nil { - return err - } - - // t.Action (string) (string) - if len("action") > 1000000 { - return xerrors.Errorf("Value in field \"action\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("action"))); err != nil { - return err - } - if _, err := cw.WriteString(string("action")); err != nil { - return err - } - - if len(t.Action) > 1000000 { - return xerrors.Errorf("Value in field t.Action was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Action))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Action)); err != nil { - return err - } - - // t.SourceSha (string) (string) - if len("sourceSha") > 1000000 { - return xerrors.Errorf("Value in field \"sourceSha\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sourceSha"))); err != nil { - return err - } - if _, err := cw.WriteString(string("sourceSha")); err != nil { - return err - } - - if len(t.SourceSha) > 1000000 { - return xerrors.Errorf("Value in field t.SourceSha was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.SourceSha))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.SourceSha)); err != nil { - return err - } - - // t.SourceBranch (string) (string) - if len("sourceBranch") > 1000000 { - return xerrors.Errorf("Value in field \"sourceBranch\" was too long") + if t.Inputs == nil { + fieldCount-- } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sourceBranch"))); err != nil { - return err - } - if _, err := cw.WriteString(string("sourceBranch")); err != nil { + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { return err } - if len(t.SourceBranch) > 1000000 { - return xerrors.Errorf("Value in field t.SourceBranch was too long") - } + // t.Inputs ([]*tangled.Pipeline_Pair) (slice) + if t.Inputs != nil { - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.SourceBranch))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.SourceBranch)); err != nil { - return err - } + if len("inputs") > 1000000 { + return xerrors.Errorf("Value in field \"inputs\" was too long") + } - // t.TargetBranch (string) (string) - if len("targetBranch") > 1000000 { - return xerrors.Errorf("Value in field \"targetBranch\" was too long") - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("inputs"))); err != nil { + return err + } + if _, err := cw.WriteString(string("inputs")); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("targetBranch"))); err != nil { - return err - } - if _, err := cw.WriteString(string("targetBranch")); err != nil { - return err - } + if len(t.Inputs) > 8192 { + return xerrors.Errorf("Slice value in field t.Inputs was too long") + } - if len(t.TargetBranch) > 1000000 { - return xerrors.Errorf("Value in field t.TargetBranch was too long") - } + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Inputs))); err != nil { + return err + } + for _, v := range t.Inputs { + if err := v.MarshalCBOR(cw); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.TargetBranch))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.TargetBranch)); err != nil { - return err + } } return nil } -func (t *Pipeline_PullRequestTriggerData) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline_PullRequestTriggerData{} +func (t *Pipeline_ManualTriggerData) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline_ManualTriggerData{} cr := cbg.NewCborReader(r) @@ -3310,12 +3254,12 @@ func (t *Pipeline_PullRequestTriggerData) UnmarshalCBOR(r io.Reader) (err error) } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline_PullRequestTriggerData: map struct too large (%d)", extra) + return fmt.Errorf("Pipeline_ManualTriggerData: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 12) + nameBuf := make([]byte, 6) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -3331,49 +3275,54 @@ func (t *Pipeline_PullRequestTriggerData) UnmarshalCBOR(r io.Reader) (err error) } switch string(nameBuf[:nameLen]) { - // t.Action (string) (string) - case "action": + // t.Inputs ([]*tangled.Pipeline_Pair) (slice) + case "inputs": - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + maj, extra, err = cr.ReadHeader() + if err != nil { + return err + } - t.Action = string(sval) + if extra > 8192 { + return fmt.Errorf("t.Inputs: array too large (%d)", extra) } - // t.SourceSha (string) (string) - case "sourceSha": - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + if maj != cbg.MajArray { + return fmt.Errorf("expected cbor array") + } - t.SourceSha = string(sval) + if extra > 0 { + t.Inputs = make([]*Pipeline_Pair, extra) } - // t.SourceBranch (string) (string) - case "sourceBranch": - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + for i := 0; i < int(extra); i++ { + { + var maj byte + var extra uint64 + var err error + _ = maj + _ = extra + _ = err - t.SourceBranch = string(sval) - } - // t.TargetBranch (string) (string) - case "targetBranch": + { - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.Inputs[i] = new(Pipeline_Pair) + if err := t.Inputs[i].UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.Inputs[i] pointer: %w", err) + } + } - t.TargetBranch = string(sval) + } + + } } default: @@ -3386,7 +3335,7 @@ func (t *Pipeline_PullRequestTriggerData) UnmarshalCBOR(r io.Reader) (err error) return nil } -func (t *Pipeline_PushTriggerData) MarshalCBOR(w io.Writer) error { +func (t *Pipeline_Pair) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -3394,83 +3343,60 @@ func (t *Pipeline_PushTriggerData) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{163}); err != nil { - return err - } - - // t.Ref (string) (string) - if len("ref") > 1000000 { - return xerrors.Errorf("Value in field \"ref\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ref"))); err != nil { - return err - } - if _, err := cw.WriteString(string("ref")); err != nil { - return err - } - - if len(t.Ref) > 1000000 { - return xerrors.Errorf("Value in field t.Ref was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Ref))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Ref)); err != nil { + if _, err := cw.Write([]byte{162}); err != nil { return err } - // t.NewSha (string) (string) - if len("newSha") > 1000000 { - return xerrors.Errorf("Value in field \"newSha\" was too long") + // t.Key (string) (string) + if len("key") > 1000000 { + return xerrors.Errorf("Value in field \"key\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("newSha"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("key"))); err != nil { return err } - if _, err := cw.WriteString(string("newSha")); err != nil { + if _, err := cw.WriteString(string("key")); err != nil { return err } - if len(t.NewSha) > 1000000 { - return xerrors.Errorf("Value in field t.NewSha was too long") + if len(t.Key) > 1000000 { + return xerrors.Errorf("Value in field t.Key was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.NewSha))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil { return err } - if _, err := cw.WriteString(string(t.NewSha)); err != nil { + if _, err := cw.WriteString(string(t.Key)); err != nil { return err } - // t.OldSha (string) (string) - if len("oldSha") > 1000000 { - return xerrors.Errorf("Value in field \"oldSha\" was too long") + // t.Value (string) (string) + if len("value") > 1000000 { + return xerrors.Errorf("Value in field \"value\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("oldSha"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("value"))); err != nil { return err } - if _, err := cw.WriteString(string("oldSha")); err != nil { + if _, err := cw.WriteString(string("value")); err != nil { return err } - if len(t.OldSha) > 1000000 { - return xerrors.Errorf("Value in field t.OldSha was too long") + if len(t.Value) > 1000000 { + return xerrors.Errorf("Value in field t.Value was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.OldSha))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil { return err } - if _, err := cw.WriteString(string(t.OldSha)); err != nil { + if _, err := cw.WriteString(string(t.Value)); err != nil { return err } return nil } -func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { - *t = Pipeline_PushTriggerData{} +func (t *Pipeline_Pair) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline_Pair{} cr := cbg.NewCborReader(r) @@ -3489,12 +3415,12 @@ func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Pipeline_PushTriggerData: map struct too large (%d)", extra) + return fmt.Errorf("Pipeline_Pair: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 6) + nameBuf := make([]byte, 5) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -3510,19 +3436,8 @@ func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Ref (string) (string) - case "ref": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Ref = string(sval) - } - // t.NewSha (string) (string) - case "newSha": + // t.Key (string) (string) + case "key": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3530,10 +3445,10 @@ func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.NewSha = string(sval) + t.Key = string(sval) } - // t.OldSha (string) (string) - case "oldSha": + // t.Value (string) (string) + case "value": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3541,7 +3456,7 @@ func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.OldSha = string(sval) + t.Value = string(sval) } default: @@ -3554,206 +3469,114 @@ func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *PipelineStatus) MarshalCBOR(w io.Writer) error { +func (t *Pipeline_PullRequestTriggerData) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 7 - if t.Error == nil { - fieldCount-- + if _, err := cw.Write([]byte{164}); err != nil { + return err } - if t.ExitCode == nil { - fieldCount-- + // t.Action (string) (string) + if len("action") > 1000000 { + return xerrors.Errorf("Value in field \"action\" was too long") } - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("action"))); err != nil { + return err + } + if _, err := cw.WriteString(string("action")); err != nil { return err } - // t.LexiconTypeID (string) (string) - if len("$type") > 1000000 { - return xerrors.Errorf("Value in field \"$type\" was too long") + if len(t.Action) > 1000000 { + return xerrors.Errorf("Value in field t.Action was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Action))); err != nil { return err } - if _, err := cw.WriteString(string("$type")); err != nil { + if _, err := cw.WriteString(string(t.Action)); err != nil { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.pipeline.status"))); err != nil { - return err + // t.SourceSha (string) (string) + if len("sourceSha") > 1000000 { + return xerrors.Errorf("Value in field \"sourceSha\" was too long") } - if _, err := cw.WriteString(string("sh.tangled.pipeline.status")); err != nil { + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sourceSha"))); err != nil { return err } - - // t.Error (string) (string) - if t.Error != nil { - - if len("error") > 1000000 { - return xerrors.Errorf("Value in field \"error\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("error"))); err != nil { - return err - } - if _, err := cw.WriteString(string("error")); err != nil { - return err - } - - if t.Error == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Error) > 1000000 { - return xerrors.Errorf("Value in field t.Error was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Error))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Error)); err != nil { - return err - } - } + if _, err := cw.WriteString(string("sourceSha")); err != nil { + return err } - // t.Status (string) (string) - if len("status") > 1000000 { - return xerrors.Errorf("Value in field \"status\" was too long") + if len(t.SourceSha) > 1000000 { + return xerrors.Errorf("Value in field t.SourceSha was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("status"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.SourceSha))); err != nil { return err } - if _, err := cw.WriteString(string("status")); err != nil { + if _, err := cw.WriteString(string(t.SourceSha)); err != nil { return err } - if len(t.Status) > 1000000 { - return xerrors.Errorf("Value in field t.Status was too long") + // t.SourceBranch (string) (string) + if len("sourceBranch") > 1000000 { + return xerrors.Errorf("Value in field \"sourceBranch\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Status))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sourceBranch"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Status)); err != nil { + if _, err := cw.WriteString(string("sourceBranch")); err != nil { return err } - // t.ExitCode (int64) (int64) - if t.ExitCode != nil { - - if len("exitCode") > 1000000 { - return xerrors.Errorf("Value in field \"exitCode\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("exitCode"))); err != nil { - return err - } - if _, err := cw.WriteString(string("exitCode")); err != nil { - return err - } - - if t.ExitCode == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if *t.ExitCode >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(*t.ExitCode)); err != nil { - return err - } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-*t.ExitCode-1)); err != nil { - return err - } - } - } - - } - - // t.Pipeline (string) (string) - if len("pipeline") > 1000000 { - return xerrors.Errorf("Value in field \"pipeline\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pipeline"))); err != nil { - return err - } - if _, err := cw.WriteString(string("pipeline")); err != nil { - return err - } - - if len(t.Pipeline) > 1000000 { - return xerrors.Errorf("Value in field t.Pipeline was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Pipeline))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Pipeline)); err != nil { - return err - } - - // t.Workflow (string) (string) - if len("workflow") > 1000000 { - return xerrors.Errorf("Value in field \"workflow\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("workflow"))); err != nil { - return err - } - if _, err := cw.WriteString(string("workflow")); err != nil { - return err - } - - if len(t.Workflow) > 1000000 { - return xerrors.Errorf("Value in field t.Workflow was too long") + if len(t.SourceBranch) > 1000000 { + return xerrors.Errorf("Value in field t.SourceBranch was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Workflow))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.SourceBranch))); err != nil { return err } - if _, err := cw.WriteString(string(t.Workflow)); err != nil { + if _, err := cw.WriteString(string(t.SourceBranch)); err != nil { return err } - // t.CreatedAt (string) (string) - if len("createdAt") > 1000000 { - return xerrors.Errorf("Value in field \"createdAt\" was too long") + // t.TargetBranch (string) (string) + if len("targetBranch") > 1000000 { + return xerrors.Errorf("Value in field \"targetBranch\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("targetBranch"))); err != nil { return err } - if _, err := cw.WriteString(string("createdAt")); err != nil { + if _, err := cw.WriteString(string("targetBranch")); err != nil { return err } - if len(t.CreatedAt) > 1000000 { - return xerrors.Errorf("Value in field t.CreatedAt was too long") + if len(t.TargetBranch) > 1000000 { + return xerrors.Errorf("Value in field t.TargetBranch was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.TargetBranch))); err != nil { return err } - if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + if _, err := cw.WriteString(string(t.TargetBranch)); err != nil { return err } return nil } -func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { - *t = PipelineStatus{} +func (t *Pipeline_PullRequestTriggerData) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline_PullRequestTriggerData{} cr := cbg.NewCborReader(r) @@ -3772,12 +3595,12 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("PipelineStatus: map struct too large (%d)", extra) + return fmt.Errorf("Pipeline_PullRequestTriggerData: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 9) + nameBuf := make([]byte, 12) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -3793,40 +3616,8 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.LexiconTypeID (string) (string) - case "$type": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.LexiconTypeID = string(sval) - } - // t.Error (string) (string) - case "error": - - { - 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.Error = (*string)(&sval) - } - } - // t.Status (string) (string) - case "status": + // t.Action (string) (string) + case "action": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3834,46 +3625,10 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Status = string(sval) - } - // t.ExitCode (int64) (int64) - case "exitCode": - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - maj, extra, err := cr.ReadHeader() - if err != nil { - return err - } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") - } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") - } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - - t.ExitCode = (*int64)(&extraI) - } + t.Action = string(sval) } - // t.Pipeline (string) (string) - case "pipeline": + // t.SourceSha (string) (string) + case "sourceSha": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3881,10 +3636,10 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Pipeline = string(sval) + t.SourceSha = string(sval) } - // t.Workflow (string) (string) - case "workflow": + // t.SourceBranch (string) (string) + case "sourceBranch": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3892,10 +3647,10 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Workflow = string(sval) + t.SourceBranch = string(sval) } - // t.CreatedAt (string) (string) - case "createdAt": + // t.TargetBranch (string) (string) + case "targetBranch": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -3903,7 +3658,7 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.CreatedAt = string(sval) + t.TargetBranch = string(sval) } default: @@ -3916,79 +3671,247 @@ func (t *PipelineStatus) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Pipeline_Step) MarshalCBOR(w io.Writer) error { +func (t *Pipeline_PushTriggerData) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 3 - if t.Environment == nil { - fieldCount-- + if _, err := cw.Write([]byte{163}); err != nil { + return err } - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + // t.Ref (string) (string) + if len("ref") > 1000000 { + return xerrors.Errorf("Value in field \"ref\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ref"))); err != nil { + return err + } + if _, err := cw.WriteString(string("ref")); err != nil { return err } - // t.Name (string) (string) - if len("name") > 1000000 { - return xerrors.Errorf("Value in field \"name\" was too long") + if len(t.Ref) > 1000000 { + return xerrors.Errorf("Value in field t.Ref was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("name"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Ref))); err != nil { return err } - if _, err := cw.WriteString(string("name")); err != nil { + if _, err := cw.WriteString(string(t.Ref)); err != nil { return err } - if len(t.Name) > 1000000 { - return xerrors.Errorf("Value in field t.Name was too long") + // t.NewSha (string) (string) + if len("newSha") > 1000000 { + return xerrors.Errorf("Value in field \"newSha\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("newSha"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Name)); err != nil { + if _, err := cw.WriteString(string("newSha")); err != nil { return err } - // t.Command (string) (string) - if len("command") > 1000000 { - return xerrors.Errorf("Value in field \"command\" was too long") + if len(t.NewSha) > 1000000 { + return xerrors.Errorf("Value in field t.NewSha was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("command"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.NewSha))); err != nil { return err } - if _, err := cw.WriteString(string("command")); err != nil { + if _, err := cw.WriteString(string(t.NewSha)); err != nil { return err } - if len(t.Command) > 1000000 { - return xerrors.Errorf("Value in field t.Command was too long") + // t.OldSha (string) (string) + if len("oldSha") > 1000000 { + return xerrors.Errorf("Value in field \"oldSha\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Command))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("oldSha"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Command)); err != nil { + if _, err := cw.WriteString(string("oldSha")); err != nil { return err } - // t.Environment ([]*tangled.Pipeline_Pair) (slice) - if t.Environment != nil { - - if len("environment") > 1000000 { - return xerrors.Errorf("Value in field \"environment\" was too long") - } + if len(t.OldSha) > 1000000 { + return xerrors.Errorf("Value in field t.OldSha was too long") + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("environment"))); err != nil { - return err - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.OldSha))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.OldSha)); err != nil { + return err + } + return nil +} + +func (t *Pipeline_PushTriggerData) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline_PushTriggerData{} + + cr := cbg.NewCborReader(r) + + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + defer func() { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } + }() + + if maj != cbg.MajMap { + return fmt.Errorf("cbor input should be of type map") + } + + if extra > cbg.MaxLength { + return fmt.Errorf("Pipeline_PushTriggerData: map struct too large (%d)", extra) + } + + n := extra + + nameBuf := make([]byte, 6) + for i := uint64(0); i < n; i++ { + nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) + if err != nil { + return err + } + + if !ok { + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { + return err + } + continue + } + + switch string(nameBuf[:nameLen]) { + // t.Ref (string) (string) + case "ref": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Ref = string(sval) + } + // t.NewSha (string) (string) + case "newSha": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.NewSha = string(sval) + } + // t.OldSha (string) (string) + case "oldSha": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.OldSha = string(sval) + } + + default: + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { + return err + } + } + } + + return nil +} +func (t *Pipeline_Step) MarshalCBOR(w io.Writer) error { + if t == nil { + _, err := w.Write(cbg.CborNull) + return err + } + + cw := cbg.NewCborWriter(w) + fieldCount := 3 + + if t.Environment == nil { + fieldCount-- + } + + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + return err + } + + // t.Name (string) (string) + if len("name") > 1000000 { + return xerrors.Errorf("Value in field \"name\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("name"))); err != nil { + return err + } + if _, err := cw.WriteString(string("name")); err != nil { + return err + } + + if len(t.Name) > 1000000 { + return xerrors.Errorf("Value in field t.Name was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Name)); err != nil { + return err + } + + // t.Command (string) (string) + if len("command") > 1000000 { + return xerrors.Errorf("Value in field \"command\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("command"))); err != nil { + return err + } + if _, err := cw.WriteString(string("command")); err != nil { + return err + } + + if len(t.Command) > 1000000 { + return xerrors.Errorf("Value in field t.Command was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Command))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Command)); err != nil { + return err + } + + // t.Environment ([]*tangled.Pipeline_Pair) (slice) + if t.Environment != nil { + + if len("environment") > 1000000 { + return xerrors.Errorf("Value in field \"environment\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("environment"))); err != nil { + return err + } if _, err := cw.WriteString(string("environment")); err != nil { return err } @@ -4962,7 +4885,7 @@ func (t *Pipeline_Workflow) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *PublicKey) MarshalCBOR(w io.Writer) error { +func (t *Pipeline) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -4970,102 +4893,75 @@ func (t *PublicKey) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{164}); err != nil { - return err - } - - // t.Key (string) (string) - if len("key") > 1000000 { - return xerrors.Errorf("Value in field \"key\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("key"))); err != nil { - return err - } - if _, err := cw.WriteString(string("key")); err != nil { + if _, err := cw.Write([]byte{163}); err != nil { return err } - if len(t.Key) > 1000000 { - return xerrors.Errorf("Value in field t.Key was too long") + // t.LexiconTypeID (string) (string) + if len("$type") > 1000000 { + return xerrors.Errorf("Value in field \"$type\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Key)); err != nil { + if _, err := cw.WriteString(string("$type")); err != nil { return err } - // t.Name (string) (string) - if len("name") > 1000000 { - return xerrors.Errorf("Value in field \"name\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("name"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.pipeline"))); err != nil { return err } - if _, err := cw.WriteString(string("name")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.pipeline")); err != nil { return err } - if len(t.Name) > 1000000 { - return xerrors.Errorf("Value in field t.Name was too long") + // t.Workflows ([]*tangled.Pipeline_Workflow) (slice) + if len("workflows") > 1000000 { + return xerrors.Errorf("Value in field \"workflows\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("workflows"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Name)); err != nil { + if _, err := cw.WriteString(string("workflows")); err != nil { return err } - // t.LexiconTypeID (string) (string) - if len("$type") > 1000000 { - return xerrors.Errorf("Value in field \"$type\" was too long") + if len(t.Workflows) > 8192 { + return xerrors.Errorf("Slice value in field t.Workflows was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { - return err - } - if _, err := cw.WriteString(string("$type")); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Workflows))); err != nil { return err } + for _, v := range t.Workflows { + if err := v.MarshalCBOR(cw); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.publicKey"))); err != nil { - return err - } - if _, err := cw.WriteString(string("sh.tangled.publicKey")); err != nil { - return err } - // t.CreatedAt (string) (string) - if len("createdAt") > 1000000 { - return xerrors.Errorf("Value in field \"createdAt\" was too long") + // t.TriggerMetadata (tangled.Pipeline_TriggerMetadata) (struct) + if len("triggerMetadata") > 1000000 { + return xerrors.Errorf("Value in field \"triggerMetadata\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("triggerMetadata"))); err != nil { return err } - if _, err := cw.WriteString(string("createdAt")); err != nil { + if _, err := cw.WriteString(string("triggerMetadata")); err != nil { return err } - if len(t.CreatedAt) > 1000000 { - return xerrors.Errorf("Value in field t.CreatedAt was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + if err := t.TriggerMetadata.MarshalCBOR(cw); err != nil { return err } return nil } -func (t *PublicKey) UnmarshalCBOR(r io.Reader) (err error) { - *t = PublicKey{} +func (t *Pipeline) UnmarshalCBOR(r io.Reader) (err error) { + *t = Pipeline{} cr := cbg.NewCborReader(r) @@ -5084,12 +4980,12 @@ func (t *PublicKey) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("PublicKey: map struct too large (%d)", extra) + return fmt.Errorf("Pipeline: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 9) + nameBuf := make([]byte, 15) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -5105,8 +5001,8 @@ func (t *PublicKey) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Key (string) (string) - case "key": + // t.LexiconTypeID (string) (string) + case "$type": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -5114,40 +5010,76 @@ func (t *PublicKey) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Key = string(sval) + t.LexiconTypeID = string(sval) } - // t.Name (string) (string) - case "name": + // t.Workflows ([]*tangled.Pipeline_Workflow) (slice) + case "workflows": - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + maj, extra, err = cr.ReadHeader() + if err != nil { + return err + } - t.Name = string(sval) + if extra > 8192 { + return fmt.Errorf("t.Workflows: array too large (%d)", extra) } - // t.LexiconTypeID (string) (string) - case "$type": - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } + if maj != cbg.MajArray { + return fmt.Errorf("expected cbor array") + } - t.LexiconTypeID = string(sval) + if extra > 0 { + t.Workflows = make([]*Pipeline_Workflow, extra) } - // t.CreatedAt (string) (string) - case "createdAt": + + for i := 0; i < int(extra); i++ { + { + var maj byte + var extra uint64 + var err error + _ = maj + _ = extra + _ = err + + { + + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.Workflows[i] = new(Pipeline_Workflow) + if err := t.Workflows[i].UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.Workflows[i] pointer: %w", err) + } + } + + } + + } + } + // t.TriggerMetadata (tangled.Pipeline_TriggerMetadata) (struct) + case "triggerMetadata": { - sval, err := cbg.ReadStringWithMax(cr, 1000000) + + b, err := cr.ReadByte() if err != nil { return err } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.TriggerMetadata = new(Pipeline_TriggerMetadata) + if err := t.TriggerMetadata.UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.TriggerMetadata pointer: %w", err) + } + } - t.CreatedAt = string(sval) } default: @@ -5160,51 +5092,38 @@ func (t *PublicKey) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Repo) MarshalCBOR(w io.Writer) error { +func (t *PublicKey) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 8 - - if t.Description == nil { - fieldCount-- - } - - if t.Source == nil { - fieldCount-- - } - - if t.Spindle == nil { - fieldCount-- - } - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + if _, err := cw.Write([]byte{164}); err != nil { return err } - // t.Knot (string) (string) - if len("knot") > 1000000 { - return xerrors.Errorf("Value in field \"knot\" was too long") + // t.Key (string) (string) + if len("key") > 1000000 { + return xerrors.Errorf("Value in field \"key\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("knot"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("key"))); err != nil { return err } - if _, err := cw.WriteString(string("knot")); err != nil { + if _, err := cw.WriteString(string("key")); err != nil { return err } - if len(t.Knot) > 1000000 { - return xerrors.Errorf("Value in field t.Knot was too long") + if len(t.Key) > 1000000 { + return xerrors.Errorf("Value in field t.Key was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Knot))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil { return err } - if _, err := cw.WriteString(string(t.Knot)); err != nil { + if _, err := cw.WriteString(string(t.Key)); err != nil { return err } @@ -5243,100 +5162,13 @@ func (t *Repo) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo"))); err != nil { - return err - } - if _, err := cw.WriteString(string("sh.tangled.repo")); err != nil { - return err - } - - // t.Owner (string) (string) - if len("owner") > 1000000 { - return xerrors.Errorf("Value in field \"owner\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { - return err - } - if _, err := cw.WriteString(string("owner")); err != nil { - return err - } - - if len(t.Owner) > 1000000 { - return xerrors.Errorf("Value in field t.Owner was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Owner))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.publicKey"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Owner)); err != nil { + if _, err := cw.WriteString(string("sh.tangled.publicKey")); err != nil { return err } - // t.Source (string) (string) - if t.Source != nil { - - if len("source") > 1000000 { - return xerrors.Errorf("Value in field \"source\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("source"))); err != nil { - return err - } - if _, err := cw.WriteString(string("source")); err != nil { - return err - } - - if t.Source == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Source) > 1000000 { - return xerrors.Errorf("Value in field t.Source was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Source))); err != nil { - 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 - } - } - } - // t.CreatedAt (string) (string) if len("createdAt") > 1000000 { return xerrors.Errorf("Value in field \"createdAt\" was too long") @@ -5359,43 +5191,11 @@ func (t *Repo) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { return err } - - // t.Description (string) (string) - if t.Description != nil { - - if len("description") > 1000000 { - return xerrors.Errorf("Value in field \"description\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("description"))); err != nil { - return err - } - if _, err := cw.WriteString(string("description")); err != nil { - return err - } - - if t.Description == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Description) > 1000000 { - return xerrors.Errorf("Value in field t.Description was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Description))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Description)); err != nil { - return err - } - } - } return nil } -func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { - *t = Repo{} +func (t *PublicKey) UnmarshalCBOR(r io.Reader) (err error) { + *t = PublicKey{} cr := cbg.NewCborReader(r) @@ -5414,12 +5214,12 @@ func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Repo: map struct too large (%d)", extra) + return fmt.Errorf("PublicKey: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 11) + nameBuf := make([]byte, 9) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -5435,8 +5235,8 @@ func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Knot (string) (string) - case "knot": + // t.Key (string) (string) + case "key": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -5444,7 +5244,7 @@ func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Knot = string(sval) + t.Key = string(sval) } // t.Name (string) (string) case "name": @@ -5468,59 +5268,6 @@ func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Owner (string) (string) - case "owner": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Owner = string(sval) - } - // t.Source (string) (string) - case "source": - - { - 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.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": @@ -5532,27 +5279,6 @@ func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { t.CreatedAt = string(sval) } - // t.Description (string) (string) - case "description": - - { - 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.Description = (*string)(&sval) - } - } default: // Field doesn't exist on this type, so ignore it @@ -6052,7 +5778,7 @@ func (t *RepoCollaborator) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoIssue) MarshalCBOR(w io.Writer) error { +func (t *RepoIssueComment) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -6061,7 +5787,15 @@ func (t *RepoIssue) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) fieldCount := 7 - if t.Body == nil { + if t.CommentId == nil { + fieldCount-- + } + + if t.Owner == nil { + fieldCount-- + } + + if t.Repo == nil { fieldCount-- } @@ -6070,60 +5804,60 @@ func (t *RepoIssue) MarshalCBOR(w io.Writer) error { } // t.Body (string) (string) - if t.Body != nil { + if len("body") > 1000000 { + return xerrors.Errorf("Value in field \"body\" was too long") + } - if len("body") > 1000000 { - return xerrors.Errorf("Value in field \"body\" was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + return err + } + if _, err := cw.WriteString(string("body")); err != nil { + return err + } + + if len(t.Body) > 1000000 { + return xerrors.Errorf("Value in field t.Body was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Body))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Body)); err != nil { + return err + } + + // t.Repo (string) (string) + if t.Repo != nil { + + if len("repo") > 1000000 { + return xerrors.Errorf("Value in field \"repo\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { return err } - if _, err := cw.WriteString(string("body")); err != nil { + if _, err := cw.WriteString(string("repo")); err != nil { return err } - if t.Body == nil { + if t.Repo == nil { if _, err := cw.Write(cbg.CborNull); err != nil { return err } } else { - if len(*t.Body) > 1000000 { - return xerrors.Errorf("Value in field t.Body was too long") + if len(*t.Repo) > 1000000 { + return xerrors.Errorf("Value in field t.Repo was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Body))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { return err } - if _, err := cw.WriteString(string(*t.Body)); err != nil { + if _, err := cw.WriteString(string(*t.Repo)); err != nil { return err } } } - // t.Repo (string) (string) - if len("repo") > 1000000 { - return xerrors.Errorf("Value in field \"repo\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { - return err - } - if _, err := cw.WriteString(string("repo")); err != nil { - return err - } - - if len(t.Repo) > 1000000 { - return xerrors.Errorf("Value in field t.Repo was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Repo))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Repo)); err != nil { - return err - } - // t.LexiconTypeID (string) (string) if len("$type") > 1000000 { return xerrors.Errorf("Value in field \"$type\" was too long") @@ -6136,79 +5870,98 @@ func (t *RepoIssue) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.issue"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.issue.comment"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.repo.issue")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo.issue.comment")); err != nil { return err } - // t.Owner (string) (string) - if len("owner") > 1000000 { - return xerrors.Errorf("Value in field \"owner\" was too long") + // t.Issue (string) (string) + if len("issue") > 1000000 { + return xerrors.Errorf("Value in field \"issue\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("issue"))); err != nil { return err } - if _, err := cw.WriteString(string("owner")); err != nil { + if _, err := cw.WriteString(string("issue")); err != nil { return err } - if len(t.Owner) > 1000000 { - return xerrors.Errorf("Value in field t.Owner was too long") + if len(t.Issue) > 1000000 { + return xerrors.Errorf("Value in field t.Issue was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Owner))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Issue))); err != nil { return err } - if _, err := cw.WriteString(string(t.Owner)); err != nil { + if _, err := cw.WriteString(string(t.Issue)); err != nil { return err } - // t.Title (string) (string) - if len("title") > 1000000 { - return xerrors.Errorf("Value in field \"title\" was too long") - } + // t.Owner (string) (string) + if t.Owner != nil { - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("title"))); err != nil { - return err - } - if _, err := cw.WriteString(string("title")); err != nil { - return err - } + if len("owner") > 1000000 { + return xerrors.Errorf("Value in field \"owner\" was too long") + } - if len(t.Title) > 1000000 { - return xerrors.Errorf("Value in field t.Title was too long") - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { + return err + } + if _, err := cw.WriteString(string("owner")); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Title))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Title)); err != nil { - return err - } + if t.Owner == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Owner) > 1000000 { + return xerrors.Errorf("Value in field t.Owner was too long") + } - // t.IssueId (int64) (int64) - if len("issueId") > 1000000 { - return xerrors.Errorf("Value in field \"issueId\" was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Owner))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Owner)); err != nil { + return err + } + } } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("issueId"))); err != nil { - return err - } - if _, err := cw.WriteString(string("issueId")); err != nil { - return err - } + // t.CommentId (int64) (int64) + if t.CommentId != nil { - if t.IssueId >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.IssueId)); err != nil { + if len("commentId") > 1000000 { + return xerrors.Errorf("Value in field \"commentId\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("commentId"))); err != nil { return err } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.IssueId-1)); err != nil { + if _, err := cw.WriteString(string("commentId")); err != nil { return err } + + if t.CommentId == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if *t.CommentId >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(*t.CommentId)); err != nil { + return err + } + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-*t.CommentId-1)); err != nil { + return err + } + } + } + } // t.CreatedAt (string) (string) @@ -6236,8 +5989,8 @@ func (t *RepoIssue) MarshalCBOR(w io.Writer) error { return nil } -func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoIssue{} +func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoIssueComment{} cr := cbg.NewCborReader(r) @@ -6256,7 +6009,7 @@ func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("RepoIssue: map struct too large (%d)", extra) + return fmt.Errorf("RepoIssueComment: map struct too large (%d)", extra) } n := extra @@ -6280,6 +6033,17 @@ func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { // t.Body (string) (string) case "body": + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Body = string(sval) + } + // t.Repo (string) (string) + case "repo": + { b, err := cr.ReadByte() if err != nil { @@ -6295,11 +6059,11 @@ func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Body = (*string)(&sval) + t.Repo = (*string)(&sval) } } - // t.Repo (string) (string) - case "repo": + // t.LexiconTypeID (string) (string) + case "$type": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -6307,10 +6071,10 @@ func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Repo = string(sval) + t.LexiconTypeID = string(sval) } - // t.LexiconTypeID (string) (string) - case "$type": + // t.Issue (string) (string) + case "issue": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -6318,55 +6082,64 @@ func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.LexiconTypeID = string(sval) + t.Issue = string(sval) } // t.Owner (string) (string) case "owner": { - sval, err := cbg.ReadStringWithMax(cr, 1000000) + b, err := cr.ReadByte() if err != nil { return err } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } - t.Owner = string(sval) - } - // t.Title (string) (string) - case "title": + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err + t.Owner = (*string)(&sval) } - - t.Title = string(sval) } - // t.IssueId (int64) (int64) - case "issueId": + // t.CommentId (int64) (int64) + case "commentId": { - maj, extra, err := cr.ReadHeader() + + b, err := cr.ReadByte() if err != nil { return err } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") + } + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") + } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - t.IssueId = int64(extraI) + t.CommentId = (*int64)(&extraI) + } } // t.CreatedAt (string) (string) case "createdAt": @@ -6390,86 +6163,18 @@ func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoIssueComment) MarshalCBOR(w io.Writer) error { +func (t *RepoIssueState) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 7 - - if t.CommentId == nil { - fieldCount-- - } - - if t.Owner == nil { - fieldCount-- - } - - if t.Repo == nil { - fieldCount-- - } - - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { - return err - } - - // t.Body (string) (string) - if len("body") > 1000000 { - return xerrors.Errorf("Value in field \"body\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { - return err - } - if _, err := cw.WriteString(string("body")); err != nil { - return err - } - if len(t.Body) > 1000000 { - return xerrors.Errorf("Value in field t.Body was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Body))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Body)); err != nil { + if _, err := cw.Write([]byte{163}); err != nil { return err } - // t.Repo (string) (string) - if t.Repo != nil { - - if len("repo") > 1000000 { - return xerrors.Errorf("Value in field \"repo\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { - return err - } - if _, err := cw.WriteString(string("repo")); err != nil { - return err - } - - if t.Repo == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Repo) > 1000000 { - return xerrors.Errorf("Value in field t.Repo was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Repo)); err != nil { - return err - } - } - } - // t.LexiconTypeID (string) (string) if len("$type") > 1000000 { return xerrors.Errorf("Value in field \"$type\" was too long") @@ -6482,10 +6187,10 @@ func (t *RepoIssueComment) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.issue.comment"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.issue.state"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.repo.issue.comment")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo.issue.state")); err != nil { return err } @@ -6512,97 +6217,33 @@ func (t *RepoIssueComment) MarshalCBOR(w io.Writer) error { return err } - // t.Owner (string) (string) - if t.Owner != nil { - - if len("owner") > 1000000 { - return xerrors.Errorf("Value in field \"owner\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { - return err - } - if _, err := cw.WriteString(string("owner")); err != nil { - return err - } - - if t.Owner == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Owner) > 1000000 { - return xerrors.Errorf("Value in field t.Owner was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Owner))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Owner)); err != nil { - return err - } - } - } - - // t.CommentId (int64) (int64) - if t.CommentId != nil { - - if len("commentId") > 1000000 { - return xerrors.Errorf("Value in field \"commentId\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("commentId"))); err != nil { - return err - } - if _, err := cw.WriteString(string("commentId")); err != nil { - return err - } - - if t.CommentId == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if *t.CommentId >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(*t.CommentId)); err != nil { - return err - } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-*t.CommentId-1)); err != nil { - return err - } - } - } - - } - - // t.CreatedAt (string) (string) - if len("createdAt") > 1000000 { - return xerrors.Errorf("Value in field \"createdAt\" was too long") + // t.State (string) (string) + if len("state") > 1000000 { + return xerrors.Errorf("Value in field \"state\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("state"))); err != nil { return err } - if _, err := cw.WriteString(string("createdAt")); err != nil { + if _, err := cw.WriteString(string("state")); err != nil { return err } - if len(t.CreatedAt) > 1000000 { - return xerrors.Errorf("Value in field t.CreatedAt was too long") + if len(t.State) > 1000000 { + return xerrors.Errorf("Value in field t.State was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.State))); err != nil { return err } - if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + if _, err := cw.WriteString(string(t.State)); err != nil { return err } return nil } -func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoIssueComment{} +func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoIssueState{} cr := cbg.NewCborReader(r) @@ -6621,12 +6262,12 @@ func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("RepoIssueComment: map struct too large (%d)", extra) + return fmt.Errorf("RepoIssueState: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 9) + nameBuf := make([]byte, 5) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -6642,39 +6283,7 @@ func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Body (string) (string) - case "body": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Body = string(sval) - } - // t.Repo (string) (string) - case "repo": - - { - 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.Repo = (*string)(&sval) - } - } - // t.LexiconTypeID (string) (string) + // t.LexiconTypeID (string) (string) case "$type": { @@ -6696,65 +6305,8 @@ func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { t.Issue = string(sval) } - // t.Owner (string) (string) - case "owner": - - { - 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.Owner = (*string)(&sval) - } - } - // t.CommentId (int64) (int64) - case "commentId": - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - maj, extra, err := cr.ReadHeader() - if err != nil { - return err - } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") - } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") - } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - - t.CommentId = (*int64)(&extraI) - } - } - // t.CreatedAt (string) (string) - case "createdAt": + // t.State (string) (string) + case "state": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -6762,7 +6314,7 @@ func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.CreatedAt = string(sval) + t.State = string(sval) } default: @@ -6775,15 +6327,75 @@ func (t *RepoIssueComment) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoIssueState) MarshalCBOR(w io.Writer) error { +func (t *RepoIssue) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) + fieldCount := 7 - if _, err := cw.Write([]byte{163}); err != nil { + if t.Body == nil { + fieldCount-- + } + + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + return err + } + + // t.Body (string) (string) + if t.Body != nil { + + if len("body") > 1000000 { + return xerrors.Errorf("Value in field \"body\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + return err + } + if _, err := cw.WriteString(string("body")); err != nil { + return err + } + + if t.Body == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Body) > 1000000 { + return xerrors.Errorf("Value in field t.Body was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Body))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Body)); err != nil { + return err + } + } + } + + // t.Repo (string) (string) + if len("repo") > 1000000 { + return xerrors.Errorf("Value in field \"repo\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { + return err + } + if _, err := cw.WriteString(string("repo")); err != nil { + return err + } + + if len(t.Repo) > 1000000 { + return xerrors.Errorf("Value in field t.Repo was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Repo))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Repo)); err != nil { return err } @@ -6799,89 +6411,134 @@ func (t *RepoIssueState) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.issue.state"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.issue"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.repo.issue.state")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo.issue")); err != nil { return err } - // t.Issue (string) (string) - if len("issue") > 1000000 { - return xerrors.Errorf("Value in field \"issue\" was too long") + // t.Owner (string) (string) + if len("owner") > 1000000 { + return xerrors.Errorf("Value in field \"owner\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("issue"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { return err } - if _, err := cw.WriteString(string("issue")); err != nil { + if _, err := cw.WriteString(string("owner")); err != nil { return err } - if len(t.Issue) > 1000000 { - return xerrors.Errorf("Value in field t.Issue was too long") + if len(t.Owner) > 1000000 { + return xerrors.Errorf("Value in field t.Owner was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Issue))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Owner))); err != nil { return err } - if _, err := cw.WriteString(string(t.Issue)); err != nil { + if _, err := cw.WriteString(string(t.Owner)); err != nil { return err } - // t.State (string) (string) - if len("state") > 1000000 { - return xerrors.Errorf("Value in field \"state\" was too long") + // t.Title (string) (string) + if len("title") > 1000000 { + return xerrors.Errorf("Value in field \"title\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("state"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("title"))); err != nil { return err } - if _, err := cw.WriteString(string("state")); err != nil { + if _, err := cw.WriteString(string("title")); err != nil { return err } - if len(t.State) > 1000000 { - return xerrors.Errorf("Value in field t.State was too long") + if len(t.Title) > 1000000 { + return xerrors.Errorf("Value in field t.Title was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.State))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Title))); err != nil { return err } - if _, err := cw.WriteString(string(t.State)); err != nil { + if _, err := cw.WriteString(string(t.Title)); err != nil { return err } - return nil -} - -func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoIssueState{} - cr := cbg.NewCborReader(r) + // t.IssueId (int64) (int64) + if len("issueId") > 1000000 { + return xerrors.Errorf("Value in field \"issueId\" was too long") + } - maj, extra, err := cr.ReadHeader() - if err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("issueId"))); err != nil { return err } - defer func() { - if err == io.EOF { - err = io.ErrUnexpectedEOF + if _, err := cw.WriteString(string("issueId")); err != nil { + return err + } + + if t.IssueId >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.IssueId)); err != nil { + return err } - }() + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.IssueId-1)); err != nil { + return err + } + } - if maj != cbg.MajMap { - return fmt.Errorf("cbor input should be of type map") + // t.CreatedAt (string) (string) + if len("createdAt") > 1000000 { + return xerrors.Errorf("Value in field \"createdAt\" was too long") } - if extra > cbg.MaxLength { - return fmt.Errorf("RepoIssueState: map struct too large (%d)", extra) + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + return err + } + if _, err := cw.WriteString(string("createdAt")); err != nil { + return err } - n := extra + if len(t.CreatedAt) > 1000000 { + return xerrors.Errorf("Value in field t.CreatedAt was too long") + } - nameBuf := make([]byte, 5) - for i := uint64(0); i < n; i++ { - nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + return err + } + return nil +} + +func (t *RepoIssue) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoIssue{} + + cr := cbg.NewCborReader(r) + + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + defer func() { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } + }() + + if maj != cbg.MajMap { + return fmt.Errorf("cbor input should be of type map") + } + + if extra > cbg.MaxLength { + return fmt.Errorf("RepoIssue: map struct too large (%d)", extra) + } + + n := extra + + nameBuf := make([]byte, 9) + for i := uint64(0); i < n; i++ { + nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { return err } @@ -6895,7 +6552,39 @@ func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.LexiconTypeID (string) (string) + // t.Body (string) (string) + case "body": + + { + 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.Body = (*string)(&sval) + } + } + // t.Repo (string) (string) + case "repo": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Repo = string(sval) + } + // t.LexiconTypeID (string) (string) case "$type": { @@ -6906,8 +6595,8 @@ func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Issue (string) (string) - case "issue": + // t.Owner (string) (string) + case "owner": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -6915,10 +6604,10 @@ func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Issue = string(sval) + t.Owner = string(sval) } - // t.State (string) (string) - case "state": + // t.Title (string) (string) + case "title": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -6926,7 +6615,44 @@ func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.State = string(sval) + t.Title = string(sval) + } + // t.IssueId (int64) (int64) + case "issueId": + { + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") + } + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") + } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) + } + + t.IssueId = int64(extraI) + } + // t.CreatedAt (string) (string) + case "createdAt": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.CreatedAt = string(sval) } default: @@ -6939,20 +6665,24 @@ func (t *RepoIssueState) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoPull) MarshalCBOR(w io.Writer) error { +func (t *RepoPullComment) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 9 + fieldCount := 7 - if t.Body == nil { + if t.CommentId == nil { fieldCount-- } - if t.Source == nil { + if t.Owner == nil { + fieldCount-- + } + + if t.Repo == nil { fieldCount-- } @@ -6961,32 +6691,78 @@ func (t *RepoPull) MarshalCBOR(w io.Writer) error { } // t.Body (string) (string) - if t.Body != nil { + if len("body") > 1000000 { + return xerrors.Errorf("Value in field \"body\" was too long") + } - if len("body") > 1000000 { - return xerrors.Errorf("Value in field \"body\" was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + return err + } + if _, err := cw.WriteString(string("body")); err != nil { + return err + } + + if len(t.Body) > 1000000 { + return xerrors.Errorf("Value in field t.Body was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Body))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Body)); err != nil { + return err + } + + // t.Pull (string) (string) + if len("pull") > 1000000 { + return xerrors.Errorf("Value in field \"pull\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pull"))); err != nil { + return err + } + if _, err := cw.WriteString(string("pull")); err != nil { + return err + } + + if len(t.Pull) > 1000000 { + return xerrors.Errorf("Value in field t.Pull was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Pull))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Pull)); err != nil { + return err + } + + // t.Repo (string) (string) + if t.Repo != nil { + + if len("repo") > 1000000 { + return xerrors.Errorf("Value in field \"repo\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { return err } - if _, err := cw.WriteString(string("body")); err != nil { + if _, err := cw.WriteString(string("repo")); err != nil { return err } - if t.Body == nil { + if t.Repo == nil { if _, err := cw.Write(cbg.CborNull); err != nil { return err } } else { - if len(*t.Body) > 1000000 { - return xerrors.Errorf("Value in field t.Body was too long") + if len(*t.Repo) > 1000000 { + return xerrors.Errorf("Value in field t.Repo was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Body))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { return err } - if _, err := cw.WriteString(string(*t.Body)); err != nil { + if _, err := cw.WriteString(string(*t.Repo)); err != nil { return err } } @@ -7004,98 +6780,75 @@ func (t *RepoPull) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull.comment"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.repo.pull")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo.pull.comment")); err != nil { return err } - // t.Patch (string) (string) - if len("patch") > 1000000 { - return xerrors.Errorf("Value in field \"patch\" was too long") - } + // t.Owner (string) (string) + if t.Owner != nil { - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patch"))); err != nil { - return err - } - if _, err := cw.WriteString(string("patch")); err != nil { - return err - } + if len("owner") > 1000000 { + return xerrors.Errorf("Value in field \"owner\" was too long") + } - if len(t.Patch) > 1000000 { - return xerrors.Errorf("Value in field t.Patch was too long") - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { + return err + } + if _, err := cw.WriteString(string("owner")); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Patch))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Patch)); err != nil { - return err - } + if t.Owner == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Owner) > 1000000 { + return xerrors.Errorf("Value in field t.Owner was too long") + } - // t.Title (string) (string) - if len("title") > 1000000 { - return xerrors.Errorf("Value in field \"title\" was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Owner))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Owner)); err != nil { + return err + } + } } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("title"))); err != nil { - return err - } - if _, err := cw.WriteString(string("title")); err != nil { - return err - } - - if len(t.Title) > 1000000 { - return xerrors.Errorf("Value in field t.Title was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Title))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Title)); err != nil { - return err - } - - // t.PullId (int64) (int64) - if len("pullId") > 1000000 { - return xerrors.Errorf("Value in field \"pullId\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pullId"))); err != nil { - return err - } - if _, err := cw.WriteString(string("pullId")); err != nil { - return err - } - - if t.PullId >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.PullId)); err != nil { - return err - } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.PullId-1)); err != nil { - return err - } - } - - // t.Source (tangled.RepoPull_Source) (struct) - if t.Source != nil { + // t.CommentId (int64) (int64) + if t.CommentId != nil { - if len("source") > 1000000 { - return xerrors.Errorf("Value in field \"source\" was too long") + if len("commentId") > 1000000 { + return xerrors.Errorf("Value in field \"commentId\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("source"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("commentId"))); err != nil { return err } - if _, err := cw.WriteString(string("source")); err != nil { + if _, err := cw.WriteString(string("commentId")); err != nil { return err } - if err := t.Source.MarshalCBOR(cw); err != nil { - return err + if t.CommentId == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if *t.CommentId >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(*t.CommentId)); err != nil { + return err + } + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-*t.CommentId-1)); err != nil { + return err + } + } } + } // t.CreatedAt (string) (string) @@ -7120,57 +6873,11 @@ func (t *RepoPull) MarshalCBOR(w io.Writer) error { if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { return err } - - // t.TargetRepo (string) (string) - if len("targetRepo") > 1000000 { - return xerrors.Errorf("Value in field \"targetRepo\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("targetRepo"))); err != nil { - return err - } - if _, err := cw.WriteString(string("targetRepo")); err != nil { - return err - } - - if len(t.TargetRepo) > 1000000 { - return xerrors.Errorf("Value in field t.TargetRepo was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.TargetRepo))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.TargetRepo)); err != nil { - return err - } - - // t.TargetBranch (string) (string) - if len("targetBranch") > 1000000 { - return xerrors.Errorf("Value in field \"targetBranch\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("targetBranch"))); err != nil { - return err - } - if _, err := cw.WriteString(string("targetBranch")); err != nil { - return err - } - - if len(t.TargetBranch) > 1000000 { - return xerrors.Errorf("Value in field t.TargetBranch was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.TargetBranch))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.TargetBranch)); err != nil { - return err - } return nil } -func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoPull{} +func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoPullComment{} cr := cbg.NewCborReader(r) @@ -7189,12 +6896,12 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("RepoPull: map struct too large (%d)", extra) + return fmt.Errorf("RepoPullComment: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 12) + nameBuf := make([]byte, 9) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -7214,25 +6921,15 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { case "body": { - 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.Body = (*string)(&sval) - } + t.Body = string(sval) } - // t.LexiconTypeID (string) (string) - case "$type": + // t.Pull (string) (string) + case "pull": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -7240,21 +6937,31 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.LexiconTypeID = string(sval) + t.Pull = string(sval) } - // t.Patch (string) (string) - case "patch": + // t.Repo (string) (string) + case "repo": { - sval, err := cbg.ReadStringWithMax(cr, 1000000) + b, err := cr.ReadByte() if err != nil { return err } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } - t.Patch = string(sval) + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Repo = (*string)(&sval) + } } - // t.Title (string) (string) - case "title": + // t.LexiconTypeID (string) (string) + case "$type": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -7262,37 +6969,31 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Title = string(sval) + t.LexiconTypeID = string(sval) } - // t.PullId (int64) (int64) - case "pullId": + // t.Owner (string) (string) + case "owner": + { - maj, extra, err := cr.ReadHeader() + b, err := cr.ReadByte() if err != nil { return err } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") + + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - t.PullId = int64(extraI) + t.Owner = (*string)(&sval) + } } - // t.Source (tangled.RepoPull_Source) (struct) - case "source": - + // t.CommentId (int64) (int64) + case "commentId": { b, err := cr.ReadByte() @@ -7303,12 +7004,29 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { if err := cr.UnreadByte(); err != nil { return err } - t.Source = new(RepoPull_Source) - if err := t.Source.UnmarshalCBOR(cr); err != nil { - return xerrors.Errorf("unmarshaling t.Source pointer: %w", err) + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") + } + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") + } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) } - } + t.CommentId = (*int64)(&extraI) + } } // t.CreatedAt (string) (string) case "createdAt": @@ -7321,28 +7039,6 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { t.CreatedAt = string(sval) } - // t.TargetRepo (string) (string) - case "targetRepo": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.TargetRepo = string(sval) - } - // t.TargetBranch (string) (string) - case "targetBranch": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.TargetBranch = string(sval) - } default: // Field doesn't exist on this type, so ignore it @@ -7354,219 +7050,269 @@ func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoPullComment) MarshalCBOR(w io.Writer) error { +func (t *RepoPullStatus) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 7 - if t.CommentId == nil { - fieldCount-- + if _, err := cw.Write([]byte{163}); err != nil { + return err } - if t.Owner == nil { - fieldCount-- + // t.Pull (string) (string) + if len("pull") > 1000000 { + return xerrors.Errorf("Value in field \"pull\" was too long") } - if t.Repo == nil { - fieldCount-- + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pull"))); err != nil { + return err } - - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { + if _, err := cw.WriteString(string("pull")); err != nil { return err } - // t.Body (string) (string) - if len("body") > 1000000 { - return xerrors.Errorf("Value in field \"body\" was too long") + if len(t.Pull) > 1000000 { + return xerrors.Errorf("Value in field t.Pull was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Pull))); err != nil { return err } - if _, err := cw.WriteString(string("body")); err != nil { + if _, err := cw.WriteString(string(t.Pull)); err != nil { return err } - if len(t.Body) > 1000000 { - return xerrors.Errorf("Value in field t.Body was too long") + // t.LexiconTypeID (string) (string) + if len("$type") > 1000000 { + return xerrors.Errorf("Value in field \"$type\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Body))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Body)); err != nil { + if _, err := cw.WriteString(string("$type")); err != nil { return err } - // t.Pull (string) (string) - if len("pull") > 1000000 { - return xerrors.Errorf("Value in field \"pull\" was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull.status"))); err != nil { + return err + } + if _, err := cw.WriteString(string("sh.tangled.repo.pull.status")); err != nil { + return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pull"))); err != nil { + // t.Status (string) (string) + if len("status") > 1000000 { + return xerrors.Errorf("Value in field \"status\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("status"))); err != nil { return err } - if _, err := cw.WriteString(string("pull")); err != nil { + if _, err := cw.WriteString(string("status")); err != nil { return err } - if len(t.Pull) > 1000000 { - return xerrors.Errorf("Value in field t.Pull was too long") + if len(t.Status) > 1000000 { + return xerrors.Errorf("Value in field t.Status was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Pull))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Status))); err != nil { return err } - if _, err := cw.WriteString(string(t.Pull)); err != nil { + if _, err := cw.WriteString(string(t.Status)); err != nil { return err } + return nil +} - // t.Repo (string) (string) - if t.Repo != nil { +func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoPullStatus{} - if len("repo") > 1000000 { - return xerrors.Errorf("Value in field \"repo\" was too long") - } + cr := cbg.NewCborReader(r) - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { - return err + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + defer func() { + if err == io.EOF { + err = io.ErrUnexpectedEOF } - if _, err := cw.WriteString(string("repo")); err != nil { + }() + + if maj != cbg.MajMap { + return fmt.Errorf("cbor input should be of type map") + } + + if extra > cbg.MaxLength { + return fmt.Errorf("RepoPullStatus: map struct too large (%d)", extra) + } + + n := extra + + nameBuf := make([]byte, 6) + for i := uint64(0); i < n; i++ { + nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) + if err != nil { return err } - if t.Repo == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { + if !ok { + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { return err } - } else { - if len(*t.Repo) > 1000000 { - return xerrors.Errorf("Value in field t.Repo was too long") + continue + } + + switch string(nameBuf[:nameLen]) { + // t.Pull (string) (string) + case "pull": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Pull = string(sval) } + // t.LexiconTypeID (string) (string) + case "$type": - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { - return err + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.LexiconTypeID = string(sval) } - if _, err := cw.WriteString(string(*t.Repo)); err != nil { + // t.Status (string) (string) + case "status": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Status = string(sval) + } + + default: + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { return err } } } - // t.LexiconTypeID (string) (string) - if len("$type") > 1000000 { - return xerrors.Errorf("Value in field \"$type\" was too long") + return nil +} +func (t *RepoPull_Source) MarshalCBOR(w io.Writer) error { + if t == nil { + _, err := w.Write(cbg.CborNull) + return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { + cw := cbg.NewCborWriter(w) + fieldCount := 3 + + if t.Repo == nil { + fieldCount-- + } + + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { return err } - if _, err := cw.WriteString(string("$type")); err != nil { + + // t.Sha (string) (string) + if len("sha") > 1000000 { + return xerrors.Errorf("Value in field \"sha\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sha"))); err != nil { + return err + } + if _, err := cw.WriteString(string("sha")); err != nil { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull.comment"))); err != nil { + if len(t.Sha) > 1000000 { + return xerrors.Errorf("Value in field t.Sha was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Sha))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.repo.pull.comment")); err != nil { + if _, err := cw.WriteString(string(t.Sha)); err != nil { return err } - // t.Owner (string) (string) - if t.Owner != nil { + // t.Repo (string) (string) + if t.Repo != nil { - if len("owner") > 1000000 { - return xerrors.Errorf("Value in field \"owner\" was too long") + if len("repo") > 1000000 { + return xerrors.Errorf("Value in field \"repo\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { return err } - if _, err := cw.WriteString(string("owner")); err != nil { + if _, err := cw.WriteString(string("repo")); err != nil { return err } - if t.Owner == nil { + if t.Repo == nil { if _, err := cw.Write(cbg.CborNull); err != nil { return err } } else { - if len(*t.Owner) > 1000000 { - return xerrors.Errorf("Value in field t.Owner was too long") + if len(*t.Repo) > 1000000 { + return xerrors.Errorf("Value in field t.Repo was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Owner))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Owner)); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { return err } - } - } - - // t.CommentId (int64) (int64) - if t.CommentId != nil { - - if len("commentId") > 1000000 { - return xerrors.Errorf("Value in field \"commentId\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("commentId"))); err != nil { - return err - } - if _, err := cw.WriteString(string("commentId")); err != nil { - return err - } - - if t.CommentId == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { + if _, err := cw.WriteString(string(*t.Repo)); err != nil { return err } - } else { - if *t.CommentId >= 0 { - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(*t.CommentId)); err != nil { - return err - } - } else { - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-*t.CommentId-1)); err != nil { - return err - } - } } - } - // t.CreatedAt (string) (string) - if len("createdAt") > 1000000 { - return xerrors.Errorf("Value in field \"createdAt\" was too long") + // t.Branch (string) (string) + if len("branch") > 1000000 { + return xerrors.Errorf("Value in field \"branch\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("branch"))); err != nil { return err } - if _, err := cw.WriteString(string("createdAt")); err != nil { + if _, err := cw.WriteString(string("branch")); err != nil { return err } - if len(t.CreatedAt) > 1000000 { - return xerrors.Errorf("Value in field t.CreatedAt was too long") + if len(t.Branch) > 1000000 { + return xerrors.Errorf("Value in field t.Branch was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Branch))); err != nil { return err } - if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + if _, err := cw.WriteString(string(t.Branch)); err != nil { return err } return nil } -func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoPullComment{} +func (t *RepoPull_Source) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoPull_Source{} cr := cbg.NewCborReader(r) @@ -7585,12 +7331,12 @@ func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("RepoPullComment: map struct too large (%d)", extra) + return fmt.Errorf("RepoPull_Source: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 9) + nameBuf := make([]byte, 6) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -7606,8 +7352,8 @@ func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { } switch string(nameBuf[:nameLen]) { - // t.Body (string) (string) - case "body": + // t.Sha (string) (string) + case "sha": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -7615,18 +7361,7 @@ func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Body = string(sval) - } - // t.Pull (string) (string) - case "pull": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Pull = string(sval) + t.Sha = string(sval) } // t.Repo (string) (string) case "repo": @@ -7649,76 +7384,8 @@ func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { t.Repo = (*string)(&sval) } } - // t.LexiconTypeID (string) (string) - case "$type": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.LexiconTypeID = string(sval) - } - // t.Owner (string) (string) - case "owner": - - { - 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.Owner = (*string)(&sval) - } - } - // t.CommentId (int64) (int64) - case "commentId": - { - - b, err := cr.ReadByte() - if err != nil { - return err - } - if b != cbg.CborNull[0] { - if err := cr.UnreadByte(); err != nil { - return err - } - maj, extra, err := cr.ReadHeader() - if err != nil { - return err - } - var extraI int64 - switch maj { - case cbg.MajUnsignedInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 positive overflow") - } - case cbg.MajNegativeInt: - extraI = int64(extra) - if extraI < 0 { - return fmt.Errorf("int64 negative overflow") - } - extraI = -1 - extraI - default: - return fmt.Errorf("wrong type for int64 field: %d", maj) - } - - t.CommentId = (*int64)(&extraI) - } - } - // t.CreatedAt (string) (string) - case "createdAt": + // t.Branch (string) (string) + case "branch": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -7726,7 +7393,7 @@ func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.CreatedAt = string(sval) + t.Branch = string(sval) } default: @@ -7739,16 +7406,20 @@ func (t *RepoPullComment) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoPull_Source) MarshalCBOR(w io.Writer) error { +func (t *RepoPull) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) - fieldCount := 3 + fieldCount := 9 - if t.Repo == nil { + if t.Body == nil { + fieldCount-- + } + + if t.Source == nil { fieldCount-- } @@ -7756,88 +7427,217 @@ func (t *RepoPull_Source) MarshalCBOR(w io.Writer) error { return err } - // t.Sha (string) (string) - if len("sha") > 1000000 { - return xerrors.Errorf("Value in field \"sha\" was too long") + // t.Body (string) (string) + if t.Body != nil { + + if len("body") > 1000000 { + return xerrors.Errorf("Value in field \"body\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { + return err + } + if _, err := cw.WriteString(string("body")); err != nil { + return err + } + + if t.Body == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Body) > 1000000 { + return xerrors.Errorf("Value in field t.Body was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Body))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Body)); err != nil { + return err + } + } } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sha"))); err != nil { + // t.LexiconTypeID (string) (string) + if len("$type") > 1000000 { + return xerrors.Errorf("Value in field \"$type\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { return err } - if _, err := cw.WriteString(string("sha")); err != nil { + if _, err := cw.WriteString(string("$type")); err != nil { return err } - if len(t.Sha) > 1000000 { - return xerrors.Errorf("Value in field t.Sha was too long") + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull"))); err != nil { + return err + } + if _, err := cw.WriteString(string("sh.tangled.repo.pull")); err != nil { + return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Sha))); err != nil { + // t.Patch (string) (string) + if len("patch") > 1000000 { + return xerrors.Errorf("Value in field \"patch\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patch"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Sha)); err != nil { + if _, err := cw.WriteString(string("patch")); err != nil { return err } - // t.Repo (string) (string) - if t.Repo != nil { + if len(t.Patch) > 1000000 { + return xerrors.Errorf("Value in field t.Patch was too long") + } - if len("repo") > 1000000 { - return xerrors.Errorf("Value in field \"repo\" was too long") - } + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Patch))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Patch)); err != nil { + return err + } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { + // t.Title (string) (string) + if len("title") > 1000000 { + return xerrors.Errorf("Value in field \"title\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("title"))); err != nil { + return err + } + if _, err := cw.WriteString(string("title")); err != nil { + return err + } + + if len(t.Title) > 1000000 { + return xerrors.Errorf("Value in field t.Title was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Title))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Title)); err != nil { + return err + } + + // t.PullId (int64) (int64) + if len("pullId") > 1000000 { + return xerrors.Errorf("Value in field \"pullId\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pullId"))); err != nil { + return err + } + if _, err := cw.WriteString(string("pullId")); err != nil { + return err + } + + if t.PullId >= 0 { + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.PullId)); err != nil { return err } - if _, err := cw.WriteString(string("repo")); err != nil { + } else { + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.PullId-1)); err != nil { return err } + } - if t.Repo == nil { - if _, err := cw.Write(cbg.CborNull); err != nil { - return err - } - } else { - if len(*t.Repo) > 1000000 { - return xerrors.Errorf("Value in field t.Repo was too long") - } + // t.Source (tangled.RepoPull_Source) (struct) + if t.Source != nil { - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { - return err - } - if _, err := cw.WriteString(string(*t.Repo)); err != nil { - return err - } + if len("source") > 1000000 { + return xerrors.Errorf("Value in field \"source\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("source"))); err != nil { + return err + } + if _, err := cw.WriteString(string("source")); err != nil { + return err + } + + if err := t.Source.MarshalCBOR(cw); err != nil { + return err } } - // t.Branch (string) (string) - if len("branch") > 1000000 { - return xerrors.Errorf("Value in field \"branch\" was too long") + // t.CreatedAt (string) (string) + if len("createdAt") > 1000000 { + return xerrors.Errorf("Value in field \"createdAt\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("branch"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { return err } - if _, err := cw.WriteString(string("branch")); err != nil { + if _, err := cw.WriteString(string("createdAt")); err != nil { return err } - if len(t.Branch) > 1000000 { - return xerrors.Errorf("Value in field t.Branch was too long") + if len(t.CreatedAt) > 1000000 { + return xerrors.Errorf("Value in field t.CreatedAt was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Branch))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { return err } - if _, err := cw.WriteString(string(t.Branch)); err != nil { + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { + return err + } + + // t.TargetRepo (string) (string) + if len("targetRepo") > 1000000 { + return xerrors.Errorf("Value in field \"targetRepo\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("targetRepo"))); err != nil { + return err + } + if _, err := cw.WriteString(string("targetRepo")); err != nil { + return err + } + + if len(t.TargetRepo) > 1000000 { + return xerrors.Errorf("Value in field t.TargetRepo was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.TargetRepo))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.TargetRepo)); err != nil { + return err + } + + // t.TargetBranch (string) (string) + if len("targetBranch") > 1000000 { + return xerrors.Errorf("Value in field \"targetBranch\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("targetBranch"))); err != nil { + return err + } + if _, err := cw.WriteString(string("targetBranch")); err != nil { + return err + } + + if len(t.TargetBranch) > 1000000 { + return xerrors.Errorf("Value in field t.TargetBranch was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.TargetBranch))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.TargetBranch)); err != nil { return err } return nil } -func (t *RepoPull_Source) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoPull_Source{} +func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoPull{} cr := cbg.NewCborReader(r) @@ -7856,29 +7656,129 @@ func (t *RepoPull_Source) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("RepoPull_Source: map struct too large (%d)", extra) + return fmt.Errorf("RepoPull: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 6) + nameBuf := make([]byte, 12) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { return err } - if !ok { - // Field doesn't exist on this type, so ignore it - if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { - return err + if !ok { + // Field doesn't exist on this type, so ignore it + if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { + return err + } + continue + } + + switch string(nameBuf[:nameLen]) { + // t.Body (string) (string) + case "body": + + { + 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.Body = (*string)(&sval) + } + } + // t.LexiconTypeID (string) (string) + case "$type": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.LexiconTypeID = string(sval) + } + // t.Patch (string) (string) + case "patch": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Patch = string(sval) + } + // t.Title (string) (string) + case "title": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Title = string(sval) + } + // t.PullId (int64) (int64) + case "pullId": + { + maj, extra, err := cr.ReadHeader() + if err != nil { + return err + } + var extraI int64 + switch maj { + case cbg.MajUnsignedInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 positive overflow") + } + case cbg.MajNegativeInt: + extraI = int64(extra) + if extraI < 0 { + return fmt.Errorf("int64 negative overflow") + } + extraI = -1 - extraI + default: + return fmt.Errorf("wrong type for int64 field: %d", maj) + } + + t.PullId = int64(extraI) + } + // t.Source (tangled.RepoPull_Source) (struct) + case "source": + + { + + b, err := cr.ReadByte() + if err != nil { + return err + } + if b != cbg.CborNull[0] { + if err := cr.UnreadByte(); err != nil { + return err + } + t.Source = new(RepoPull_Source) + if err := t.Source.UnmarshalCBOR(cr); err != nil { + return xerrors.Errorf("unmarshaling t.Source pointer: %w", err) + } + } + } - continue - } - - switch string(nameBuf[:nameLen]) { - // t.Sha (string) (string) - case "sha": + // t.CreatedAt (string) (string) + case "createdAt": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -7886,31 +7786,21 @@ func (t *RepoPull_Source) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Sha = string(sval) + t.CreatedAt = string(sval) } - // t.Repo (string) (string) - case "repo": + // t.TargetRepo (string) (string) + case "targetRepo": { - 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.Repo = (*string)(&sval) - } + t.TargetRepo = string(sval) } - // t.Branch (string) (string) - case "branch": + // t.TargetBranch (string) (string) + case "targetBranch": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -7918,7 +7808,7 @@ func (t *RepoPull_Source) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Branch = string(sval) + t.TargetBranch = string(sval) } default: @@ -7931,38 +7821,74 @@ func (t *RepoPull_Source) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *RepoPullStatus) MarshalCBOR(w io.Writer) error { +func (t *Repo) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err } cw := cbg.NewCborWriter(w) + fieldCount := 8 - if _, err := cw.Write([]byte{163}); err != nil { + if t.Description == nil { + fieldCount-- + } + + if t.Source == nil { + fieldCount-- + } + + if t.Spindle == nil { + fieldCount-- + } + + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { return err } - // t.Pull (string) (string) - if len("pull") > 1000000 { - return xerrors.Errorf("Value in field \"pull\" was too long") + // t.Knot (string) (string) + if len("knot") > 1000000 { + return xerrors.Errorf("Value in field \"knot\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("pull"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("knot"))); err != nil { return err } - if _, err := cw.WriteString(string("pull")); err != nil { + if _, err := cw.WriteString(string("knot")); err != nil { return err } - if len(t.Pull) > 1000000 { - return xerrors.Errorf("Value in field t.Pull was too long") + if len(t.Knot) > 1000000 { + return xerrors.Errorf("Value in field t.Knot was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Pull))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Knot))); err != nil { return err } - if _, err := cw.WriteString(string(t.Pull)); err != nil { + if _, err := cw.WriteString(string(t.Knot)); err != nil { + return err + } + + // t.Name (string) (string) + if len("name") > 1000000 { + return xerrors.Errorf("Value in field \"name\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("name"))); err != nil { + return err + } + if _, err := cw.WriteString(string("name")); err != nil { + return err + } + + if len(t.Name) > 1000000 { + return xerrors.Errorf("Value in field t.Name was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Name)); err != nil { return err } @@ -7978,40 +7904,159 @@ func (t *RepoPullStatus) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull.status"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.repo.pull.status")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo")); err != nil { return err } - // t.Status (string) (string) - if len("status") > 1000000 { - return xerrors.Errorf("Value in field \"status\" was too long") + // t.Owner (string) (string) + if len("owner") > 1000000 { + return xerrors.Errorf("Value in field \"owner\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("status"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { return err } - if _, err := cw.WriteString(string("status")); err != nil { + if _, err := cw.WriteString(string("owner")); err != nil { return err } - if len(t.Status) > 1000000 { - return xerrors.Errorf("Value in field t.Status was too long") + if len(t.Owner) > 1000000 { + return xerrors.Errorf("Value in field t.Owner was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Status))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Owner))); err != nil { return err } - if _, err := cw.WriteString(string(t.Status)); err != nil { + if _, err := cw.WriteString(string(t.Owner)); err != nil { + return err + } + + // t.Source (string) (string) + if t.Source != nil { + + if len("source") > 1000000 { + return xerrors.Errorf("Value in field \"source\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("source"))); err != nil { + return err + } + if _, err := cw.WriteString(string("source")); err != nil { + return err + } + + if t.Source == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Source) > 1000000 { + return xerrors.Errorf("Value in field t.Source was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Source))); err != nil { + 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 + } + } + } + + // t.CreatedAt (string) (string) + if len("createdAt") > 1000000 { + return xerrors.Errorf("Value in field \"createdAt\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { + return err + } + if _, err := cw.WriteString(string("createdAt")); err != nil { + return err + } + + if len(t.CreatedAt) > 1000000 { + return xerrors.Errorf("Value in field t.CreatedAt was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { return err } + + // t.Description (string) (string) + if t.Description != nil { + + if len("description") > 1000000 { + return xerrors.Errorf("Value in field \"description\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("description"))); err != nil { + return err + } + if _, err := cw.WriteString(string("description")); err != nil { + return err + } + + if t.Description == nil { + if _, err := cw.Write(cbg.CborNull); err != nil { + return err + } + } else { + if len(*t.Description) > 1000000 { + return xerrors.Errorf("Value in field t.Description was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Description))); err != nil { + return err + } + if _, err := cw.WriteString(string(*t.Description)); err != nil { + return err + } + } + } return nil } -func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoPullStatus{} +func (t *Repo) UnmarshalCBOR(r io.Reader) (err error) { + *t = Repo{} cr := cbg.NewCborReader(r) @@ -8030,12 +8075,12 @@ func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("RepoPullStatus: map struct too large (%d)", extra) + return fmt.Errorf("Repo: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 6) + nameBuf := make([]byte, 11) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -8050,9 +8095,20 @@ func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { continue } - switch string(nameBuf[:nameLen]) { - // t.Pull (string) (string) - case "pull": + switch string(nameBuf[:nameLen]) { + // t.Knot (string) (string) + case "knot": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Knot = string(sval) + } + // t.Name (string) (string) + case "name": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -8060,7 +8116,7 @@ func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Pull = string(sval) + t.Name = string(sval) } // t.LexiconTypeID (string) (string) case "$type": @@ -8073,8 +8129,8 @@ func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Status (string) (string) - case "status": + // t.Owner (string) (string) + case "owner": { sval, err := cbg.ReadStringWithMax(cr, 1000000) @@ -8082,7 +8138,81 @@ func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { return err } - t.Status = string(sval) + t.Owner = string(sval) + } + // t.Source (string) (string) + case "source": + + { + 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.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": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.CreatedAt = string(sval) + } + // t.Description (string) (string) + case "description": + + { + 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.Description = (*string)(&sval) + } } default: @@ -8095,7 +8225,7 @@ func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *Spindle) MarshalCBOR(w io.Writer) error { +func (t *SpindleMember) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -8103,7 +8233,7 @@ func (t *Spindle) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{162}); err != nil { + if _, err := cw.Write([]byte{164}); err != nil { return err } @@ -8119,10 +8249,56 @@ func (t *Spindle) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.spindle"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.spindle.member"))); err != nil { return err } - if _, err := cw.WriteString(string("sh.tangled.spindle")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.spindle.member")); err != nil { + return err + } + + // t.Subject (string) (string) + if len("subject") > 1000000 { + return xerrors.Errorf("Value in field \"subject\" was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { + return err + } + if _, err := cw.WriteString(string("subject")); err != nil { + return err + } + + if len(t.Subject) > 1000000 { + return xerrors.Errorf("Value in field t.Subject was too long") + } + + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil { + return err + } + if _, err := cw.WriteString(string(t.Subject)); err != nil { + return err + } + + // t.Instance (string) (string) + 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 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 } @@ -8151,8 +8327,8 @@ func (t *Spindle) MarshalCBOR(w io.Writer) error { return nil } -func (t *Spindle) UnmarshalCBOR(r io.Reader) (err error) { - *t = Spindle{} +func (t *SpindleMember) UnmarshalCBOR(r io.Reader) (err error) { + *t = SpindleMember{} cr := cbg.NewCborReader(r) @@ -8171,7 +8347,7 @@ func (t *Spindle) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("Spindle: map struct too large (%d)", extra) + return fmt.Errorf("SpindleMember: map struct too large (%d)", extra) } n := extra @@ -8203,6 +8379,28 @@ func (t *Spindle) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } + // t.Subject (string) (string) + case "subject": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Subject = string(sval) + } + // t.Instance (string) (string) + case "instance": + + { + sval, err := cbg.ReadStringWithMax(cr, 1000000) + if err != nil { + return err + } + + t.Instance = string(sval) + } // t.CreatedAt (string) (string) case "createdAt": @@ -8225,7 +8423,7 @@ func (t *Spindle) UnmarshalCBOR(r io.Reader) (err error) { return nil } -func (t *SpindleMember) MarshalCBOR(w io.Writer) error { +func (t *Spindle) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -8233,7 +8431,7 @@ func (t *SpindleMember) MarshalCBOR(w io.Writer) error { cw := cbg.NewCborWriter(w) - if _, err := cw.Write([]byte{164}); err != nil { + if _, err := cw.Write([]byte{162}); err != nil { return err } @@ -8249,56 +8447,10 @@ func (t *SpindleMember) MarshalCBOR(w io.Writer) error { return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.spindle.member"))); err != nil { - return err - } - if _, err := cw.WriteString(string("sh.tangled.spindle.member")); err != nil { - return err - } - - // t.Subject (string) (string) - if len("subject") > 1000000 { - return xerrors.Errorf("Value in field \"subject\" was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { - return err - } - if _, err := cw.WriteString(string("subject")); err != nil { - return err - } - - if len(t.Subject) > 1000000 { - return xerrors.Errorf("Value in field t.Subject was too long") - } - - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil { - return err - } - if _, err := cw.WriteString(string(t.Subject)); err != nil { - return err - } - - // t.Instance (string) (string) - 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 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 { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.spindle"))); err != nil { return err } - if _, err := cw.WriteString(string(t.Instance)); err != nil { + if _, err := cw.WriteString(string("sh.tangled.spindle")); err != nil { return err } @@ -8327,8 +8479,8 @@ func (t *SpindleMember) MarshalCBOR(w io.Writer) error { return nil } -func (t *SpindleMember) UnmarshalCBOR(r io.Reader) (err error) { - *t = SpindleMember{} +func (t *Spindle) UnmarshalCBOR(r io.Reader) (err error) { + *t = Spindle{} cr := cbg.NewCborReader(r) @@ -8347,7 +8499,7 @@ func (t *SpindleMember) UnmarshalCBOR(r io.Reader) (err error) { } if extra > cbg.MaxLength { - return fmt.Errorf("SpindleMember: map struct too large (%d)", extra) + return fmt.Errorf("Spindle: map struct too large (%d)", extra) } n := extra @@ -8379,28 +8531,6 @@ func (t *SpindleMember) UnmarshalCBOR(r io.Reader) (err error) { t.LexiconTypeID = string(sval) } - // t.Subject (string) (string) - case "subject": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Subject = string(sval) - } - // t.Instance (string) (string) - case "instance": - - { - sval, err := cbg.ReadStringWithMax(cr, 1000000) - if err != nil { - return err - } - - t.Instance = string(sval) - } // t.CreatedAt (string) (string) case "createdAt": diff --git a/api/tangled/tangledknot.go b/api/tangled/tangledknot.go new file mode 100644 index 0000000..f8b8067 --- /dev/null +++ b/api/tangled/tangledknot.go @@ -0,0 +1,22 @@ +// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. + +package tangled + +// schema: sh.tangled.knot + +import ( + "github.com/bluesky-social/indigo/lex/util" +) + +const ( + KnotNSID = "sh.tangled.knot" +) + +func init() { + util.RegisterType("sh.tangled.knot", &Knot{}) +} // +// RECORDTYPE: Knot +type Knot struct { + LexiconTypeID string `json:"$type,const=sh.tangled.knot" cborgen:"$type,const=sh.tangled.knot"` + CreatedAt string `json:"createdAt" cborgen:"createdAt"` +} diff --git a/cmd/gen.go b/cmd/gen.go index 2e07c0e..35d1738 100644 --- a/cmd/gen.go +++ b/cmd/gen.go @@ -17,39 +17,40 @@ func main() { tangled.ActorProfile{}, tangled.FeedReaction{}, tangled.FeedStar{}, - tangled.GitRefUpdate{}, - tangled.GitRefUpdate_Meta{}, - tangled.GitRefUpdate_Meta_CommitCount{}, tangled.GitRefUpdate_Meta_CommitCount_ByEmail_Elem{}, + tangled.GitRefUpdate_Meta_CommitCount{}, tangled.GitRefUpdate_Meta_LangBreakdown{}, + tangled.GitRefUpdate_Meta{}, tangled.GitRefUpdate_Pair{}, + tangled.GitRefUpdate{}, tangled.GraphFollow{}, tangled.KnotMember{}, - tangled.Pipeline{}, + tangled.Knot{}, + tangled.PipelineStatus{}, tangled.Pipeline_CloneOpts{}, tangled.Pipeline_Dependency{}, tangled.Pipeline_ManualTriggerData{}, tangled.Pipeline_Pair{}, tangled.Pipeline_PullRequestTriggerData{}, tangled.Pipeline_PushTriggerData{}, - tangled.PipelineStatus{}, tangled.Pipeline_Step{}, tangled.Pipeline_TriggerMetadata{}, tangled.Pipeline_TriggerRepo{}, tangled.Pipeline_Workflow{}, + tangled.Pipeline{}, tangled.PublicKey{}, - tangled.Repo{}, tangled.RepoArtifact{}, tangled.RepoCollaborator{}, - tangled.RepoIssue{}, tangled.RepoIssueComment{}, tangled.RepoIssueState{}, - tangled.RepoPull{}, + tangled.RepoIssue{}, tangled.RepoPullComment{}, - tangled.RepoPull_Source{}, tangled.RepoPullStatus{}, - tangled.Spindle{}, + tangled.RepoPull_Source{}, + tangled.RepoPull{}, + tangled.Repo{}, tangled.SpindleMember{}, + tangled.Spindle{}, tangled.String{}, ); err != nil { panic(err) diff --git a/lexicons/knot.json b/lexicons/knot.json new file mode 100644 index 0000000..aeadf87 --- /dev/null +++ b/lexicons/knot.json @@ -0,0 +1,22 @@ +{ + "lexicon": 1, + "id": "sh.tangled.knot", + "needsCbor": true, + "needsType": true, + "defs": { + "main": { + "type": "record", + "key": "any", + "record": { + "type": "object", + "required": ["createdAt"], + "properties": { + "createdAt": { + "type": "string", + "format": "datetime" + } + } + } + } + } +}