From 31e751895063e77d29f7a58e7a7f7fca29936eb5 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Sat, 11 Jan 2025 16:46:22 -0500 Subject: [PATCH] various updates I'm bad at remembering to commit Signed-off-by: Xe Iaso --- Brewfile | 2 + buf/external/jsonfeed/jsonfeed.pb.go | 92 ++-------- buf/future-sight/future-sight.pb.go | 26 +-- buf/mi/mi.pb.go | 246 +++++---------------------- buf/mimi/announce/announce.pb.go | 2 +- buf/mimi/statuspage/statuspage.pb.go | 158 ++++------------- buf/sanguisuga/sanguisuga.pb.go | 136 +++------------ bundler/bundler.go | 34 ++-- bundler/bundler_test.go | 5 +- docs/bsky/didweb/README.md | 2 + docs/bsky/didweb/didweb.tf | 2 +- docs/bsky/didweb/pds.tf | 18 +- go.mod | 16 +- go.sum | 26 +++ kube/alrest/gitea/runner.yaml | 2 +- kube/alrest/minio/pvc.yaml | 4 +- kube/runner-ci/Dockerfile | 2 +- kube/runner-ci/build.sh | 2 +- kube/runner-ci/daemon.json | 2 +- 19 files changed, 212 insertions(+), 565 deletions(-) diff --git a/Brewfile b/Brewfile index 888cbe34..a13fa42f 100644 --- a/Brewfile +++ b/Brewfile @@ -1,3 +1,4 @@ +tap "hashicorp/tap" tap "xe/pkgs" # programming languages @@ -33,6 +34,7 @@ brew "earthly" brew "pandoc" brew "jq" brew "jo" +brew "hashicorp/tap/terraform" # frontend tools brew "esbuild" diff --git a/buf/external/jsonfeed/jsonfeed.pb.go b/buf/external/jsonfeed/jsonfeed.pb.go index 0703abd3..a4970506 100644 --- a/buf/external/jsonfeed/jsonfeed.pb.go +++ b/buf/external/jsonfeed/jsonfeed.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: external/jsonfeed/jsonfeed.proto @@ -79,11 +79,9 @@ type Feed struct { func (x *Feed) Reset() { *x = Feed{} - if protoimpl.UnsafeEnabled { - mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Feed) String() string { @@ -94,7 +92,7 @@ func (*Feed) ProtoMessage() {} func (x *Feed) ProtoReflect() protoreflect.Message { mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -208,11 +206,9 @@ type Author struct { func (x *Author) Reset() { *x = Author{} - if protoimpl.UnsafeEnabled { - mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Author) String() string { @@ -223,7 +219,7 @@ func (*Author) ProtoMessage() {} func (x *Author) ProtoReflect() protoreflect.Message { mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -336,11 +332,9 @@ type Item struct { func (x *Item) Reset() { *x = Item{} - if protoimpl.UnsafeEnabled { - mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Item) String() string { @@ -351,7 +345,7 @@ func (*Item) ProtoMessage() {} func (x *Item) ProtoReflect() protoreflect.Message { mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -493,11 +487,9 @@ type Attachment struct { func (x *Attachment) Reset() { *x = Attachment{} - if protoimpl.UnsafeEnabled { - mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Attachment) String() string { @@ -508,7 +500,7 @@ func (*Attachment) ProtoMessage() {} func (x *Attachment) ProtoReflect() protoreflect.Message { mi := &file_external_jsonfeed_jsonfeed_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -680,56 +672,6 @@ func file_external_jsonfeed_jsonfeed_proto_init() { if File_external_jsonfeed_jsonfeed_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_external_jsonfeed_jsonfeed_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*Feed); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_external_jsonfeed_jsonfeed_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*Author); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_external_jsonfeed_jsonfeed_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*Item); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_external_jsonfeed_jsonfeed_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*Attachment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/buf/future-sight/future-sight.pb.go b/buf/future-sight/future-sight.pb.go index 4c2b93ff..c3af9234 100644 --- a/buf/future-sight/future-sight.pb.go +++ b/buf/future-sight/future-sight.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: future-sight/future-sight.proto @@ -30,11 +30,9 @@ type NewVersion struct { func (x *NewVersion) Reset() { *x = NewVersion{} - if protoimpl.UnsafeEnabled { - mi := &file_future_sight_future_sight_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_future_sight_future_sight_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NewVersion) String() string { @@ -45,7 +43,7 @@ func (*NewVersion) ProtoMessage() {} func (x *NewVersion) ProtoReflect() protoreflect.Message { mi := &file_future_sight_future_sight_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -110,20 +108,6 @@ func file_future_sight_future_sight_proto_init() { if File_future_sight_future_sight_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_future_sight_future_sight_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*NewVersion); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/buf/mi/mi.pb.go b/buf/mi/mi.pb.go index 1e673738..b23f9d6b 100644 --- a/buf/mi/mi.pb.go +++ b/buf/mi/mi.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: mi/mi.proto @@ -32,11 +32,9 @@ type MembersResp struct { func (x *MembersResp) Reset() { *x = MembersResp{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MembersResp) String() string { @@ -47,7 +45,7 @@ func (*MembersResp) ProtoMessage() {} func (x *MembersResp) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -81,11 +79,9 @@ type Member struct { func (x *Member) Reset() { *x = Member{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Member) String() string { @@ -96,7 +92,7 @@ func (*Member) ProtoMessage() {} func (x *Member) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -145,11 +141,9 @@ type Switch struct { func (x *Switch) Reset() { *x = Switch{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Switch) String() string { @@ -160,7 +154,7 @@ func (*Switch) ProtoMessage() {} func (x *Switch) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -213,11 +207,9 @@ type SwitchReq struct { func (x *SwitchReq) Reset() { *x = SwitchReq{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SwitchReq) String() string { @@ -228,7 +220,7 @@ func (*SwitchReq) ProtoMessage() {} func (x *SwitchReq) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -261,11 +253,9 @@ type SwitchResp struct { func (x *SwitchResp) Reset() { *x = SwitchResp{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SwitchResp) String() string { @@ -276,7 +266,7 @@ func (*SwitchResp) ProtoMessage() {} func (x *SwitchResp) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -315,11 +305,9 @@ type GetSwitchReq struct { func (x *GetSwitchReq) Reset() { *x = GetSwitchReq{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetSwitchReq) String() string { @@ -330,7 +318,7 @@ func (*GetSwitchReq) ProtoMessage() {} func (x *GetSwitchReq) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -363,11 +351,9 @@ type FrontChange struct { func (x *FrontChange) Reset() { *x = FrontChange{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FrontChange) String() string { @@ -378,7 +364,7 @@ func (*FrontChange) ProtoMessage() {} func (x *FrontChange) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -418,11 +404,9 @@ type ListSwitchesReq struct { func (x *ListSwitchesReq) Reset() { *x = ListSwitchesReq{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListSwitchesReq) String() string { @@ -433,7 +417,7 @@ func (*ListSwitchesReq) ProtoMessage() {} func (x *ListSwitchesReq) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -472,11 +456,9 @@ type ListSwitchesResp struct { func (x *ListSwitchesResp) Reset() { *x = ListSwitchesResp{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListSwitchesResp) String() string { @@ -487,7 +469,7 @@ func (*ListSwitchesResp) ProtoMessage() {} func (x *ListSwitchesResp) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -535,11 +517,9 @@ type Event struct { func (x *Event) Reset() { *x = Event{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Event) String() string { @@ -550,7 +530,7 @@ func (*Event) ProtoMessage() {} func (x *Event) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -633,11 +613,9 @@ type EventFeed struct { func (x *EventFeed) Reset() { *x = EventFeed{} - if protoimpl.UnsafeEnabled { - mi := &file_mi_mi_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mi_mi_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EventFeed) String() string { @@ -648,7 +626,7 @@ func (*EventFeed) ProtoMessage() {} func (x *EventFeed) ProtoReflect() protoreflect.Message { mi := &file_mi_mi_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -854,140 +832,6 @@ func file_mi_mi_proto_init() { if File_mi_mi_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_mi_mi_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*MembersResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*Member); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*Switch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*SwitchReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*SwitchResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*GetSwitchReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*FrontChange); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*ListSwitchesReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*ListSwitchesResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*Event); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mi_mi_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*EventFeed); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/buf/mimi/announce/announce.pb.go b/buf/mimi/announce/announce.pb.go index 46b23d62..e18a2e58 100644 --- a/buf/mimi/announce/announce.pb.go +++ b/buf/mimi/announce/announce.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: mimi/announce/announce.proto diff --git a/buf/mimi/statuspage/statuspage.pb.go b/buf/mimi/statuspage/statuspage.pb.go index dd3993da..5c4b4234 100644 --- a/buf/mimi/statuspage/statuspage.pb.go +++ b/buf/mimi/statuspage/statuspage.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: mimi/statuspage/statuspage.proto @@ -32,11 +32,9 @@ type Meta struct { func (x *Meta) Reset() { *x = Meta{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Meta) String() string { @@ -47,7 +45,7 @@ func (*Meta) ProtoMessage() {} func (x *Meta) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -88,11 +86,9 @@ type Page struct { func (x *Page) Reset() { *x = Page{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Page) String() string { @@ -103,7 +99,7 @@ func (*Page) ProtoMessage() {} func (x *Page) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -153,11 +149,9 @@ type ComponentUpdate struct { func (x *ComponentUpdate) Reset() { *x = ComponentUpdate{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ComponentUpdate) String() string { @@ -168,7 +162,7 @@ func (*ComponentUpdate) ProtoMessage() {} func (x *ComponentUpdate) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -231,11 +225,9 @@ type Component struct { func (x *Component) Reset() { *x = Component{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Component) String() string { @@ -246,7 +238,7 @@ func (*Component) ProtoMessage() {} func (x *Component) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,11 +299,9 @@ type IncidentUpdate struct { func (x *IncidentUpdate) Reset() { *x = IncidentUpdate{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *IncidentUpdate) String() string { @@ -322,7 +312,7 @@ func (*IncidentUpdate) ProtoMessage() {} func (x *IncidentUpdate) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -433,11 +423,9 @@ type Incident struct { func (x *Incident) Reset() { *x = Incident{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Incident) String() string { @@ -448,7 +436,7 @@ func (*Incident) ProtoMessage() {} func (x *Incident) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -645,11 +633,9 @@ type StatusUpdate struct { func (x *StatusUpdate) Reset() { *x = StatusUpdate{} - if protoimpl.UnsafeEnabled { - mi := &file_mimi_statuspage_statuspage_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_mimi_statuspage_statuspage_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatusUpdate) String() string { @@ -660,7 +646,7 @@ func (*StatusUpdate) ProtoMessage() {} func (x *StatusUpdate) ProtoReflect() protoreflect.Message { mi := &file_mimi_statuspage_statuspage_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -912,92 +898,6 @@ func file_mimi_statuspage_statuspage_proto_init() { if File_mimi_statuspage_statuspage_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_mimi_statuspage_statuspage_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*Meta); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mimi_statuspage_statuspage_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*Page); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mimi_statuspage_statuspage_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ComponentUpdate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mimi_statuspage_statuspage_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*Component); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mimi_statuspage_statuspage_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*IncidentUpdate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mimi_statuspage_statuspage_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*Incident); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_mimi_statuspage_statuspage_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*StatusUpdate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/buf/sanguisuga/sanguisuga.pb.go b/buf/sanguisuga/sanguisuga.pb.go index 5d63d8fe..a14dcd78 100644 --- a/buf/sanguisuga/sanguisuga.pb.go +++ b/buf/sanguisuga/sanguisuga.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: sanguisuga/sanguisuga.proto @@ -33,11 +33,9 @@ type Show struct { func (x *Show) Reset() { *x = Show{} - if protoimpl.UnsafeEnabled { - mi := &file_sanguisuga_sanguisuga_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sanguisuga_sanguisuga_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Show) String() string { @@ -48,7 +46,7 @@ func (*Show) ProtoMessage() {} func (x *Show) ProtoReflect() protoreflect.Message { mi := &file_sanguisuga_sanguisuga_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type Shows struct { func (x *Shows) Reset() { *x = Shows{} - if protoimpl.UnsafeEnabled { - mi := &file_sanguisuga_sanguisuga_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sanguisuga_sanguisuga_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Shows) String() string { @@ -109,7 +105,7 @@ func (*Shows) ProtoMessage() {} func (x *Shows) ProtoReflect() protoreflect.Message { mi := &file_sanguisuga_sanguisuga_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -144,11 +140,9 @@ type TVSnatch struct { func (x *TVSnatch) Reset() { *x = TVSnatch{} - if protoimpl.UnsafeEnabled { - mi := &file_sanguisuga_sanguisuga_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sanguisuga_sanguisuga_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TVSnatch) String() string { @@ -159,7 +153,7 @@ func (*TVSnatch) ProtoMessage() {} func (x *TVSnatch) ProtoReflect() protoreflect.Message { mi := &file_sanguisuga_sanguisuga_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -212,11 +206,9 @@ type TVSnatches struct { func (x *TVSnatches) Reset() { *x = TVSnatches{} - if protoimpl.UnsafeEnabled { - mi := &file_sanguisuga_sanguisuga_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sanguisuga_sanguisuga_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TVSnatches) String() string { @@ -227,7 +219,7 @@ func (*TVSnatches) ProtoMessage() {} func (x *TVSnatches) ProtoReflect() protoreflect.Message { mi := &file_sanguisuga_sanguisuga_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -265,11 +257,9 @@ type AnimeSnatch struct { func (x *AnimeSnatch) Reset() { *x = AnimeSnatch{} - if protoimpl.UnsafeEnabled { - mi := &file_sanguisuga_sanguisuga_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sanguisuga_sanguisuga_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AnimeSnatch) String() string { @@ -280,7 +270,7 @@ func (*AnimeSnatch) ProtoMessage() {} func (x *AnimeSnatch) ProtoReflect() protoreflect.Message { mi := &file_sanguisuga_sanguisuga_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -354,11 +344,9 @@ type AnimeSnatches struct { func (x *AnimeSnatches) Reset() { *x = AnimeSnatches{} - if protoimpl.UnsafeEnabled { - mi := &file_sanguisuga_sanguisuga_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sanguisuga_sanguisuga_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AnimeSnatches) String() string { @@ -369,7 +357,7 @@ func (*AnimeSnatches) ProtoMessage() {} func (x *AnimeSnatches) ProtoReflect() protoreflect.Message { mi := &file_sanguisuga_sanguisuga_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -536,80 +524,6 @@ func file_sanguisuga_sanguisuga_proto_init() { if File_sanguisuga_sanguisuga_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_sanguisuga_sanguisuga_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*Show); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sanguisuga_sanguisuga_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*Shows); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sanguisuga_sanguisuga_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*TVSnatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sanguisuga_sanguisuga_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*TVSnatches); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sanguisuga_sanguisuga_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*AnimeSnatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sanguisuga_sanguisuga_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*AnimeSnatches); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/bundler/bundler.go b/bundler/bundler.go index 7c623b57..29a049c3 100644 --- a/bundler/bundler.go +++ b/bundler/bundler.go @@ -23,10 +23,11 @@ import ( type mode int const ( - DefaultDelayThreshold = time.Second - DefaultBundleCountThreshold = 10 - DefaultBundleByteThreshold = 1e6 // 1M - DefaultBufferedByteLimit = 1e9 // 1G + DefaultDelayThreshold = time.Second + DefaultBundleHandlerDeadline = time.Minute + DefaultBundleCountThreshold = 10 + DefaultBundleByteThreshold = 1e6 // 1M + DefaultBufferedByteLimit = 1e9 // 1G ) const ( @@ -37,14 +38,14 @@ const ( var ( // ErrOverflow indicates that Bundler's stored bytes exceeds its BufferedByteLimit. - ErrOverflow = errors.New("bundler reached buffered byte limit") + ErrOverflow = errors.New("bundler: reached buffered byte limit") // ErrOversizedItem indicates that an item's size exceeds the maximum bundle size. - ErrOversizedItem = errors.New("item size exceeds bundle byte limit") + ErrOversizedItem = errors.New("bundler: item size exceeds bundle byte limit") // errMixedMethods indicates that mutually exclusive methods has been // called subsequently. - errMixedMethods = errors.New("calls to Add and AddWait cannot be mixed") + errMixedMethods = errors.New("bundler: calls to Add and AddWait cannot be mixed") ) // A Bundler collects items added to it into a bundle until the bundle @@ -80,7 +81,10 @@ type Bundler[T any] struct { // The default is 1. HandlerLimit int - handler func([]T) // called to handle a bundle + // ContextDeadline is the deadline for the context attached to bundle handling. + ContextDeadline time.Duration + + handler func(context.Context, []T) // called to handle a bundle mu sync.Mutex // guards access to fields below flushTimer *time.Timer // implements DelayThreshold @@ -114,9 +118,9 @@ type Bundler[T any] struct { // A bundle is a group of items that were added individually and will be passed // to a handler as a slice. type bundle[T any] struct { - items []T // slice of T + items []T // slice of T size int // size in bytes of all items - next *bundle[T] // bundles are handled in order as a linked list queue + next *bundle[T] // bundles are handled in order as a linked list queue flush *sync.WaitGroup // the counter that tracks flush completion } @@ -135,7 +139,7 @@ func (bu *bundle[T]) add(item T, size int) { // // Configure the Bundler by setting its thresholds and limits before calling // any of its methods. -func New[T any](handler func([]T)) *Bundler[T] { +func New[T any](handler func(context.Context, []T)) *Bundler[T] { b := &Bundler[T]{ DelayThreshold: DefaultDelayThreshold, BundleCountThreshold: DefaultBundleCountThreshold, @@ -143,8 +147,8 @@ func New[T any](handler func([]T)) *Bundler[T] { BufferedByteLimit: DefaultBufferedByteLimit, HandlerLimit: 1, - handler: handler, - curFlush: &sync.WaitGroup{}, + handler: handler, + curFlush: &sync.WaitGroup{}, } return b } @@ -315,7 +319,9 @@ func (b *Bundler[T]) next() *bundle[T] { // goroutine ends. func (b *Bundler[T]) handle(bu *bundle[T]) { for bu != nil { - b.handler(bu.items) + ctx, cancel := context.WithTimeout(context.Background(), b.ContextDeadline) + b.handler(ctx, bu.items) + cancel() bu = b.postHandle(bu) } } diff --git a/bundler/bundler_test.go b/bundler/bundler_test.go index 9a269dab..bec12d0f 100644 --- a/bundler/bundler_test.go +++ b/bundler/bundler_test.go @@ -1,13 +1,14 @@ package bundler import ( + "context" "testing" ) func TestBundler(t *testing.T) { input := []int{1, 2, 3, 4} done := false - b := New[int](func(data []int) { + b := New[int](func(_ context.Context, data []int) { if len(data) != 4 { t.Errorf("Wanted len(data) == %d, got: %d", len(input), len(data)) } @@ -29,7 +30,7 @@ func TestBundler(t *testing.T) { } b.Flush() - + if !done { t.Fatal("function wasn't called") } diff --git a/docs/bsky/didweb/README.md b/docs/bsky/didweb/README.md index a7523bee..a7651f40 100644 --- a/docs/bsky/didweb/README.md +++ b/docs/bsky/didweb/README.md @@ -69,3 +69,5 @@ - Get reccomended did credentials .verificationMethods.atproto - s/did:key:// - Put in did.json .verificationMethod[0].publicKeyMultibase + - activate account + - skeet: https://bsky.app/profile/the.cetacean.club/post/3lbsasfpb2s2m diff --git a/docs/bsky/didweb/didweb.tf b/docs/bsky/didweb/didweb.tf index 611e9960..cacaa203 100644 --- a/docs/bsky/didweb/didweb.tf +++ b/docs/bsky/didweb/didweb.tf @@ -31,4 +31,4 @@ resource "aws_route53_record" "_atproto_the_cetacean_club" { type = "TXT" ttl = "3600" records = ["did=did:web:the.cetacean.club"] -} \ No newline at end of file +} diff --git a/docs/bsky/didweb/pds.tf b/docs/bsky/didweb/pds.tf index a79fea28..257dc0a1 100644 --- a/docs/bsky/didweb/pds.tf +++ b/docs/bsky/didweb/pds.tf @@ -30,6 +30,14 @@ resource "civo_firewall" "pds" { action = "allow" } + ingress_rule { + label = "yolo-udp" + protocol = "udp" + port_range = "1-65535" + cidr = ["0.0.0.0/0"] + action = "allow" + } + egress_rule { label = "yolo" protocol = "tcp" @@ -37,6 +45,14 @@ resource "civo_firewall" "pds" { cidr = ["0.0.0.0/0"] action = "allow" } + + egress_rule { + label = "yolo-udp" + protocol = "udp" + port_range = "1-65535" + cidr = ["0.0.0.0/0"] + action = "allow" + } } resource "civo_instance" "engram" { @@ -66,4 +82,4 @@ resource "aws_route53_record" "star-engram-within-website--A" { type = "A" ttl = "3600" records = [civo_instance.engram.public_ip] -} \ No newline at end of file +} diff --git a/go.mod b/go.mod index 559df5eb..8f02c87b 100644 --- a/go.mod +++ b/go.mod @@ -31,6 +31,7 @@ require ( github.com/go-gorm/caches/v4 v4.0.5 github.com/go-interpreter/wagon v0.6.0 github.com/goccy/go-json v0.10.2 + github.com/golang-jwt/jwt/v5 v5.2.1 github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 github.com/google/go-github v17.0.0+incompatible github.com/google/subcommands v1.2.0 @@ -43,6 +44,7 @@ require ( github.com/kr/pretty v0.3.1 github.com/lib/pq v1.10.9 github.com/mattn/go-sqlite3 v1.14.22 + github.com/multiformats/go-multibase v0.2.0 github.com/mymmrac/telego v0.29.2 github.com/nats-io/nats.go v1.35.0 github.com/ncruces/go-sqlite3 v0.16.0 @@ -65,12 +67,15 @@ require ( github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64 github.com/tmc/scp v0.0.0-20170824174625-f7b48647feef github.com/twitchtv/twirp v8.1.3+incompatible + github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c + github.com/whyrusleeping/go-did v0.0.0-20240828165449-bcaa7ae21371 go.etcd.io/bbolt v1.3.10 go.jetpack.io/tyson v0.1.1 go4.org v0.0.0-20190313082347-94abd6928b1d golang.org/x/crypto v0.31.0 golang.org/x/oauth2 v0.21.0 golang.org/x/sync v0.10.0 + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 google.golang.org/grpc v1.64.1 gorm.io/gorm v1.25.10 gorm.io/plugin/prometheus v0.1.0 @@ -100,6 +105,7 @@ require ( github.com/cli/go-gh v0.1.0 // indirect github.com/cloudflare/circl v1.3.8 // indirect github.com/cyphar/filepath-securejoin v0.2.5 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/ebitengine/purego v0.7.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect @@ -148,6 +154,12 @@ require ( github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/klauspost/pgzip v1.2.6 // indirect + github.com/lestrrat-go/blackmagic v1.0.1 // indirect + github.com/lestrrat-go/httpcc v1.0.1 // indirect + github.com/lestrrat-go/httprc v1.0.4 // indirect + github.com/lestrrat-go/iter v1.0.2 // indirect + github.com/lestrrat-go/jwx/v2 v2.0.12 // indirect + github.com/lestrrat-go/option v1.0.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-tty v0.0.3 // indirect @@ -158,7 +170,6 @@ require ( github.com/mr-tron/base58 v1.2.0 // indirect github.com/multiformats/go-base32 v0.1.0 // indirect github.com/multiformats/go-base36 v0.2.0 // indirect - github.com/multiformats/go-multibase v0.2.0 // indirect github.com/multiformats/go-multicodec v0.9.0 // indirect github.com/multiformats/go-multihash v0.2.3 // indirect github.com/multiformats/go-varint v0.0.7 // indirect @@ -172,6 +183,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 // indirect + github.com/segmentio/asm v1.2.0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/skeema/knownhosts v1.3.0 // indirect @@ -184,7 +196,6 @@ require ( github.com/valyala/fasthttp v1.52.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 // indirect - github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect @@ -197,7 +208,6 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.6.0 // indirect - golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 494ec8a1..58c3f17f 100644 --- a/go.sum +++ b/go.sum @@ -228,6 +228,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= @@ -343,6 +347,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -592,6 +598,19 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80= +github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU= +github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= +github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= +github.com/lestrrat-go/httprc v1.0.4 h1:bAZymwoZQb+Oq8MEbyipag7iSq6YIga8Wj6GOiJGdI8= +github.com/lestrrat-go/httprc v1.0.4/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= +github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= +github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= +github.com/lestrrat-go/jwx/v2 v2.0.12 h1:3d589+5w/b9b7S3DneICPW16AqTyYXB7VRjgluSDWeA= +github.com/lestrrat-go/jwx/v2 v2.0.12/go.mod h1:Mq4KN1mM7bp+5z/W5HS8aCNs5RKZ911G/0y2qUjAQuQ= +github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= +github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= +github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= @@ -771,6 +790,8 @@ github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 h1:KanIMPX0QdEdB4R3 github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg= github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a h1:iLcLb5Fwwz7g/DLK89F+uQBDeAhHhwdzB5fSlVdhGcM= github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a/go.mod h1:wozgYq9WEBQBaIJe4YZ0qTSFAMxmcwBhQH0fO0R34Z0= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= +github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0= github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= @@ -853,6 +874,8 @@ github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c h1:UsxJNc github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8= +github.com/whyrusleeping/go-did v0.0.0-20240828165449-bcaa7ae21371 h1:W4jEGWdes35iuiiAYNZFOjx+dwzQOBh33kVpc0C0YiE= +github.com/whyrusleeping/go-did v0.0.0-20240828165449-bcaa7ae21371/go.mod h1:39U9RRVr4CKbXpXYopWn+FSH5s+vWu6+RmguSPWAq5s= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= @@ -924,6 +947,7 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1164,6 +1188,7 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1179,6 +1204,7 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/kube/alrest/gitea/runner.yaml b/kube/alrest/gitea/runner.yaml index 1ea60fd2..bb8319f1 100644 --- a/kube/alrest/gitea/runner.yaml +++ b/kube/alrest/gitea/runner.yaml @@ -13,7 +13,7 @@ metadata: data: daemon.json: | { - "registry-mirrors": ["https://pt-dh.default.svc.alrest.xeserv.us"] + "registry-mirrors": ["https://pt-dh.int.xeserv.us"] } --- apiVersion: apps/v1 diff --git a/kube/alrest/minio/pvc.yaml b/kube/alrest/minio/pvc.yaml index 0a4ab192..5cbace9d 100644 --- a/kube/alrest/minio/pvc.yaml +++ b/kube/alrest/minio/pvc.yaml @@ -4,8 +4,8 @@ metadata: name: minio spec: accessModes: - - ReadWriteMany + - ReadWriteOnce storageClassName: rotational resources: requests: - storage: 100Gi \ No newline at end of file + storage: 350Gi \ No newline at end of file diff --git a/kube/runner-ci/Dockerfile b/kube/runner-ci/Dockerfile index 95d5914f..ee17355e 100644 --- a/kube/runner-ci/Dockerfile +++ b/kube/runner-ci/Dockerfile @@ -1,5 +1,5 @@ ARG VERSION -FROM --platform=amd64 ghcr.io/actions/actions-runner:${VERSION} +FROM ghcr.io/actions/actions-runner:${VERSION} ENV HOMEBREW_NO_ANALYTICS=1 \ HOMEBREW_NO_ENV_HINTS=1 \ diff --git a/kube/runner-ci/build.sh b/kube/runner-ci/build.sh index 0238d1b2..a22ffe98 100755 --- a/kube/runner-ci/build.sh +++ b/kube/runner-ci/build.sh @@ -3,5 +3,5 @@ version=$(curl -sX GET "https://api.github.com/repos/actions/runner/releases/lat version="${version#*v}" version="${version#*release-}" -docker build --platform linux/amd64 --build-arg VERSION=${version} -t ghcr.io/xe/x/actions-runner . +docker build --platform=linux/amd64 --build-arg VERSION=${version} -t ghcr.io/xe/x/actions-runner . docker push ghcr.io/xe/x/actions-runner \ No newline at end of file diff --git a/kube/runner-ci/daemon.json b/kube/runner-ci/daemon.json index 7a0b2c4d..b5084ca7 100644 --- a/kube/runner-ci/daemon.json +++ b/kube/runner-ci/daemon.json @@ -1,5 +1,5 @@ { "registry-mirrors": [ - "https://pt-dh.default.svc.alrest.xeserv.us" + "https://pt-dh.int.xeserv.us" ] } \ No newline at end of file