-
Notifications
You must be signed in to change notification settings - Fork 88
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make status message as templates #1455
Merged
piyush-garg
merged 4 commits into
openshift-pipelines:main
from
chmouel:status-tkn-binary-url-tempalte
Oct 18, 2023
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0026d3a
Make status message as templates
chmouel 57edfa9
Merge branch 'main' into status-tkn-binary-url-tempalte
chmouel 830f6e6
Merge branch 'main' into status-tkn-binary-url-tempalte
chmouel a064b4f
Merge branch 'main' into status-tkn-binary-url-tempalte
chmouel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package formatting | ||
|
||
import ( | ||
"bytes" | ||
_ "embed" | ||
"text/template" | ||
) | ||
|
||
//go:embed templates/starting.go.tmpl | ||
var StartingPipelineRunText string | ||
|
||
//go:embed templates/queuing.go.tmpl | ||
var QueuingPipelineRunText string | ||
|
||
type MessageTemplate struct { | ||
PipelineRunName string | ||
Namespace string | ||
ConsoleName string | ||
ConsoleURL string | ||
TknBinary string | ||
TknBinaryURL string | ||
} | ||
|
||
func (mt MessageTemplate) MakeTemplate(msg string) (string, error) { | ||
outputBuffer := bytes.Buffer{} | ||
t := template.Must(template.New("Message").Parse(msg)) | ||
data := struct{ Mt MessageTemplate }{Mt: mt} | ||
if err := t.Execute(&outputBuffer, data); err != nil { | ||
return "", err | ||
} | ||
return outputBuffer.String(), nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
package formatting | ||
|
||
import ( | ||
"testing" | ||
) | ||
|
||
func TestMessageTemplate_MakeTemplate(t *testing.T) { | ||
mt := MessageTemplate{ | ||
PipelineRunName: "test-pipeline", | ||
Namespace: "test-namespace", | ||
ConsoleName: "test-console", | ||
ConsoleURL: "https://test-console-url.com", | ||
TknBinary: "test-tkn", | ||
TknBinaryURL: "https://test-tkn-url.com", | ||
} | ||
|
||
tests := []struct { | ||
name string | ||
mt MessageTemplate | ||
msg string | ||
want string | ||
wantErr bool | ||
}{ | ||
{ | ||
name: "Test MakeTemplate", | ||
mt: mt, | ||
msg: "Starting Pipelinerun {{.Mt.PipelineRunName}} in namespace {{.Mt.Namespace}}", | ||
want: "Starting Pipelinerun test-pipeline in namespace test-namespace", | ||
}, | ||
{ | ||
name: "Error MakeTemplate", | ||
mt: mt, | ||
msg: "Starting Pipelinerun {{.Mt.PipelineRunName}} in namespace {{.FOOOBAR }}", | ||
wantErr: true, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
got, err := tt.mt.MakeTemplate(tt.msg) | ||
if (err != nil) != tt.wantErr { | ||
t.Errorf("MessageTemplate.MakeTemplate() error = %v, wantErr %v", err, tt.wantErr) | ||
return | ||
} | ||
if got != tt.want { | ||
t.Errorf("MessageTemplate.MakeTemplate() = %v, want %v", got, tt.want) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
PipelineRun <b>{{ .Mt.PipelineRunName }}</b> has been queued in namespace <b>{{ .Mt.Namespace }}</b><br><br> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Starting Pipelinerun <b>{{ .Mt.PipelineRunName }}</b> in namespace<b> {{ .Mt.Namespace }}</b><br> | ||
You can monitor the execution using the [{{ .Mt.ConsoleName }}]({{ .Mt.ConsoleURL }}) PipelineRun viewer or through the command line by | ||
using the [{{ .Mt.TknBinary }}]({{ .Mt.TknBinaryURL }}) CLI with the following command: | ||
<br> | ||
<code>{{ .Mt.TknBinary }} pr logs -n {{ .Mt.Namespace }} {{ .Mt.PipelineRunName }} -f</code> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we would need to set this to the opc url in downstream @piyush-garg