diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2019-10-04 23:05:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-04 23:05:13 -0700 |
| commit | 9126cd57424820ab9dc1933ee3e8a9fdd9b07f18 (patch) | |
| tree | 157c5f89295502c6679e5f3bca5188f22c46181d /generator | |
| parent | 395d34e5c841d0e8b4e4bc79c3e32c3498adb25a (diff) | |
| parent | 0a1177290bee2bad8a22e1bbb571e0b4da0654d5 (diff) | |
Merge pull request #4120 from nikhita/emeritus-company
generator: don't specify company for emeritus_leads
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/app.go | 10 | ||||
| -rw-r--r-- | generator/sig_readme.tmpl | 2 | ||||
| -rw-r--r-- | generator/ug_readme.tmpl | 2 | ||||
| -rw-r--r-- | generator/wg_readme.tmpl | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/generator/app.go b/generator/app.go index a5f05b1f..5171df2f 100644 --- a/generator/app.go +++ b/generator/app.go @@ -68,7 +68,7 @@ func (x FoldedString) MarshalYAML() (interface{}, error) { type Person struct { GitHub string Name string - Company string + Company string `yaml:"company,omitempty"` } // Meeting represents a regular meeting for a group. @@ -233,12 +233,16 @@ func (c *Context) Validate() []error { for prefix, persons := range group.Leadership.PrefixToPersonMap() { for _, person := range persons { if val, ok := people[person.GitHub]; ok { - if val.Name != person.Name || val.Company != person.Company { + if val.Name != person.Name || (prefix != "emeritus_lead" && val.Company != person.Company) { errors = append(errors, fmt.Errorf("%s: %ss: expected person: %v, got: %v", group.Dir, prefix, val, person)) } - } else { + } else if prefix != "emeritus_lead" { people[person.GitHub] = person } + + if prefix == "emeritus_lead" && person.Company != "" { + errors = append(errors, fmt.Errorf("%s: emeritus leads should not have company specified; company specified for: %s", group.Dir, person.Name)) + } } } if len(group.StakeholderSIGs) != 0 { diff --git a/generator/sig_readme.tmpl b/generator/sig_readme.tmpl index 12ad5bb4..06361e94 100644 --- a/generator/sig_readme.tmpl +++ b/generator/sig_readme.tmpl @@ -42,7 +42,7 @@ subprojects, and resolve cross-subproject technical issues and decisions. ## Emeritus Leads {{ range .Leadership.EmeritusLeads }} -* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} +* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**) {{- end }} {{- end }} {{- end }} diff --git a/generator/ug_readme.tmpl b/generator/ug_readme.tmpl index 4062128e..a84aa06a 100644 --- a/generator/ug_readme.tmpl +++ b/generator/ug_readme.tmpl @@ -30,7 +30,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name} ## Emeritus Organizers {{ range .Leadership.EmeritusLeads }} -* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} +* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**) {{- end }} {{- end }} {{- end }} diff --git a/generator/wg_readme.tmpl b/generator/wg_readme.tmpl index 0fc7ff47..a36d16f7 100644 --- a/generator/wg_readme.tmpl +++ b/generator/wg_readme.tmpl @@ -36,7 +36,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name} ## Emeritus Organizers {{ range .Leadership.EmeritusLeads }} -* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} +* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**) {{- end }} {{- end }} {{- end }} |