@@ -641,12 +641,17 @@ func (c *converter) ConvertPipelineToPB(ctx context.Context, dbPipelineOrigin *d
641641
642642 if view > pipelinepb .Pipeline_VIEW_BASIC {
643643 if dbPipeline .Metadata != nil {
644- str := structpb.Struct {}
645- err := str .UnmarshalJSON (dbPipeline .Metadata )
646- if err != nil {
647- logger .Error (err .Error ())
644+
645+ // Check if metadata is not null JSON value
646+ if string (dbPipeline .Metadata ) != "null" {
647+ str := structpb.Struct {}
648+ err := str .UnmarshalJSON (dbPipeline .Metadata )
649+ if err != nil {
650+ logger .Error (err .Error ())
651+ } else {
652+ pbPipeline .Metadata = & str
653+ }
648654 }
649- pbPipeline .Metadata = & str
650655 }
651656 }
652657
@@ -813,12 +818,16 @@ func (c *converter) ConvertPipelineReleaseToPB(ctx context.Context, dbPipeline *
813818
814819 if view > pipelinepb .Pipeline_VIEW_BASIC {
815820 if dbPipelineRelease .Metadata != nil {
816- str := structpb.Struct {}
817- err := str .UnmarshalJSON (dbPipelineRelease .Metadata )
818- if err != nil {
819- logger .Error (err .Error ())
821+ // Check if metadata is not null JSON value
822+ if string (dbPipelineRelease .Metadata ) != "null" {
823+ str := structpb.Struct {}
824+ err := str .UnmarshalJSON (dbPipelineRelease .Metadata )
825+ if err != nil {
826+ logger .Error (err .Error ())
827+ } else {
828+ pbPipelineRelease .Metadata = & str
829+ }
820830 }
821- pbPipelineRelease .Metadata = & str
822831 }
823832 }
824833
0 commit comments