Merge pull request #107 from shiftstack/no_team

Simplify team yaml usage

Author: openshift-merge-bot[bot]

README.md

@@ -27,20 +27,14 @@ Required environment variables:
   github_handle: ghuser
   jira_name: jirauser
   slack_id: U012334
-- kerberos: user2
-  github_handle: ghuser2
-  jira_name: jirauser2
-  slack_id: U0122345
-```
-
-* `TEAM`: an object containing team members, referencing the `kerberos` property of PEOPLE. It is a YAML object in the form:
-
-```yaml
-user1:
   bug_triage: true
   leave:
   - start: 2024-11-21
     end: 2025-02-28
+- kerberos: user2
+  github_handle: ghuser2
+  jira_name: jirauser2
+  slack_id: U0122345
 ```
 
 ### Local testing
@@ -67,7 +61,7 @@ Required environment variables:
 
 * `JIRA_TOKEN`: a [Jira API token](https://issues.redhat.com/secure/ViewProfile.jspa?selectedTab=com.atlassian.pats.pats-plugin:jira-user-personal-access-tokens) of an account that can access the OCPBUGS project
 * `SLACK_HOOK`: a [Slack hook](https://api.slack.com/messaging/webhooks) URL
-* `PEOPLE` and `TEAM` described [above][pretriage].
+* `PEOPLE` described [above][pretriage].
 
 ## posttriage
 
@@ -97,4 +91,4 @@ Required environment variables:
 
 * `JIRA_TOKEN`: a [Jira API token](https://issues.redhat.com/secure/ViewProfile.jspa?selectedTab=com.atlassian.pats.pats-plugin:jira-user-personal-access-tokens) of an account that can access the OCPBUGS project
 * `SLACK_HOOK`: a [Slack hook](https://api.slack.com/messaging/webhooks) URL
-* `PEOPLE` and `TEAM` described [above][pretriage].
+* `PEOPLE` described [above][pretriage].

cmd/check/main.go

@@ -12,26 +12,15 @@ import (
 
 var (
 	PEOPLE = os.Getenv("PEOPLE")
-	TEAM   = os.Getenv("TEAM")
 )
 
 func main() {
-	people, err := team.Load(strings.NewReader(PEOPLE), strings.NewReader(TEAM))
+	people, err := team.Load(strings.NewReader(PEOPLE))
 	if err != nil {
 		log.Fatalf("Error loading team members: %v", err)
 	}
 
 	fmt.Printf("Found %d people\n", len(people))
-
-	{
-		var count int
-		for i := range people {
-			if people[i].TeamMember {
-				count++
-			}
-		}
-		fmt.Printf("Found %d team members\n", count)
-	}
 }
 
 func init() {
@@ -43,11 +32,6 @@ func init() {
 		log.Print("Required environment variable not found: PEOPLE")
 	}
 
-	if TEAM == "" {
-		ex_usage = true
-		log.Print("Required environment variable not found: TEAM")
-	}
-
 	if ex_usage {
 		log.Print("Exiting.")
 		os.Exit(64)

cmd/doctext/main.go

@@ -20,7 +20,6 @@ var (
 	SLACK_HOOK = os.Getenv("SLACK_HOOK")
 	JIRA_TOKEN = os.Getenv("JIRA_TOKEN")
 	PEOPLE     = os.Getenv("PEOPLE")
-	TEAM       = os.Getenv("TEAM")
 )
 
 func main() {
@@ -29,7 +28,7 @@ func main() {
 	var people []team.Person
 	{
 		var err error
-		people, err = team.Load(strings.NewReader(PEOPLE), strings.NewReader(TEAM))
+		people, err = team.Load(strings.NewReader(PEOPLE))
 		if err != nil {
 			log.Fatalf("error fetching team information: %v", err)
 		}
@@ -123,11 +122,6 @@ func init() {
 		log.Print("Required environment variable not found: PEOPLE")
 	}
 
-	if TEAM == "" {
-		ex_usage = true
-		log.Print("Required environment variable not found: TEAM")
-	}
-
 	if ex_usage {
 		log.Print("Exiting.")
 		os.Exit(64)

cmd/pretriage/main.go

@@ -29,7 +29,6 @@ var (
 	SLACK_HOOK = os.Getenv("SLACK_HOOK")
 	JIRA_TOKEN = os.Getenv("JIRA_TOKEN")
 	PEOPLE     = os.Getenv("PEOPLE")
-	TEAM       = os.Getenv("TEAM")
 )
 
 func main() {
@@ -38,7 +37,7 @@ func main() {
 	var people, triagers []team.Person
 	{
 		var err error
-		people, err = team.Load(strings.NewReader(PEOPLE), strings.NewReader(TEAM))
+		people, err = team.Load(strings.NewReader(PEOPLE))
 		if err != nil {
 			log.Fatalf("error fetching team information: %v", err)
 		}
@@ -170,11 +169,6 @@ func init() {
 		log.Print("Required environment variable not found: PEOPLE")
 	}
 
-	if TEAM == "" {
-		ex_usage = true
-		log.Print("Required environment variable not found: TEAM")
-	}
-
 	if ex_usage {
 		log.Print("Exiting.")
 		os.Exit(64)

cmd/triage/main.go

@@ -21,7 +21,6 @@ var (
 	SLACK_HOOK = os.Getenv("SLACK_HOOK")
 	JIRA_TOKEN = os.Getenv("JIRA_TOKEN")
 	PEOPLE     = os.Getenv("PEOPLE")
-	TEAM       = os.Getenv("TEAM")
 )
 
 func main() {
@@ -30,7 +29,7 @@ func main() {
 	var people []team.Person
 	{
 		var err error
-		people, err = team.Load(strings.NewReader(PEOPLE), strings.NewReader(TEAM))
+		people, err = team.Load(strings.NewReader(PEOPLE))
 		if err != nil {
 			log.Fatalf("error fetching team information: %v", err)
 		}
@@ -109,11 +108,6 @@ func init() {
 		log.Print("Required environment variable not found: PEOPLE")
 	}
 
-	if TEAM == "" {
-		ex_usage = true
-		log.Print("Required environment variable not found: TEAM")
-	}
-
 	if ex_usage {
 		log.Print("Exiting.")
 		os.Exit(64)

hack/run_with_env.sh

@@ -56,6 +56,5 @@ check_or_fetch() {
 check_or_fetch SLACK_HOOK slack      forum-shiftstack
 check_or_fetch JIRA_TOKEN bugwatcher jira-token
 check_or_fetch PEOPLE     team       people.yaml
-check_or_fetch TEAM       team       team.yaml
 
 exec "$@"

pkg/team/team.go

@@ -23,9 +23,8 @@ type Person struct {
 	Jira     string `yaml:"jira_name"`
 	Slack    string `yaml:"slack_id"`
 
-	TeamMember bool
-	BugTriage  bool
-	leave      []Leave
+	BugTriage bool    `yaml:"bug_triage,omitempty"`
+	leave     []Leave `yaml:"leave,omitempty"`
 }
 
 func (p Person) IsAvailable(t time.Time) bool {
@@ -37,40 +36,17 @@ func (p Person) IsAvailable(t time.Time) bool {
 	return true
 }
 
-func Load(peopleYAML, teamYAML io.Reader) ([]Person, error) {
+func Load(peopleYAML io.Reader) ([]Person, error) {
 	var people []Person
 	if err := yaml.NewDecoder(peopleYAML).Decode(&people); err != nil {
 		return nil, fmt.Errorf("error decoding people: %w", err)
 	}
 
-	var team map[string]struct {
-		BugTriage bool `yaml:"bug_triage"`
-		Leave     []struct {
-			Start time.Time `yaml:"start"`
-			End   time.Time `yaml:"end"`
-		} `yaml:"leave"`
-	}
-
-	if err := yaml.NewDecoder(teamYAML).Decode(&team); err != nil {
-		return nil, fmt.Errorf("error decoding team: %w", err)
-	}
-
 	for i := range people {
 		// user handles need a prepended `@` when mentioned in the chat
 		people[i].Slack = "@" + people[i].Slack
-
-		if teamMember, ok := team[people[i].Kerberos]; ok {
-			people[i].TeamMember = true
-			people[i].BugTriage = teamMember.BugTriage
-			if len(teamMember.Leave) > 0 {
-				people[i].leave = make([]Leave, len(teamMember.Leave))
-				for j := range teamMember.Leave {
-					people[i].leave[j].Start = teamMember.Leave[j].Start
-					people[i].leave[j].End = teamMember.Leave[j].End
-				}
-			}
-		}
 	}
+
 	return people, nil
 }