Skip to content

Commit

Permalink
Merge pull request #80 from suzuki-shunsuke/feat/rename-body
Browse files Browse the repository at this point in the history
feat: replace description_header and description_body to body
  • Loading branch information
suzuki-shunsuke committed May 9, 2022
2 parents 230cd68 + df649e0 commit 9b10790
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ type Issue struct {
RepoOwner string `yaml:"repo_owner,omitempty"`
RepoName string `yaml:"repo_name,omitempty"`
Title *string `json:"title,omitempty"`
DescriptionHeader *string `yaml:"description_header,omitempty"`
DescriptionBody *string `yaml:"description_body,omitempty"`
Body *string `yaml:"body,omitempty"`
AdditionalBody string `yaml:"additional_body,omitempty"`
Labels []string `json:"labels,omitempty"`
AdditionalLabels []string `yaml:"additional_labels,omitempty"`
Expand All @@ -53,11 +52,8 @@ func (issue *Issue) Merge(is *Issue) {
if is.Title != nil {
issue.Title = is.Title
}
if is.DescriptionHeader != nil {
issue.DescriptionHeader = is.DescriptionHeader
}
if is.DescriptionBody != nil {
issue.DescriptionBody = is.DescriptionBody
if is.Body != nil {
issue.Body = is.Body
}
if is.Labels != nil {
issue.Labels = is.Labels
Expand Down Expand Up @@ -85,12 +81,12 @@ func SetDefault(cfg *Config, repo *domain.Repo) {
}
*cfg.Issue.Title = defaultIssueTitleTemplate
}
if domain.GetString(cfg.Issue.DescriptionHeader) == "" {
if cfg.Issue.DescriptionHeader == nil {
if domain.GetString(cfg.Issue.Body) == "" {
if cfg.Issue.Body == nil {
s := ""
cfg.Issue.DescriptionHeader = &s
cfg.Issue.Body = &s
}
*cfg.Issue.DescriptionHeader = defaultIssueDescriptionHeader
*cfg.Issue.Body = defaultIssueBody
}
if cfg.Issue.RepoOwner == "" {
cfg.Issue.RepoOwner = repo.Owner
Expand All @@ -104,12 +100,12 @@ func SetDefault(cfg *Config, repo *domain.Repo) {
}

func (issue *Issue) Description() string {
return domain.JoinBody(domain.GetString(issue.DescriptionHeader), domain.GetString(issue.DescriptionBody), issue.AdditionalBody) + "\n## Closed Pull Requests\n"
return domain.JoinBody(domain.GetString(issue.Body), issue.AdditionalBody) + "\n## Closed Pull Requests\n"
}

const defaultIssueTitleTemplate = `renovate-issue-action ({{.RepoOwner}}/{{.RepoName}}): {{.Metadata.Name}}{{if .Metadata.PackageFileDir}} ({{.Metadata.PackageFileDir}}){{end}}{{if eq .Metadata.UpdateType "major"}} major{{end}}`

const defaultIssueDescriptionHeader = `
const defaultIssueBody = `
_This pull request was created by [renovate-issue-action](https://github.com/suzuki-shunsuke/renovate-issue-action)._
:warning: Please don't edit the Issue title, because renovate-issue-action searches issue with Issue title.
Expand Down

0 comments on commit 9b10790

Please sign in to comment.