diff --git a/api/tangled/cbor_gen.go b/api/tangled/cbor_gen.go --- a/api/tangled/cbor_gen.go +++ b/api/tangled/cbor_gen.go @@ -2059,14 +2059,14 @@ return nil } -func (t *RepoPullPatch) 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 := 8 + fieldCount := 9 if t.Body == nil { fieldCount-- @@ -2128,10 +2128,10 @@ return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull.patch"))); err != nil { + 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.patch")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo.pull")); err != nil { return err } @@ -2289,11 +2289,34 @@ 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 *RepoPullPatch) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoPullPatch{} +func (t *RepoPull) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoPull{} cr := cbg.NewCborReader(r) @@ -2312,12 +2335,12 @@ } if extra > cbg.MaxLength { - return fmt.Errorf("RepoPullPatch: map struct too large (%d)", extra) + return fmt.Errorf("RepoPull: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 10) + nameBuf := make([]byte, 12) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2466,6 +2489,17 @@ 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 @@ -2477,7 +2511,7 @@ return nil } -func (t *RepoPullState) MarshalCBOR(w io.Writer) error { +func (t *RepoPullStatus) MarshalCBOR(w io.Writer) error { if t == nil { _, err := w.Write(cbg.CborNull) return err @@ -2486,7 +2520,7 @@ cw := cbg.NewCborWriter(w) fieldCount := 3 - if t.State == nil { + if t.Status == nil { fieldCount-- } @@ -2529,40 +2563,40 @@ return err } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.repo.pull.state"))); err != nil { + 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.state")); err != nil { + if _, err := cw.WriteString(string("sh.tangled.repo.pull.status")); err != nil { return err } - // t.State (string) (string) - if t.State != nil { + // t.Status (string) (string) + if t.Status != nil { - if len("state") > 1000000 { - return xerrors.Errorf("Value in field \"state\" was too long") + if len("status") > 1000000 { + return xerrors.Errorf("Value in field \"status\" was too long") } - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("state"))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("status"))); err != nil { return err } - if _, err := cw.WriteString(string("state")); err != nil { + if _, err := cw.WriteString(string("status")); err != nil { return err } - if t.State == nil { + if t.Status == nil { if _, err := cw.Write(cbg.CborNull); err != nil { return err } } else { - if len(*t.State) > 1000000 { - return xerrors.Errorf("Value in field t.State 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.State))); err != nil { + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Status))); err != nil { return err } - if _, err := cw.WriteString(string(*t.State)); err != nil { + if _, err := cw.WriteString(string(*t.Status)); err != nil { return err } } @@ -2570,8 +2604,8 @@ return nil } -func (t *RepoPullState) UnmarshalCBOR(r io.Reader) (err error) { - *t = RepoPullState{} +func (t *RepoPullStatus) UnmarshalCBOR(r io.Reader) (err error) { + *t = RepoPullStatus{} cr := cbg.NewCborReader(r) @@ -2590,12 +2624,12 @@ } if extra > cbg.MaxLength { - return fmt.Errorf("RepoPullState: map struct too large (%d)", extra) + return fmt.Errorf("RepoPullStatus: map struct too large (%d)", extra) } n := extra - nameBuf := make([]byte, 5) + nameBuf := make([]byte, 6) for i := uint64(0); i < n; i++ { nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) if err != nil { @@ -2633,8 +2667,8 @@ t.LexiconTypeID = string(sval) } - // t.State (string) (string) - case "state": + // t.Status (string) (string) + case "status": { b, err := cr.ReadByte() @@ -2651,7 +2685,7 @@ return err } - t.State = (*string)(&sval) + t.Status = (*string)(&sval) } } diff --git a/api/tangled/pullcomment.go b/api/tangled/pullcomment.go --- a/api/tangled/pullcomment.go +++ b/api/tangled/pullcomment.go @@ -5,7 +5,7 @@ // schema: sh.tangled.repo.pull.comment import ( - //"github.com/bluesky-social/indigo/lex/util" + "github.com/bluesky-social/indigo/lex/util" ) const ( @@ -13,7 +13,7 @@ ) func init() { - //util.RegisterType("sh.tangled.repo.pull.comment", &RepoPullComment{}) + util.RegisterType("sh.tangled.repo.pull.comment", &RepoPullComment{}) } // // RECORDTYPE: RepoPullComment type RepoPullComment struct { diff --git a/api/tangled/pullpatch.go b/api/tangled/pullpatch.go deleted file mode 100644 --- a/api/tangled/pullpatch.go +++ /dev/null @@ -1,28 +0,0 @@ -// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. - -package tangled - -// schema: sh.tangled.repo.pull.patch - -import ( - "github.com/bluesky-social/indigo/lex/util" -) - -const ( - RepoPullPatchNSID = "sh.tangled.repo.pull.patch" -) - -func init() { - util.RegisterType("sh.tangled.repo.pull.patch", &RepoPullPatch{}) -} // -// RECORDTYPE: RepoPullPatch -type RepoPullPatch struct { - LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull.patch" cborgen:"$type,const=sh.tangled.repo.pull.patch"` - Body *string `json:"body,omitempty" cborgen:"body,omitempty"` - CreatedAt *string `json:"createdAt,omitempty" cborgen:"createdAt,omitempty"` - Patch string `json:"patch" cborgen:"patch"` - PullId int64 `json:"pullId" cborgen:"pullId"` - SourceRepo *string `json:"sourceRepo,omitempty" cborgen:"sourceRepo,omitempty"` - TargetRepo string `json:"targetRepo" cborgen:"targetRepo"` - Title string `json:"title" cborgen:"title"` -} diff --git a/api/tangled/pullstate.go b/api/tangled/pullstate.go deleted file mode 100644 --- a/api/tangled/pullstate.go +++ /dev/null @@ -1,24 +0,0 @@ -// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. - -package tangled - -// schema: sh.tangled.repo.pull.state - -import ( - //"github.com/bluesky-social/indigo/lex/util" -) - -const ( - RepoPullStateNSID = "sh.tangled.repo.pull.state" -) - -func init() { - //util.RegisterType("sh.tangled.repo.pull.state", &RepoPullState{}) -} // -// RECORDTYPE: RepoPullState -type RepoPullState struct { - LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull.state" cborgen:"$type,const=sh.tangled.repo.pull.state"` - Pull string `json:"pull" cborgen:"pull"` - // state: state of the pull request - State *string `json:"state,omitempty" cborgen:"state,omitempty"` -} diff --git a/api/tangled/pullstatus.go b/api/tangled/pullstatus.go new file mode 100644 --- /dev/null +++ b/api/tangled/pullstatus.go @@ -0,0 +1,24 @@ +// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. + +package tangled + +// schema: sh.tangled.repo.pull.status + +import ( + "github.com/bluesky-social/indigo/lex/util" +) + +const ( + RepoPullStatusNSID = "sh.tangled.repo.pull.status" +) + +func init() { + util.RegisterType("sh.tangled.repo.pull.status", &RepoPullStatus{}) +} // +// RECORDTYPE: RepoPullStatus +type RepoPullStatus struct { + LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull.status" cborgen:"$type,const=sh.tangled.repo.pull.status"` + Pull string `json:"pull" cborgen:"pull"` + // status: status of the pull request + Status *string `json:"status,omitempty" cborgen:"status,omitempty"` +} diff --git a/api/tangled/repopull.go b/api/tangled/repopull.go new file mode 100644 --- /dev/null +++ b/api/tangled/repopull.go @@ -0,0 +1,29 @@ +// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. + +package tangled + +// schema: sh.tangled.repo.pull + +import ( + "github.com/bluesky-social/indigo/lex/util" +) + +const ( + RepoPullNSID = "sh.tangled.repo.pull" +) + +func init() { + util.RegisterType("sh.tangled.repo.pull", &RepoPull{}) +} // +// RECORDTYPE: RepoPull +type RepoPull struct { + LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"` + Body *string `json:"body,omitempty" cborgen:"body,omitempty"` + CreatedAt *string `json:"createdAt,omitempty" cborgen:"createdAt,omitempty"` + Patch string `json:"patch" cborgen:"patch"` + PullId int64 `json:"pullId" cborgen:"pullId"` + SourceRepo *string `json:"sourceRepo,omitempty" cborgen:"sourceRepo,omitempty"` + TargetBranch string `json:"targetBranch" cborgen:"targetBranch"` + TargetRepo string `json:"targetRepo" cborgen:"targetRepo"` + Title string `json:"title" cborgen:"title"` +} diff --git a/api/tangled/stateclosed.go b/api/tangled/stateclosed.go --- a/api/tangled/stateclosed.go +++ b/api/tangled/stateclosed.go @@ -2,8 +2,8 @@ package tangled -// schema: sh.tangled.repo.pull.state.closed +// schema: sh.tangled.repo.issue.state.closed const () -const RepoPullStateClosed = "sh.tangled.repo.pull.state.closed" +const RepoIssueStateClosed = "sh.tangled.repo.issue.state.closed" diff --git a/api/tangled/statemerged.go b/api/tangled/statemerged.go deleted file mode 100644 --- a/api/tangled/statemerged.go +++ /dev/null @@ -1,9 +0,0 @@ -// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. - -package tangled - -// schema: sh.tangled.repo.pull.state.merged - -const () - -const RepoPullStateMerged = "sh.tangled.repo.pull.state.merged" diff --git a/api/tangled/stateopen.go b/api/tangled/stateopen.go --- a/api/tangled/stateopen.go +++ b/api/tangled/stateopen.go @@ -2,8 +2,8 @@ package tangled -// schema: sh.tangled.repo.pull.state.open +// schema: sh.tangled.repo.issue.state.open const () -const RepoPullStateOpen = "sh.tangled.repo.pull.state.open" +const RepoIssueStateOpen = "sh.tangled.repo.issue.state.open" diff --git a/api/tangled/statusclosed.go b/api/tangled/statusclosed.go new file mode 100644 --- /dev/null +++ b/api/tangled/statusclosed.go @@ -0,0 +1,9 @@ +// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. + +package tangled + +// schema: sh.tangled.repo.pull.status.closed + +const () + +const RepoPullStatusClosed = "sh.tangled.repo.pull.status.closed" diff --git a/api/tangled/statusmerged.go b/api/tangled/statusmerged.go new file mode 100644 --- /dev/null +++ b/api/tangled/statusmerged.go @@ -0,0 +1,9 @@ +// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. + +package tangled + +// schema: sh.tangled.repo.pull.status.merged + +const () + +const RepoPullStatusMerged = "sh.tangled.repo.pull.status.merged" diff --git a/api/tangled/statusopen.go b/api/tangled/statusopen.go new file mode 100644 --- /dev/null +++ b/api/tangled/statusopen.go @@ -0,0 +1,9 @@ +// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. + +package tangled + +// schema: sh.tangled.repo.pull.status.open + +const () + +const RepoPullStatusOpen = "sh.tangled.repo.pull.status.open" diff --git a/lexicons/pulls/closed.json b/lexicons/pulls/closed.json --- a/lexicons/pulls/closed.json +++ b/lexicons/pulls/closed.json @@ -1,6 +1,6 @@ { "lexicon": 1, - "id": "sh.tangled.repo.pull.state.closed", + "id": "sh.tangled.repo.pull.status.closed", "needsCbor": true, "needsType": true, "defs": { diff --git a/lexicons/pulls/merged.json b/lexicons/pulls/merged.json --- a/lexicons/pulls/merged.json +++ b/lexicons/pulls/merged.json @@ -1,6 +1,6 @@ { "lexicon": 1, - "id": "sh.tangled.repo.pull.state.merged", + "id": "sh.tangled.repo.pull.status.merged", "needsCbor": true, "needsType": true, "defs": { diff --git a/lexicons/pulls/open.json b/lexicons/pulls/open.json --- a/lexicons/pulls/open.json +++ b/lexicons/pulls/open.json @@ -1,6 +1,6 @@ { "lexicon": 1, - "id": "sh.tangled.repo.pull.state.open", + "id": "sh.tangled.repo.pull.status.open", "needsCbor": true, "needsType": true, "defs": { diff --git a/lexicons/pulls/patch.json b/lexicons/pulls/patch.json deleted file mode 100644 --- a/lexicons/pulls/patch.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "lexicon": 1, - "id": "sh.tangled.repo.pull.patch", - "needsCbor": true, - "needsType": true, - "defs": { - "main": { - "type": "record", - "key": "tid", - "record": { - "type": "object", - "required": ["targetRepo", "pullId", "title", "patch"], - "properties": { - "targetRepo": { - "type": "string", - "format": "at-uri" - }, - "sourceRepo": { - "type": "string", - "format": "at-uri" - }, - "pullId": { - "type": "integer" - }, - "title": { - "type": "string" - }, - "body": { - "type": "string" - }, - "createdAt": { - "type": "string", - "format": "datetime" - }, - "patch": { - "type": "string" - } - } - } - } - } -} diff --git a/lexicons/pulls/pull.json b/lexicons/pulls/pull.json new file mode 100644 --- /dev/null +++ b/lexicons/pulls/pull.json @@ -0,0 +1,45 @@ +{ + "lexicon": 1, + "id": "sh.tangled.repo.pull", + "needsCbor": true, + "needsType": true, + "defs": { + "main": { + "type": "record", + "key": "tid", + "record": { + "type": "object", + "required": ["targetRepo", "targetBranch", "pullId", "title", "patch"], + "properties": { + "targetRepo": { + "type": "string", + "format": "at-uri" + }, + "targetBranch": { + "type": "string" + }, + "sourceRepo": { + "type": "string", + "format": "at-uri" + }, + "pullId": { + "type": "integer" + }, + "title": { + "type": "string" + }, + "body": { + "type": "string" + }, + "createdAt": { + "type": "string", + "format": "datetime" + }, + "patch": { + "type": "string" + } + } + } + } + } +} diff --git a/lexicons/pulls/state.json b/lexicons/pulls/state.json --- a/lexicons/pulls/state.json +++ b/lexicons/pulls/state.json @@ -1,6 +1,6 @@ { "lexicon": 1, - "id": "sh.tangled.repo.pull.state", + "id": "sh.tangled.repo.pull.status", "needsCbor": true, "needsType": true, "defs": { @@ -15,15 +15,15 @@ "type": "string", "format": "at-uri" }, - "state": { + "status": { "type": "string", - "description": "state of the pull request", + "description": "status of the pull request", "knownValues": [ - "sh.tangled.repo.pull.state.open", - "sh.tangled.repo.pull.state.closed", - "sh.tangled.repo.pull.state.merged" + "sh.tangled.repo.pull.status.open", + "sh.tangled.repo.pull.status.closed", + "sh.tangled.repo.pull.status.merged" ], - "default": "sh.tangled.repo.pull.state.open" + "default": "sh.tangled.repo.pull.status.open" } } }