Commit 33c2c03

authored

[Bugfix] Fix AnyPB Parsing in Meta Service (#1960)

1 parent a9ccccf commit 33c2c03Copy full SHA for 33c2c03

File tree

+31

-4

lines changed

+31

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`- (Feature) Add CA Certificates`
`9`	`9`	`- (Feature) Chart By Tag filter`
`10`	`10`	`- (Feature) Add Gateway Config condition`
	`11`	`+- (Bugfix) Fix AnyPB Parsing in Meta Service`
`11`	`12`
`12`	`13`	`## [1.3.0](https://github.com/arangodb/kube-arangodb/tree/1.3.0) (2025年08月01日)`
`13`	`14`	`- (Feature) (Platform) Storage Debug`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ import (`
`39`	`39`	`"github.com/arangodb/kube-arangodb/pkg/util"`
`40`	`40`	`"github.com/arangodb/kube-arangodb/pkg/util/cache"`
`41`	`41`	`"github.com/arangodb/kube-arangodb/pkg/util/errors"`
`42`		`- ugrpc "github.com/arangodb/kube-arangodb/pkg/util/grpc"`
`43`	`42`	`"github.com/arangodb/kube-arangodb/pkg/util/svc"`
`44`	`43`	`)`
`45`	`44`
`@@ -129,7 +128,7 @@ func (i implementation) Set(ctx context.Context, req pbMetaV1.SetRequest) (*pb`
`129`	`128`	`obj.Key = key`
`130`	`129`	`obj.Rev = req.Revision`
`131`	`130`
`132`		`- obj.Object = ugrpc.NewGRPC(req.GetObject())`
	`131`	`+ obj.Object.Object = req.GetObject()`
`133`	`132`
`134`	`133`	`if err := i.cache.Put(ctx, key, &obj); err != nil {`
`135`	`134`	`if shared.IsPreconditionFailed(err) {`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ import (`
`28`	`28`	`meta "k8s.io/apimachinery/pkg/apis/meta/v1"`
`29`	`29`
`30`	`30`	`pbMetaV1 "github.com/arangodb/kube-arangodb/integrations/meta/v1/definition"`
`31`		`- ugrpc "github.com/arangodb/kube-arangodb/pkg/util/grpc"`
`32`	`31`	`)`
`33`	`32`
`34`	`33`	`type Object struct {`
`@@ -37,7 +36,11 @@ type Object struct {`
`37`	`36`
`38`	`37`	Meta *ObjectMeta `json:"meta,omitempty"`
`39`	`38`
`40`		- Object ugrpc.GRPC[*anypb.Any] `json:"object"`
	`39`	+ Object ObjectProto `json:"object,omitempty"`
	`40`	`+}`
	`41`	`+`
	`42`	`+type ObjectProto struct {`
	`43`	+ Object *anypb.Any `json:"Object,omitempty"`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`func (o *Object) SetKey(s string) {`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ package v1`
`22`	`22`
`23`	`23`	`import (`
`24`	`24`	`"context"`
	`25`	`+ "encoding/json"`
`25`	`26`	`"testing"`
`26`	`27`
`27`	`28`	`"github.com/stretchr/testify/require"`
`@@ -32,6 +33,29 @@ import (`
`32`	`33`	`"github.com/arangodb/kube-arangodb/pkg/util/tests/tgrpc"`
`33`	`34`	`)`
`34`	`35`
	`36`	`+func Test_Types(t *testing.T) {`
	`37`	+ z := `{
	`38`	`+ "meta": {`
	`39`	`+ "updatedAt": "2025年07月07日T15:13:09Z"`
	`40`	`+ },`
	`41`	`+ "object": {`
	`42`	`+ "Object": {`
	`43`	`+ "type_url": "type.googleapis.com/arangodb_platform_internal.metadata_store.GenAiProjectNames",`
	`44`	`+ "value": "ChV0ZXN0X3Byb2plY3RfNmVhYWM3MjM="`
	`45`	`+ }`
	`46`	`+ }`
	`47`	+}`
	`48`	`+`
	`49`	`+ var obj Object`
	`50`	`+`
	`51`	`+ require.NoError(t, json.Unmarshal([]byte(z), &obj))`
	`52`	`+`
	`53`	`+ n, err := json.Marshal(obj)`
	`54`	`+ require.NoError(t, err)`
	`55`	`+`
	`56`	`+ require.JSONEq(t, z, string(n))`
	`57`	`+}`
	`58`	`+`
`35`	`59`	`func Handler(t *testing.T, ctx context.Context, mods ...util.ModR[Configuration]) svc.Handler {`
`36`	`60`	`handler, err := New(ctx, NewConfiguration().With(mods...))`
`37`	`61`	`require.NoError(t, err)`

Comments

(0)