feat: update proto to v0.4.22

tuihub · Sep 22, 2024 · 93eafb0 · 93eafb0
1 parent 52aa741
commit 93eafb0
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 19 deletions.
diff --git a/app/sephirah/internal/data/internal/converter/generated.go b/app/sephirah/internal/data/internal/converter/generated.go
diff --git a/app/sephirah/internal/data/tiphereth.go b/app/sephirah/internal/data/tiphereth.go
@@ -524,6 +524,7 @@ func (t tipherethRepo) ListPorterGroups(
 				GlobalName:        p.GlobalName,
 				Regions:           []string{p.Region},
 				ContextJSONSchema: p.ContextJSONSchema,
+				FeatureSummary:    p.FeatureSummary,
 			}
 		} else {
 			pgm[p.GlobalName].Regions = append(pgm[p.GlobalName].Regions, p.Region)

diff --git a/app/sephirah/internal/model/converter/biz_to_pb.go b/app/sephirah/internal/model/converter/biz_to_pb.go
@@ -31,7 +31,7 @@ import (
 type toPBConverter interface { //nolint:unused // used by generator
 	ToPBTimeRange(*model.TimeRange) *librarian.TimeRange
 	ToPBInternalIDList([]model.InternalID) []*librarian.InternalID
-	ToPBServerFeatureSummary(*modelsupervisor.ServerFeatureSummary) *pb.ServerFeatureSummary
+	ToPBServerFeatureSummary(*modelsupervisor.ServerFeatureSummary) *librarian.FeatureSummary
 	ToPBFeatureFlag(*modelsupervisor.FeatureFlag) *librarian.FeatureFlag
 	ToPBFeatureFlagList([]*modelsupervisor.FeatureFlag) []*librarian.FeatureFlag
 	ToPBFeatureRequest(*modelsupervisor.FeatureRequest) *librarian.FeatureRequest
@@ -73,7 +73,6 @@ type toPBConverter interface { //nolint:unused // used by generator
 	ToPBAccount(*modeltiphereth.Account) *librarian.Account
 	ToPBAccountList([]*modeltiphereth.Account) []*librarian.Account
 
-	// goverter:ignore FeatureSummary
 	// goverter:autoMap PorterInstance
 	ToPBPorter(*modelsupervisor.PorterInstanceController) *pb.Porter
 	ToPBPorterList([]*modelsupervisor.PorterInstanceController) []*pb.Porter

diff --git a/app/sephirah/internal/model/converter/generated.go b/app/sephirah/internal/model/converter/generated.go
diff --git a/app/sephirah/internal/model/converter/pb_to_biz.go b/app/sephirah/internal/model/converter/pb_to_biz.go
@@ -12,7 +12,6 @@ import (
 	"github.com/tuihub/librarian/internal/lib/libauth"
 	"github.com/tuihub/librarian/internal/model"
 	"github.com/tuihub/librarian/internal/model/modelfeed"
-	porter "github.com/tuihub/protos/pkg/librarian/porter/v1"
 	pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1"
 	librarian "github.com/tuihub/protos/pkg/librarian/v1"
 
@@ -33,7 +32,7 @@ import (
 // goverter:extend DurationPBToDuration
 type toBizConverter interface { //nolint:unused // used by generator
 	ToBizTimeRange(*librarian.TimeRange) *model.TimeRange
-	ToBizPorterFeatureSummary(*porter.PorterFeatureSummary) *modelsupervisor.PorterFeatureSummary
+	ToBizPorterFeatureSummary(*librarian.FeatureSummary) *modelsupervisor.PorterFeatureSummary
 	ToBizFeatureFlag(*librarian.FeatureFlag) *modelsupervisor.FeatureFlag
 	ToBizFeatureRequest(*librarian.FeatureRequest) *modelsupervisor.FeatureRequest
 	// goverter:enum:unknown AccountAppRelationTypeUnspecified

diff --git a/app/sephirah/internal/model/modelsupervisor/modelsupervisor.go b/app/sephirah/internal/model/modelsupervisor/modelsupervisor.go
@@ -49,6 +49,8 @@ type PorterFeatureSummary struct {
 	FeedSources        []*FeatureFlag `json:"feed_sources"`
 	NotifyDestinations []*FeatureFlag `json:"notify_destinations"`
 	FeedItemActions    []*FeatureFlag `json:"feed_item_actions"`
+	FeedGetters        []*FeatureFlag `json:"feed_getters"`
+	FeedSetters        []*FeatureFlag `json:"feed_setters"`
 }
 
 type FeatureFlag struct {
@@ -76,6 +78,8 @@ type ServerFeatureSummary struct {
 	FeedSources        []*FeatureFlag
 	NotifyDestinations []*FeatureFlag
 	FeedItemActions    []*FeatureFlag
+	FeedSetters        []*FeatureFlag
+	FeedGetters        []*FeatureFlag
 }
 
 type PorterConnectionStatus int
@@ -122,6 +126,7 @@ type PorterGroup struct {
 	GlobalName        string
 	Regions           []string
 	ContextJSONSchema string
+	FeatureSummary    *PorterFeatureSummary
 }
 
 type ServerFeatureSummaryMap struct {

diff --git a/app/sephirah/internal/supervisor/supervisor.go b/app/sephirah/internal/supervisor/supervisor.go
@@ -184,6 +184,7 @@ func (s *Supervisor) RefreshAliveInstances( //nolint:gocognit,funlen // TODO
 	s.instanceController.Range(func(address string, ctl modelsupervisor.PorterInstanceController) bool {
 		var ins *modelsupervisor.PorterInstance
 		if ins, err = s.instanceCache.Get(ctx, address); err != nil ||
+			ins == nil ||
 			ins.Status != modeltiphereth.UserStatusActive {
 			return true
 		}

diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/redis/go-redis/v9 v9.6.1
 	github.com/sony/sonyflake v1.2.0
 	github.com/stretchr/testify v1.9.0
-	github.com/tuihub/protos v0.4.21
+	github.com/tuihub/protos v0.4.22
 	github.com/zhihu/norm v0.1.11
 	go.opentelemetry.io/otel v1.29.0
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.5.0

diff --git a/go.sum b/go.sum
@@ -971,8 +971,8 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tuihub/protos v0.4.21 h1:G/Apuh9sCMiKeVZ2O5ohDLlO/tOgXpA6/+x07f3yxas=
-github.com/tuihub/protos v0.4.21/go.mod h1:lmf29LH3wf7Fb0in47Q/ar2qf2V7ogckV6dnlBrsZ1I=
+github.com/tuihub/protos v0.4.22 h1:HtbZSsA8/t1vzWXYKGqRIU07mVEn8v3mrbsllNAON6c=
+github.com/tuihub/protos v0.4.22/go.mod h1:lmf29LH3wf7Fb0in47Q/ar2qf2V7ogckV6dnlBrsZ1I=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/tylertreat/BoomFilters v0.0.0-20181028192813-611b3dbe80e8/go.mod h1:OYRfF6eb5wY9VRFkXJH8FFBi3plw2v+giaIu7P054pM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=