Skip to content

Commit 07f64e9

Browse files
authored
fix: return raw recipe for pipeline release (#604)
Because - The GET pipeline release APIs didn’t return the raw recipe. - Streaming wasn’t working for pipeline releases. This commit - Fixes the issue where the pipeline release didn’t return the raw recipe. - Resolves the streaming issue with pipeline release triggers.
1 parent fe7851f commit 07f64e9

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

pkg/handler/triggerhandler.go

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,6 @@ func request_PipelinePublicService_TriggerNamespacePipeline_0(ctx context.Contex
377377
}
378378

379379
if sh != nil {
380-
// var wg sync.WaitGroup
381-
// wg.Add(1)
382380
asyncReq := pb.TriggerAsyncNamespacePipelineRequest{
383381
NamespaceId: protoReq.NamespaceId,
384382
PipelineId: protoReq.PipelineId,
@@ -708,6 +706,26 @@ func request_PipelinePublicService_TriggerNamespacePipelineRelease_0(ctx context
708706
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "release_id", err)
709707
}
710708

709+
if sh != nil {
710+
asyncReq := pb.TriggerAsyncNamespacePipelineReleaseRequest{
711+
NamespaceId: protoReq.NamespaceId,
712+
PipelineId: protoReq.PipelineId,
713+
ReleaseId: protoReq.ReleaseId,
714+
Inputs: protoReq.Inputs,
715+
Data: protoReq.Data,
716+
}
717+
resp, err := client.TriggerAsyncNamespacePipelineRelease(ctx, &asyncReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
718+
if err != nil {
719+
return nil, metadata, err
720+
}
721+
triggerID := strings.Split(resp.Operation.Name, "/")[1]
722+
err = sh(triggerID)
723+
if err != nil {
724+
return nil, metadata, err
725+
}
726+
return nil, metadata, nil
727+
}
728+
711729
msg, err := client.TriggerNamespacePipelineRelease(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
712730
return msg, metadata, err
713731

pkg/service/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ func (c *converter) ConvertPipelineReleaseToPB(ctx context.Context, dbPipeline *
739739
Description: &dbPipelineRelease.Description.String,
740740
Readme: dbPipelineRelease.Readme,
741741
Recipe: pbRecipe,
742-
RawRecipe: dbPipeline.RecipeYAML,
742+
RawRecipe: dbPipelineRelease.RecipeYAML,
743743
}
744744

745745
if view > pb.Pipeline_VIEW_BASIC {

0 commit comments

Comments
 (0)