Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/sync/create_pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func (o Operation) createSyncReleaseNextPR() error {
branches := o.Config.Branches
return o.createPR(
o.triggerCIMessage(),
fmt.Sprintf(o.Config.Messages.TriggerCIBody, branches.ReleaseNext, branches.Main),
o.triggerCIBody(),
branches.ReleaseNext,
branches.SynchCI+branches.ReleaseNext,
)
Expand Down
24 changes: 21 additions & 3 deletions pkg/sync/resync_releases.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package sync

import (
"bytes"
"fmt"
"text/template"

gitv5 "github.com/go-git/go-git/v5"
"github.com/openshift-knative/deviate/pkg/config/git"
Expand Down Expand Up @@ -108,9 +110,25 @@
title := fmt.Sprintf(
r.Config.Messages.TriggerCI,
downstreamBranch, upstreamBranch)
body := fmt.Sprintf(
r.Config.Messages.TriggerCIBody,
downstreamBranch, upstreamBranch)

tmplData := triggerCIMessageData{
ReleaseBranch: downstreamBranch,
MainBranch: upstreamBranch,
}

t, err := template.New("resyncTriggerCIBody").Parse(r.Config.Messages.TriggerCIBody)
if err != nil {
r.Printf("Error parsing TriggerCIBody message template for resync: %v. Using raw template string.", err)
return r.createPR(title, fmt.Sprintf(r.Config.Messages.TriggerCIBody, downstreamBranch, upstreamBranch), downstreamBranch, syncBranch)

Check failure on line 122 in pkg/sync/resync_releases.go

View workflow job for this annotation

GitHub Actions / Golangci

line is 137 characters (lll)
}

var buf bytes.Buffer
if err := t.Execute(&buf, tmplData); err != nil {
r.Printf("Error executing TriggerCIBody message template for resync: %v. Using raw template string.", err)
return r.createPR(title, fmt.Sprintf(r.Config.Messages.TriggerCIBody, downstreamBranch, upstreamBranch), downstreamBranch, syncBranch)

Check failure on line 128 in pkg/sync/resync_releases.go

View workflow job for this annotation

GitHub Actions / Golangci

line is 137 characters (lll)
}
body := buf.String()

return r.createPR(title, body, downstreamBranch, syncBranch)
}
}
Expand Down
52 changes: 47 additions & 5 deletions pkg/sync/trigger_ci.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package sync

import (
"fmt"
"bytes"
"os"
"path"
"text/template"
"time"

"github.com/openshift-knative/deviate/pkg/config/git"
Expand All @@ -14,11 +15,52 @@ func (o Operation) triggerCI() error {
return triggerCI{o}.run()
}

// triggerCIMessageData holds the data for the TriggerCI message template.
type triggerCIMessageData struct {
ReleaseBranch string
MainBranch string
}

func (o Operation) triggerCIMessage() string {
return fmt.Sprintf(
o.Config.Messages.TriggerCI,
o.Config.Branches.ReleaseNext,
o.Config.Branches.Main)
tmplData := triggerCIMessageData{
ReleaseBranch: o.Config.Branches.ReleaseNext,
MainBranch: o.Config.Branches.Main,
}

t, err := template.New("triggerCIMessage").Parse(o.Config.Messages.TriggerCI)
if err != nil {
o.Printf("Error parsing TriggerCI message template: %v. Using raw template string.", err)
return o.Config.Messages.TriggerCI // Return raw template on parsing error
}

var buf bytes.Buffer
if err := t.Execute(&buf, tmplData); err != nil {
o.Printf("Error executing TriggerCI message template: %v. Using raw template string.", err)
return o.Config.Messages.TriggerCI // Return raw template on execution error
}

return buf.String()
}

func (o Operation) triggerCIBody() string {
tmplData := triggerCIMessageData{
ReleaseBranch: o.Config.Branches.ReleaseNext,
MainBranch: o.Config.Branches.Main,
}

t, err := template.New("triggerCIBody").Parse(o.Config.Messages.TriggerCIBody)
if err != nil {
o.Printf("Error parsing TriggerCIBody message template: %v. Using raw template string.", err)
return o.Config.Messages.TriggerCIBody // Return raw template on parsing error
}

var buf bytes.Buffer
if err := t.Execute(&buf, tmplData); err != nil {
o.Printf("Error executing TriggerCIBody message template: %v. Using raw template string.", err)
return o.Config.Messages.TriggerCIBody // Return raw template on execution error
}

return buf.String()
}

type triggerCI struct {
Expand Down
Loading